[Libreoffice-commits] core.git: ios/lo.xcconfig.in ios/MobileLibreOffice ios/shared

Tor Lillqvist tml at collabora.com
Thu Oct 17 00:23:09 PDT 2013


 ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |    2 +-
 ios/lo.xcconfig.in                                                |    1 +
 ios/shared/ios_sharedlo.xcodeproj/project.pbxproj                 |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e3c461104057fde8bcfc5778b24039ff387c4926
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 17 10:20:11 2013 +0300

    Make the MobileLibreOffice project work better in a srcdir!=builddir scenario
    
    Manual intervention still needed to copy over the
    ios/MobileLibreOffice and ios/shared directories, though.
    
    Change-Id: I1e985cb9bf61238631bd01cd222eeaeb447d58b9

diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 931bcd5..2001342 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -1469,7 +1469,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "dest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p' $LO_BUILDDIR/config_host.mk`\nbuildid=`git log -1 --format=%H`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor file in $LO_OUTDIR/lib/*.a $LO_INSTDIR/program/*.a $LO_WORKDIR/LinkTarget/StaticLibrary/*.a $LO_WORKDIR/UnpackedTarball/*/.libs/*.a $LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a $LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a $LO_WORKDIR/UnpackedTarball/openssl/*.a; do\n    ln -f $file $dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n# copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb          $dest_resource\ncp $LO_OUTDIR/bin/udkapi.rdb          $dest_resource\ncp $LO_OUTDIR/bin/oovbaapi.rdb        $dest_resource\ncp $LO_INSTDIR/program/services/services.rdb  $dest_resource\ncp $LO_INSTDIR/ure/share/misc/services.rdb    $dest_resource/ure\n\n# copy .res files\n# program/resou
 rce is hardcoded in tools/source/rc/resmgr.cxx. Sure,\n# we could set STAR_RESOURCE_PATH instead. sigh...\nmkdir -p $dest_resource/program/resource\ncp $LO_INSTDIR/program/resource/*en-US.res $dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p $dest_resource/share/config\ncp -R $LO_INSTDIR/share/config/soffice.cfg $dest_resource/share/config\n            \n# \"registry\"\ncp -R $LO_INSTDIR/share/registry $dest_resource/share\n            \n# Set up rc, the \"inifile\". See getIniFileName_Impl().\nfile=$dest_resource/rc\necho '[Bootstrap]'                                      >  $file\necho 'URE_BOOTSTRAP=file://$APP_DATA_DIR/fundamentalrc' >> $file\necho 'HOME=$APP_DATA_DIR/tmp'                           >> $file\n\n# Set up fundamentalrc, unorc, bootstraprc and versionrc.\n# Do we really need all these?\nfile=$dest_resource/fundamentalrc\necho '[Bootstrap]'                                      >  $file\necho 'BRAND_BASE_DIR=file://$APP_DATA_DIR'              >> $file
 \necho 'CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/registry' >> $file\n\nfile=$dest_resource/unorc\necho '[Bootstrap]' > $file\n\n# bootstraprc must be in $BRAND_BASE_DIR/program\nmkdir -p $dest_resource/program\nfile=$dest_resource/program/bootstraprc\necho '[Bootstrap]'                                                              >  $file\necho 'InstallMode=<installmode>'                                                >> $file\necho \"ProductKey=LibreOffice $product_ver\"                                      >> $file\necho 'UserInstallation=file://$APP_DATA_DIR/../Library/Application%20Support'   >> $file\n\n# Is this really needed?\nfile=$dest_resource/program/versionrc\necho '[Version]'            >  $file\necho 'AllLanguages=en-US'   >> $file\necho 'BuildVersion='        >> $file\necho \"buildid=$buildid\"     >> $file\necho 'ProductMajor=360'     >> $file\necho 'ProductMinor=1'       >> $file\n           ";
+			shellScript = "dest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p' $LO_BUILDDIR/config_host.mk`\nbuildid=`(cd $LO_SRCDIR && git log -1 --format=%H)`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor file in $LO_OUTDIR/lib/*.a $LO_INSTDIR/program/*.a $LO_WORKDIR/LinkTarget/StaticLibrary/*.a $LO_WORKDIR/UnpackedTarball/*/.libs/*.a $LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a $LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a $LO_WORKDIR/UnpackedTarball/openssl/*.a; do\n    ln -f $file $dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n# copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb          $dest_resource\ncp $LO_OUTDIR/bin/udkapi.rdb          $dest_resource\ncp $LO_OUTDIR/bin/oovbaapi.rdb        $dest_resource\ncp $LO_INSTDIR/program/services/services.rdb  $dest_resource\ncp $LO_INSTDIR/ure/share/misc/services.rdb    $dest_resource/ure\n\n# copy .res fil
 es\n# program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure,\n# we could set STAR_RESOURCE_PATH instead. sigh...\nmkdir -p $dest_resource/program/resource\ncp $LO_INSTDIR/program/resource/*en-US.res $dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p $dest_resource/share/config\ncp -R $LO_INSTDIR/share/config/soffice.cfg $dest_resource/share/config\n            \n# \"registry\"\ncp -R $LO_INSTDIR/share/registry $dest_resource/share\n            \n# Set up rc, the \"inifile\". See getIniFileName_Impl().\nfile=$dest_resource/rc\necho '[Bootstrap]'                                      >  $file\necho 'URE_BOOTSTRAP=file://$APP_DATA_DIR/fundamentalrc' >> $file\necho 'HOME=$APP_DATA_DIR/tmp'                           >> $file\n\n# Set up fundamentalrc, unorc, bootstraprc and versionrc.\n# Do we really need all these?\nfile=$dest_resource/fundamentalrc\necho '[Bootstrap]'                                      >  $file\necho 'BRAND_BASE_DIR=file://$APP_DATA_DIR'   
            >> $file\necho 'CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/registry' >> $file\n\nfile=$dest_resource/unorc\necho '[Bootstrap]' > $file\n\n# bootstraprc must be in $BRAND_BASE_DIR/program\nmkdir -p $dest_resource/program\nfile=$dest_resource/program/bootstraprc\necho '[Bootstrap]'                                                              >  $file\necho 'InstallMode=<installmode>'                                                >> $file\necho \"ProductKey=LibreOffice $product_ver\"                                      >> $file\necho 'UserInstallation=file://$APP_DATA_DIR/../Library/Application%20Support'   >> $file\n\n# Is this really needed?\nfile=$dest_resource/program/versionrc\necho '[Version]'            >  $file\necho 'AllLanguages=en-US'   >> $file\necho 'BuildVersion='        >> $file\necho \"buildid=$buildid\"     >> $file\necho 'ProductMajor=360'     >> $file\necho 'ProductMinor=1'       >> $file\n           ";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 7a37545..f4e16a9 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -15,6 +15,7 @@
 LO_BUILDDIR = @BUILDDIR@
 LO_INSTDIR = @INSTDIR@
 LO_OUTDIR = @OUTDIR@
+LO_SRCDIR = @SRC_ROOT@
 LO_WORKDIR = @WORKDIR@
 
 // These are actual Xcode-known settings. The corresponding autoconf
diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
index 8766188..9c5d25a 100644
--- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
+++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
@@ -479,7 +479,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(LO_BUILDDIR)/config_host",
-					../../include,
+					"$(LO_SRCDIR)/include",
 					"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
 					"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
 				);
@@ -513,7 +513,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(LO_BUILDDIR)/config_host",
-					../../include,
+					"$(LO_SRCDIR)/include",
 					"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
 					"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
 				);


More information about the Libreoffice-commits mailing list