From 87c8cbf44c9d6de0c78346164887a8ba52fb0bc8 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 3 Dec 2010 10:34:46 +0100
Subject: [PATCH] LanguageUtils: Introduce new library for cross-language
utils.
---
src/libs/cplusplus/cplusplus.pro | 1 +
src/libs/languageutils/languageutils-lib.pri | 11 +++++
src/libs/languageutils/languageutils.pri | 2 +
src/libs/languageutils/languageutils.pro | 10 ++++
src/libs/languageutils/languageutils_global.h | 47 +++++++++++++++++++
src/libs/libs.pro | 1 +
src/libs/qmljs/qmljs.pro | 1 +
.../cpptools/cpptools_dependencies.pri | 1 +
.../qmljstools/qmljstools_dependencies.pri | 1 +
9 files changed, 75 insertions(+)
create mode 100644 src/libs/languageutils/languageutils-lib.pri
create mode 100644 src/libs/languageutils/languageutils.pri
create mode 100644 src/libs/languageutils/languageutils.pro
create mode 100644 src/libs/languageutils/languageutils_global.h
diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro
index c9aba3b1cce..57d009f1614 100644
--- a/src/libs/cplusplus/cplusplus.pro
+++ b/src/libs/cplusplus/cplusplus.pro
@@ -7,3 +7,4 @@ unix:QMAKE_CXXFLAGS_DEBUG += -O2
include(../../qtcreatorlibrary.pri)
include(cplusplus-lib.pri)
+include(../languageutils/languageutils.pri)
diff --git a/src/libs/languageutils/languageutils-lib.pri b/src/libs/languageutils/languageutils-lib.pri
new file mode 100644
index 00000000000..4bf744b2376
--- /dev/null
+++ b/src/libs/languageutils/languageutils-lib.pri
@@ -0,0 +1,11 @@
+contains(CONFIG, dll) {
+ DEFINES += LANGUAGEUTILS_BUILD_DIR
+} else {
+ DEFINES += LANGUAGEUTILS_BUILD_STATIC_LIB
+}
+
+DEPENDPATH += $$PWD
+INCLUDEPATH += $$PWD/..
+
+HEADERS += \
+ $$PWD/languageutils_global.h
diff --git a/src/libs/languageutils/languageutils.pri b/src/libs/languageutils/languageutils.pri
new file mode 100644
index 00000000000..0ed4f1e1f6a
--- /dev/null
+++ b/src/libs/languageutils/languageutils.pri
@@ -0,0 +1,2 @@
+LIBS *= -l$$qtLibraryName(LanguageUtils)
+DEFINES += QT_CREATOR
diff --git a/src/libs/languageutils/languageutils.pro b/src/libs/languageutils/languageutils.pro
new file mode 100644
index 00000000000..c1478a8e0de
--- /dev/null
+++ b/src/libs/languageutils/languageutils.pro
@@ -0,0 +1,10 @@
+TEMPLATE = lib
+CONFIG += dll
+TARGET = LanguageUtils
+DEFINES += QT_CREATOR
+
+unix:QMAKE_CXXFLAGS_DEBUG += -O3
+
+include(../../qtcreatorlibrary.pri)
+include(languageutils-lib.pri)
+include(../utils/utils.pri)
diff --git a/src/libs/languageutils/languageutils_global.h b/src/libs/languageutils/languageutils_global.h
new file mode 100644
index 00000000000..1e6ffd6b47a
--- /dev/null
+++ b/src/libs/languageutils/languageutils_global.h
@@ -0,0 +1,47 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** No Commercial Usage
+**
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**************************************************************************/
+
+#ifndef LANGUAGEUTILS_GLOBAL_H
+#define LANGUAGEUTILS_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(LANGUAGEUTILS_BUILD_DIR)
+# define LANGUAGEUTILS_EXPORT Q_DECL_EXPORT
+#elif defined(LANGUAGEUTILS_BUILD_STATIC_LIB)
+# define LANGUAGEUTILS_EXPORT
+#else
+# define LANGUAGEUTILS_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // LANGUAGEUTILS_GLOBAL_H
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index fce7bc63f8b..6008fa4f116 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -8,6 +8,7 @@ SUBDIRS = \
extensionsystem \
utils \
utils/process_stub.pro \
+ languageutils \
cplusplus \
qmljs \
glsl \
diff --git a/src/libs/qmljs/qmljs.pro b/src/libs/qmljs/qmljs.pro
index 1fe566f970e..cd3b8fc0bf2 100644
--- a/src/libs/qmljs/qmljs.pro
+++ b/src/libs/qmljs/qmljs.pro
@@ -8,3 +8,4 @@ unix:QMAKE_CXXFLAGS_DEBUG += -O3
include(../../qtcreatorlibrary.pri)
include(qmljs-lib.pri)
include(../utils/utils.pri)
+include(../languageutils/languageutils.pri)
diff --git a/src/plugins/cpptools/cpptools_dependencies.pri b/src/plugins/cpptools/cpptools_dependencies.pri
index 84e655797d4..b7e9053c433 100644
--- a/src/plugins/cpptools/cpptools_dependencies.pri
+++ b/src/plugins/cpptools/cpptools_dependencies.pri
@@ -1,3 +1,4 @@
+include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
include($$IDE_SOURCE_TREE/src/plugins/projectexplorer/projectexplorer.pri)
include($$IDE_SOURCE_TREE/src/plugins/texteditor/texteditor.pri)
diff --git a/src/plugins/qmljstools/qmljstools_dependencies.pri b/src/plugins/qmljstools/qmljstools_dependencies.pri
index 81d08c633d7..d63c784082d 100644
--- a/src/plugins/qmljstools/qmljstools_dependencies.pri
+++ b/src/plugins/qmljstools/qmljstools_dependencies.pri
@@ -1,3 +1,4 @@
+include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri)
include($$IDE_SOURCE_TREE/src/plugins/projectexplorer/projectexplorer.pri)
include($$IDE_SOURCE_TREE/src/plugins/texteditor/texteditor.pri)
--
GitLab