ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 2 -
ios/lo.xcconfig.in | 14
+++++++---
ios/shared/ios_sharedlo.xcodeproj/project.pbxproj | 12
++++----
3 files changed, 17 insertions(+), 11 deletions(-)
New commits:
commit ea8028a575f666ae32e2564a0d3557287909030f
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Oct 16 15:56:04 2013 +0300
For clarity, prefix the LO-specific Xcode configuration variables with LO_
Change-Id: I196feb392f9ebebfdcd6f6e0ecd2c9cc89707cbb
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index d29c166..f1a3b42 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 = "set
-x\ndest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne
's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p'
$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
$OUTDIR/lib/*.a $INSTDIR/program/*.a $WORKDIR/LinkTarget/StaticLibrary/*.a
$WORKDIR/UnpackedTarball/*/.libs/*.a $WORKDIR/UnpackedTarball/*/src/.libs/*.a
$WORKDIR/UnpackedTarball/*/src/*/.libs/*.a
$WORKDIR/UnpackedTarball/openssl/*.a; do\n ln $file
$dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n#
copy rdb files\ncp $OUTDIR/bin/offapi.rdb $dest_resource\ncp
$OUTDIR/bin/udkapi.rdb $dest_resource\ncp $OUTDIR/bin/oovbaapi.rdb
$dest_resource\ncp $INSTDIR/program/services/services.rdb
$dest_resource\ncp $INSTDIR/ure/share/misc/services.rdb
$dest_resource/ure\n\n# copy .res files\n# program/resource is hardcoded in
tools/source/r
c/resmgr.cxx. Sure,\n# we could set STAR_RESOURCE_PATH instead. sigh...\nmkdir
-p $dest_resource/program/resource\ncp $INSTDIR/program/resource/*en-US.res
$dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p
$dest_resource/share/config\ncp -R $INSTDIR/share/config/soffice.cfg
$dest_resource/share/config\n \n# \"registry\"\ncp -R
$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 = "set
-x\ndest_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 $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/
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 5bf254b..4121cbc 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -6,7 +6,13 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-BUILDDIR = @BUILDDIR@
-INSTDIR = @INSTDIR@
-OUTDIR = @OUTDIR@
-WORKDIR = @WORKDIR@
+// Xcode configuration variables
+
+// To avoid confusion, the LO-specific ones that aren't as such used
+// by Xcode (but only expanded in option values) are prefixed with
+// LO_.
+
+LO_BUILDDIR = @BUILDDIR@
+LO_INSTDIR = @INSTDIR@
+LO_OUTDIR = @OUTDIR@
+LO_WORKDIR = @WORKDIR@
diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
index 0ef4524..fc9aa39 100644
--- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
+++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
@@ -479,10 +479,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
- "$(BUILDDIR)/config_host",
+ "$(LO_BUILDDIR)/config_host",
../../include,
-
"$(WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
-
"$(WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
);
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LD_NO_PIE = NO;
@@ -514,10 +514,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
- "$(BUILDDIR)/config_host",
+ "$(LO_BUILDDIR)/config_host",
../../include,
-
"$(WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
-
"$(WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
);
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LD_NO_PIE = NO;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
