Fix the support for WinCE.

Change-Id: Id08dab3128b9ff943c68b442e8cadf14caaee204
Reviewed-by: hjk <qthjk@ovi.com>

src/plugins/projectexplorer/abstractmsvctoolchain.cpp

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#include "abstractmsvctoolchain.h"
+
+#include "msvcparser.h"
+
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectexplorersettings.h>
+
+
+#include <utils/fileutils.h>
+#include <utils/qtcprocess.h>
+#include <utils/synchronousprocess.h>
+
+#include <QFileInfo>
+#include <QDir>
+#include <QTemporaryFile>
+
+enum { debug = 0 };
+
+namespace ProjectExplorer {
+namespace Internal {
+
+
+AbstractMsvcToolChain::AbstractMsvcToolChain(const QString &id,
+                                             bool autodetect,
+                                             const Abi &abi,
+                                             const QString& vcvarsBat) :
+    ToolChain(id, autodetect),
+    m_lastEnvironment(Utils::Environment::systemEnvironment()),
+    m_abi(abi),
+    m_vcvarsBat(vcvarsBat)
+{
+    Q_ASSERT(abi.os() == Abi::WindowsOS);
+    Q_ASSERT(abi.binaryFormat() == Abi::PEFormat);
+    Q_ASSERT(abi.osFlavor() != Abi::WindowsMSysFlavor);
+    Q_ASSERT(!m_vcvarsBat.isEmpty());
+}
+
+AbstractMsvcToolChain::AbstractMsvcToolChain(const QString &id, bool autodetect) :
+    ToolChain(id, autodetect),
+    m_lastEnvironment(Utils::Environment::systemEnvironment())
+{
+
+}
+
+Abi AbstractMsvcToolChain::targetAbi() const
+{
+    return m_abi;
+}
+
+bool AbstractMsvcToolChain::isValid() const
+{
+    return !m_vcvarsBat.isEmpty();
+}
+
+QByteArray AbstractMsvcToolChain::predefinedMacros() const
+{
+    if (m_predefinedMacros.isEmpty()) {
+        Utils::Environment env(m_lastEnvironment);
+        addToEnvironment(env);
+        m_predefinedMacros = msvcPredefinedMacros(env);
+    }
+    return m_predefinedMacros;
+}
+
+QList<HeaderPath> AbstractMsvcToolChain::systemHeaderPaths() const
+{
+    if (m_headerPaths.isEmpty()) {
+        Utils::Environment env(m_lastEnvironment);
+        addToEnvironment(env);
+        foreach (const QString &path, env.value("INCLUDE").split(QLatin1Char(';')))
+            m_headerPaths.append(HeaderPath(path, HeaderPath::GlobalHeaderPath));
+    }
+    return m_headerPaths;
+}
+
+void AbstractMsvcToolChain::addToEnvironment(Utils::Environment &env) const
+{
+    // We cache the full environment (incoming + modifications by setup script).
+    if (!m_resultEnvironment.size() || env != m_lastEnvironment) {
+        if (debug)
+            qDebug() << "addToEnvironment: " << displayName();
+        m_lastEnvironment = env;
+        m_resultEnvironment = readEnvironmentSetting(env);
+    }
+    env = m_resultEnvironment;
+}
+
+
+QString AbstractMsvcToolChain::makeCommand() const
+{
+    if (ProjectExplorerPlugin::instance()->projectExplorerSettings().useJom) {
+        // We want jom! Try to find it.
+        const QString jom = QLatin1String("jom.exe");
+        const QFileInfo installedJom = QFileInfo(QCoreApplication::applicationDirPath()
+                                                 + QLatin1Char('/') + jom);
+        if (installedJom.isFile() && installedJom.isExecutable()) {
+            return installedJom.absoluteFilePath();
+        } else {
+            return jom;
+        }
+    }
+    return QLatin1String("nmake.exe");
+}
+
+void AbstractMsvcToolChain::setDebuggerCommand(const QString &d)
+{
+    if (m_debuggerCommand == d)
+        return;
+    m_debuggerCommand = d;
+    updateId();
+    toolChainUpdated();
+}
+
+QString AbstractMsvcToolChain::debuggerCommand() const
+{
+    return m_debuggerCommand;
+}
+
+
+IOutputParser *AbstractMsvcToolChain::outputParser() const
+{
+    return new MsvcParser;
+}
+
+bool AbstractMsvcToolChain::canClone() const
+{
+    return true;
+}
+
+QByteArray AbstractMsvcToolChain::msvcPredefinedMacros(const Utils::Environment& env) const
+{
+    QByteArray predefinedMacros = "#define __MSVCRT__\n"
+            "#define __w64\n"
+            "#define __int64 long long\n"
+            "#define __int32 long\n"
+            "#define __int16 short\n"
+            "#define __int8 char\n"
+            "#define __ptr32\n"
+            "#define __ptr64\n";
+
+    return predefinedMacros;
+}
+
+
+bool AbstractMsvcToolChain::generateEnvironmentSettings(Utils::Environment &env,
+                                                        const QString& batchFile,
+                                                        const QString& batchArgs,
+                                                        QMap<QString, QString>& envPairs) const
+{
+    // Create a temporary file name for the output. Use a temporary file here
+    // as I don't know another way to do this in Qt...
+    // Note, can't just use a QTemporaryFile all the way through as it remains open
+    // internally so it can't be streamed to later.
+    QString tempOutFile;
+    QTemporaryFile* pVarsTempFile = new QTemporaryFile(QDir::tempPath() + "/XXXXXX.txt");
+    pVarsTempFile->setAutoRemove(false);
+    pVarsTempFile->open();
+    pVarsTempFile->close();
+    tempOutFile = pVarsTempFile->fileName();
+    delete pVarsTempFile;
+
+    // Create a batch file to create and save the env settings
+    Utils::TempFileSaver saver(QDir::tempPath() + "/XXXXXX.bat");
+
+    QByteArray call = "call ";
+    call += Utils::QtcProcess::quoteArg(batchFile).toLocal8Bit() + "\r\n";
+    if (!batchArgs.isEmpty()) {
+        call += ' ';
+        call += batchArgs.toLocal8Bit();
+    }
+    call += "\r\n";
+
+    saver.write(call);
+    const QByteArray redirect = "set > " + Utils::QtcProcess::quoteArg(
+                                    QDir::toNativeSeparators(tempOutFile)).toLocal8Bit() + "\r\n";
+    saver.write(redirect);
+    if (!saver.finalize()) {
+        qWarning("%s: %s", Q_FUNC_INFO, qPrintable(saver.errorString()));
+        return false;
+    }
+
+    Utils::QtcProcess run;
+    // As of WinSDK 7.1, there is logic preventing the path from being set
+    // correctly if "ORIGINALPATH" is already set. That can cause problems
+    // if Creator is launched within a session set up by setenv.cmd.
+    env.unset(QLatin1String("ORIGINALPATH"));
+    run.setEnvironment(env);
+    const QString cmdPath = QString::fromLocal8Bit(qgetenv("COMSPEC"));
+    // Windows SDK setup scripts require command line switches for environment expansion.
+    QString cmdArguments = QLatin1String(" /E:ON /V:ON /c \"");
+    cmdArguments += QDir::toNativeSeparators(saver.fileName());
+    cmdArguments += QLatin1Char('"');
+    run.setCommand(cmdPath, cmdArguments);
+    if (debug)
+        qDebug() << "readEnvironmentSetting: " << call << cmdPath << cmdArguments
+                 << " Env: " << env.size();
+    run.start();
+
+    if (!run.waitForStarted()) {
+        qWarning("%s: Unable to run '%s': %s", Q_FUNC_INFO, qPrintable(m_vcvarsBat),
+                 qPrintable(run.errorString()));
+        return false;
+    }
+    if (!run.waitForFinished()) {
+        qWarning("%s: Timeout running '%s'", Q_FUNC_INFO, qPrintable(m_vcvarsBat));
+        Utils::SynchronousProcess::stopProcess(run);
+        return false;
+    }
+
+    //
+    // Now parse the file to get the environment settings
+    QFile varsFile(tempOutFile);
+    if (!varsFile.open(QIODevice::ReadOnly))
+        return false;
+
+    QRegExp regexp(QLatin1String("(\\w*)=(.*)"));
+    while (!varsFile.atEnd()) {
+        const QString line = QString::fromLocal8Bit(varsFile.readLine()).trimmed();
+        if (regexp.exactMatch(line)) {
+            const QString varName = regexp.cap(1);
+            const QString varValue = regexp.cap(2);
+
+            if (!varValue.isEmpty())
+                envPairs.insert(varName, varValue);
+        }
+    }
+
+    // Tidy up and remove the file
+    varsFile.close();
+    varsFile.remove();
+
+    return true;
+}
+
+} // namespace Internal
+} // namespace ProjectExplorer
+

src/plugins/projectexplorer/abstractmsvctoolchain.h

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#ifndef ABSTRACTMSVCTOOLCHAIN_H
+#define ABSTRACTMSVCTOOLCHAIN_H
+
+#include "toolchain.h"
+#include "abi.h"
+
+#include <utils/environment.h>
+
+namespace ProjectExplorer {
+namespace Internal {
+
+class AbstractMsvcToolChain : public ToolChain
+{
+public:
+    AbstractMsvcToolChain(const QString &id, bool autodetect, const Abi &abi, const QString& vcvarsBat);
+    AbstractMsvcToolChain(const QString &id, bool autodetect);
+
+    Abi targetAbi() const;
+
+    bool isValid() const;
+    QByteArray predefinedMacros() const;
+
+    QList<HeaderPath> systemHeaderPaths() const;
+
+    void addToEnvironment(Utils::Environment &env) const;
+    QString makeCommand() const;
+    void setDebuggerCommand(const QString &d);
+
+    QString debuggerCommand() const;
+    IOutputParser *outputParser() const;
+
+    bool canClone() const;
+
+    QString varsBat() const { return m_vcvarsBat; }
+protected:
+    virtual Utils::Environment readEnvironmentSetting(Utils::Environment& env) const = 0;
+    virtual QByteArray msvcPredefinedMacros(const Utils::Environment& env) const;
+    virtual void updateId() = 0;
+
+    bool generateEnvironmentSettings(Utils::Environment &env,
+                                     const QString& batchFile,
+                                     const QString& batchArgs,
+                                     QMap<QString, QString>& envPairs) const;
+
+    QString m_debuggerCommand;
+    mutable QByteArray m_predefinedMacros;
+    mutable Utils::Environment m_lastEnvironment;   // Last checked 'incoming' environment.
+    mutable Utils::Environment m_resultEnvironment; // Resulting environment for VC
+    mutable QList<HeaderPath> m_headerPaths;
+    Abi m_abi;
+
+   QString m_vcvarsBat;
+};
+
+} // namespace Internal
+} // namespace ProjectExplorer
+
+#endif // ABSTRACTMSVCTOOLCHAIN_H

src/plugins/projectexplorer/msvctoolchain.h

@@ -33,7 +33,7 @@
 #ifndef MSVCTOOLCHAIN_H
 #define MSVCTOOLCHAIN_H
 
-#include "toolchain.h"
+#include "abstractmsvctoolchain.h"
 #include "abi.h"
 #include "toolchainconfigwidget.h"
 
@@ -48,7 +48,7 @@ namespace Internal {
 // MsvcToolChain
 // --------------------------------------------------------------------------
 
-class MsvcToolChain : public ToolChain
+class MsvcToolChain : public AbstractMsvcToolChain
 {
 public:
     enum Type { WindowsSDK, VS };
@@ -60,44 +60,29 @@ public:
     static MsvcToolChain *readFromMap(const QVariantMap &data);
 
     QString typeName() const;
-    Abi targetAbi() const;
 
-    bool isValid() const;
-
-    QByteArray predefinedMacros() const;
-    QList<HeaderPath> systemHeaderPaths() const;
-    void addToEnvironment(Utils::Environment &env) const;
     QString mkspec() const;
-    QString makeCommand() const;
-    void setDebuggerCommand(const QString &d);
-    virtual QString debuggerCommand() const;
-    IOutputParser *outputParser() const;
 
-    virtual QVariantMap toMap() const;
-    virtual bool fromMap(const QVariantMap &data);
+    QVariantMap toMap() const;
+    bool fromMap(const QVariantMap &data);
 
     ToolChainConfigWidget *configurationWidget();
 
-    bool canClone() const;
     ToolChain *clone() const;
 
-    QString varsBat() const { return m_varsBat; }
     QString varsBatArg() const { return m_varsBatArg; }
 
     static QPair<QString, QString> autoDetectCdbDebugger();
 
+protected:
+    Utils::Environment readEnvironmentSetting(Utils::Environment& env) const;
+    QByteArray msvcPredefinedMacros(const Utils::Environment &env) const;
+
 private:
     MsvcToolChain();
     void updateId();
 
-    QString m_varsBat; // Script to setup environment
     QString m_varsBatArg; // Argument
-    QString m_debuggerCommand;
-    mutable QByteArray m_predefinedMacros;
-    mutable Utils::Environment m_lastEnvironment;   // Last checked 'incoming' environment.
-    mutable Utils::Environment m_resultEnvironment; // Resulting environment for VC
-    mutable QList<HeaderPath> m_headerPaths;
-    Abi m_abi;
 };
 
 // --------------------------------------------------------------------------

src/plugins/projectexplorer/projectexplorer.cpp

@@ -85,6 +85,7 @@
 #ifdef Q_OS_WIN
 #    include "windebuginterface.h"
 #    include "msvctoolchain.h"
+#    include "wincetoolchain.h"
 #endif
 
 #include <extensionsystem/pluginspec.h>
@@ -318,6 +319,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     addAutoReleasedObject(new Internal::MingwToolChainFactory);
     addAutoReleasedObject(new Internal::MsvcToolChainFactory);
+    addAutoReleasedObject(new Internal::WinCEToolChainFactory);
 #else
     addAutoReleasedObject(new Internal::GccToolChainFactory);
     addAutoReleasedObject(new Internal::LinuxIccToolChainFactory);

src/plugins/projectexplorer/projectexplorer.pro

@@ -213,11 +213,15 @@ win32 {
     SOURCES += \
         windebuginterface.cpp \
         msvcparser.cpp \
-        msvctoolchain.cpp
+        msvctoolchain.cpp \
+        abstractmsvctoolchain.cpp \
+        wincetoolchain.cpp
     HEADERS += \
         windebuginterface.h \
         msvcparser.h \
-        msvctoolchain.h
+        msvctoolchain.h \
+        abstractmsvctoolchain.h \
+        wincetoolchain.h
 } else {
     macx:LIBS += -framework Carbon
 }

src/plugins/projectexplorer/projectexplorerconstants.h

@@ -215,6 +215,7 @@ const char GCC_TOOLCHAIN_ID[] = "ProjectExplorer.ToolChain.Gcc";
 const char LINUXICC_TOOLCHAIN_ID[] = "ProjectExplorer.ToolChain.LinuxIcc";
 const char MINGW_TOOLCHAIN_ID[] = "ProjectExplorer.ToolChain.Mingw";
 const char MSVC_TOOLCHAIN_ID[] = "ProjectExplorer.ToolChain.Msvc";
+const char WINCE_TOOLCHAIN_ID[] = "ProjectExplorer.ToolChain.WinCE";
 
 // Run Configuration defaults:
 const int QML_DEFAULT_DEBUG_SERVER_PORT = 3768;

src/plugins/projectexplorer/wincetoolchain.h

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at info@qt.nokia.com.
+**
+**************************************************************************/
+
+#ifndef WINCETOOLCHAIN_H
+#define WINCETOOLCHAIN_H
+
+#include "abstractmsvctoolchain.h"
+#include "abi.h"
+#include "toolchainconfigwidget.h"
+
+#include <utils/environment.h>
+
+#include <QtGui/QLabel>
+
+namespace ProjectExplorer {
+namespace Internal {
+
+// --------------------------------------------------------------------------
+// WinCEToolChain
+// --------------------------------------------------------------------------
+
+class WinCEToolChain : public AbstractMsvcToolChain
+{
+public:
+
+    WinCEToolChain(const QString &name,
+                   const Abi &abi,
+                   const QString &vcvarsBat,
+                   const QString &msvcVer,
+                   const QString &ceVer,
+                   const QString &binPath,
+                   const QString &includePath,
+                   const QString &libPath,
+                   bool autodetect = false);
+
+    static WinCEToolChain *readFromMap(const QVariantMap &data);
+
+    QString typeName() const;
+
+    QString mkspec() const;
+
+    QString ceVer() const;
+
+    QVariantMap toMap() const;
+    bool fromMap(const QVariantMap &data);
+
+    ToolChainConfigWidget *configurationWidget();
+
+    ToolChain *clone() const;
+
+    static QString autoDetectCdbDebugger(QStringList *checkedDirectories = 0);
+
+protected:
+    Utils::Environment readEnvironmentSetting(Utils::Environment& env) const;
+
+private:
+    WinCEToolChain();
+    void updateId();
+
+    QString m_msvcVer;
+    QString m_ceVer;
+    QString m_binPath;
+    QString m_includePath;
+    QString m_libPath;
+};
+
+// --------------------------------------------------------------------------
+// WinCEToolChainConfigWidget
+// --------------------------------------------------------------------------
+class WinCEToolChainConfigWidget : public ToolChainConfigWidget
+{
+    Q_OBJECT
+
+public:
+    WinCEToolChainConfigWidget(ToolChain *);
+
+    void apply() {}
+    void discard() { }
+    bool isDirty() const {return false;}
+
+};
+
+// --------------------------------------------------------------------------
+// WinCEToolChainFactory
+// --------------------------------------------------------------------------
+
+class WinCEToolChainFactory : public ToolChainFactory
+{
+    Q_OBJECT
+
+public:
+    QString displayName() const;
+    QString id() const;
+
+    QList<ToolChain *> autoDetect();
+
+    bool canRestore(const QVariantMap &data);
+    ToolChain *restore(const QVariantMap &data);
+
+    ToolChainConfigWidget *configurationWidget(ToolChain *);
+
+private:
+    QList<ToolChain *> detectCEToolKits(const QString& msvcPath, const QString& vcvarsbat);
+};
+
+
+} // namespace Internal
+} // namespace ProjectExplorer
+
+#endif // MSVCTOOLCHAIN_H

src/plugins/qt4projectmanager/winceqtversion.cpp

@@ -39,20 +39,22 @@ using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
 
 WinCeQtVersion::WinCeQtVersion()
-    : QtSupport::BaseQtVersion()
+    : QtSupport::BaseQtVersion(),
+      m_archType(ProjectExplorer::Abi::ArmArchitecture)
 {
-
 }
 
-WinCeQtVersion::WinCeQtVersion(const QString &path, bool isAutodetected, const QString &autodetectionSource)
-    : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource)