From 80da6eeca10ec9282dfa0ab239ca62376f62e434 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 18 Aug 2014 23:23:26 +0100 Subject: [PATCH] qbs-git: can be built now --- ...dd-hostosinfo.h-to-installed-headers.patch | 27 +++++++++++++++++++ .../0002-WIP-Xcode-generator.patch | 10 +++---- .../0003-add-generator-header-installs.patch | 14 +++++----- mingw-w64-qbs-git/PKGBUILD | 18 ++++++++----- 4 files changed, 50 insertions(+), 19 deletions(-) create mode 100644 mingw-w64-qbs-git/0001-add-hostosinfo.h-to-installed-headers.patch diff --git a/mingw-w64-qbs-git/0001-add-hostosinfo.h-to-installed-headers.patch b/mingw-w64-qbs-git/0001-add-hostosinfo.h-to-installed-headers.patch new file mode 100644 index 0000000000..0e4f6924e8 --- /dev/null +++ b/mingw-w64-qbs-git/0001-add-hostosinfo.h-to-installed-headers.patch @@ -0,0 +1,27 @@ +From 30f0eea92b5ec0029abf02885c42ce04d2aa1772 Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Mon, 18 Aug 2014 12:19:52 +0100 +Subject: [PATCH 1/3] add hostosinfo.h to installed headers + +.. if you build Qt Creator with system qbs then this +header is needed by: +src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +--- + src/lib/corelib/tools/tools.pri | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri +index 8171f42..0dfe50f 100644 +--- a/src/lib/corelib/tools/tools.pri ++++ b/src/lib/corelib/tools/tools.pri +@@ -72,6 +72,7 @@ qbs_enable_unit_tests { + $$PWD/cleanoptions.h \ + $$PWD/codelocation.h \ + $$PWD/error.h \ ++ $$PWD/hostosinfo.h \ + $$PWD/settings.h \ + $$PWD/preferences.h \ + $$PWD/profile.h \ +-- +2.1.0 + diff --git a/mingw-w64-qbs-git/0002-WIP-Xcode-generator.patch b/mingw-w64-qbs-git/0002-WIP-Xcode-generator.patch index 3e48eaacb1..7a4c3afaa3 100644 --- a/mingw-w64-qbs-git/0002-WIP-Xcode-generator.patch +++ b/mingw-w64-qbs-git/0002-WIP-Xcode-generator.patch @@ -1,7 +1,7 @@ -From 4db7815fdb767803fd9c52fd228169c42435ffc5 Mon Sep 17 00:00:00 2001 +From f3258a17f49b03418ba73baaa5ae1246a1f9d11a Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 9 Jan 2014 09:00:47 -0500 -Subject: [PATCH] WIP: Xcode generator. +Subject: [PATCH 2/3] WIP: Xcode generator. Task-number: QBS-32 @@ -1024,7 +1024,7 @@ index 8bf43d2..fd23faa 100644 if (!lib->load()) { logger.qbsWarning() << Tr::tr("Pluginmanager: Cannot load plugin '%1': %2") diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri -index 8171f42..475bd4b 100644 +index 0dfe50f..85175b3 100644 --- a/src/lib/corelib/tools/tools.pri +++ b/src/lib/corelib/tools/tools.pri @@ -6,6 +6,8 @@ HEADERS += \ @@ -4792,7 +4792,7 @@ index 0000000..d964b94 +#endif // QBS_XCODENATIVEGENERATOR_H diff --git a/src/plugins/generator/xcode/xcodesimplegenerator.cpp b/src/plugins/generator/xcode/xcodesimplegenerator.cpp new file mode 100644 -index 0000000..6d6f369 +index 0000000..7bd9b05 --- /dev/null +++ b/src/plugins/generator/xcode/xcodesimplegenerator.cpp @@ -0,0 +1,275 @@ @@ -4979,7 +4979,7 @@ index 0000000..6d6f369 + + PBXProject xcodeProject(dir.absoluteFilePath(QLatin1String("project.pbxproj"))); + xcodeProject.setName(project.projectData().name()); -+ xcodeProject.setProjectDirPath(QFileInfo(project.projectData().location().fileName()).path()); ++ xcodeProject.setProjectDirPath(project.projectData().location().filePath()); + xcodeProject.buildConfigurationList()->addBuildConfiguration(QLatin1String("Debug")); + xcodeProject.buildConfigurationList()->addBuildConfiguration(QLatin1String("Release")); + diff --git a/mingw-w64-qbs-git/0003-add-generator-header-installs.patch b/mingw-w64-qbs-git/0003-add-generator-header-installs.patch index ac2fe5a46d..d54679ebc6 100644 --- a/mingw-w64-qbs-git/0003-add-generator-header-installs.patch +++ b/mingw-w64-qbs-git/0003-add-generator-header-installs.patch @@ -1,7 +1,7 @@ -From 6f94af8ec0e326598e07c00c302c01c221eda860 Mon Sep 17 00:00:00 2001 +From 0d6026fc1cc2dcbd9446af340f84cb2c614ae134 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 18 Aug 2014 00:12:36 +0100 -Subject: [PATCH 2/2] add generator header installs +Subject: [PATCH 3/3] add generator header installs --- src/lib/corelib/api/api.pri | 1 + @@ -9,10 +9,10 @@ Subject: [PATCH 2/2] add generator header installs 2 files changed, 2 insertions(+) diff --git a/src/lib/corelib/api/api.pri b/src/lib/corelib/api/api.pri -index 2bd59b5..c70629c 100644 +index 9b2fb38..e31ea57 100644 --- a/src/lib/corelib/api/api.pri +++ b/src/lib/corelib/api/api.pri -@@ -23,6 +23,7 @@ SOURCES += \ +@@ -25,6 +25,7 @@ SOURCES += \ $$PWD/languageinfo.h \ $$PWD/project.h \ $$PWD/projectdata.h \ @@ -21,10 +21,10 @@ index 2bd59b5..c70629c 100644 api_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/api INSTALLS += api_headers diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri -index 8171f42..099c340 100644 +index 85175b3..f3c3e09 100644 --- a/src/lib/corelib/tools/tools.pri +++ b/src/lib/corelib/tools/tools.pri -@@ -79,6 +79,7 @@ qbs_enable_unit_tests { +@@ -84,6 +84,7 @@ qbs_enable_unit_tests { $$PWD/qbs_export.h \ $$PWD/buildoptions.h \ $$PWD/installoptions.h \ @@ -33,5 +33,5 @@ index 8171f42..099c340 100644 tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools INSTALLS += tools_headers -- -1.9.2.msysgit.0.1240.g7c41ddb +2.1.0 diff --git a/mingw-w64-qbs-git/PKGBUILD b/mingw-w64-qbs-git/PKGBUILD index b9d3cf9e55..f71f1bef51 100644 --- a/mingw-w64-qbs-git/PKGBUILD +++ b/mingw-w64-qbs-git/PKGBUILD @@ -27,18 +27,19 @@ url='http://qt-project.org' arch=('any') depends=("${MINGW_PACKAGE_PREFIX}-qt5") options=('docs' 'staticlibs') # '!strip' 'debug') -provides=("qbs") -conflicts=("qbs") +provides=("${MINGW_PACKAGE_PREFIX}-qbs") +conflicts=("${MINGW_PACKAGE_PREFIX}-qbs") QBS_GIT_BRANCH=master source=("git://gitorious.org/qt-labs/qbs.git#branch=$QBS_GIT_BRANCH" "manifest" + "0001-add-hostosinfo.h-to-installed-headers.patch" "0002-WIP-Xcode-generator.patch" "0003-add-generator-header-installs.patch") sha256sums=('SKIP' '838098b25a8044176b3139b4003594570c62a8d64f5470fbbd769f3bf44e0855' - '3756561eb8c8ebb2ab024ab4ff143b5f3e8224fd1768631dcd9177b20b2f9ff0' - '360a73ad81471941db2a957d13c43253fecfdc210d0ed7587c488c2f52f0c9fc' - '315d9fc2e5685c4d072bb977bb510532fa5922cb4bef98877ad5ad677b1ac05d') + 'b791b90bd4e49fd0188167c308a3da1773ddc6740d88c385e4f5d811ef0bb117' + 'bd05da6b8f5984cb824c6a7426de9bf6d29e917318f1cf10b103467986dc3c2b' + '036c5452f19eebfc3c39982b47191e4c4e7ae2ba0e0b23dc818105189f54b441') pkgver() { cd "$srcdir"/$_realname @@ -47,6 +48,7 @@ pkgver() { prepare() { cd "$srcdir"/$_realname + git am "${srcdir}"/0001-add-hostosinfo.h-to-installed-headers.patch git am "${srcdir}"/0002-WIP-Xcode-generator.patch git am "${srcdir}"/0003-add-generator-header-installs.patch } @@ -62,14 +64,16 @@ fi [ -d build-${CARCH} ] && rm -rf build-${CARCH} mkdir build-${CARCH} cd build-${CARCH} - ${MINGW_PREFIX}/bin/qmake.exe ../qbs.pro CONFIG+=${_config} + ${MINGW_PREFIX}/bin/qmake.exe ../qbs.pro \ + CONFIG+=${_config} \ + CONFIG+=qbs_enable_project_file_updates # Because xcodeprojectgenerator has a build order problem. make -j1 make docs } package() { - cd ${srcdir}/${_realname}-${pkgver}/build-${CARCH} + cd ${srcdir}/${_realname}/build-${CARCH} make INSTALL_ROOT=${pkgdir}${MINGW_PREFIX} install make INSTALL_ROOT=${pkgdir}${MINGW_PREFIX} install_docs