ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 2 +-
ios/lo.xcconfig.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 71e1c79acebab5fc6a31457416c24c4a33141c33
Author: Roi Illouz <roi.ill...@cloudon.com>
Date: Sun Oct 27 12:12:38 2013 +0200
Remove trailing whitespaces
Change-Id: I31ba2180b558ee2a556dc0e98619828861c6368c
Reviewed-on: https://gerrit.libreoffice.org/6446
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 7649067..3bdc79a 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -18,7 +18,7 @@ LO_OUTDIR = @OUTDIR@
LO_SRCDIR = @SRC_ROOT@
LO_WORKDIR = @WORKDIR@
-LINK_LDFLAGS =
+LINK_LDFLAGS =
// These are actual Xcode-known settings. The corresponding autoconf
// variables are prefixed with XCODE_ to make it clear in configure.ac
commit 7de58c3c44b79a44798eb4e503d252f2a7b6e29a
Author: Roi Illouz <roi.ill...@cloudon.com>
Date: Sun Oct 27 11:01:01 2013 +0200
No more lib dir. Linking to original files
Change-Id: If63add1f1bfdb9f5a2bcdc0c942bf991cbc47dfc
Reviewed-on: https://gerrit.libreoffice.org/6445
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 48aea55..36a6346 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -453,7 +453,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript =
"dest_lib=$LO_BUILDDIR/ios/lib\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# Populate lo.xcconfig\nflags=-L$dest_lib\nfor
lib in $dest_lib/lib*.a; do\n base=${lib##*/lib}\n base=${base%\\.a}\n
flags+=\" -l${base}\"\ndone\n\nfile=../lo.xcconfig\nsed -i '' -e
\"s|^\\(LINK_LDFLAGS =\\).*$|\\1 $flags|\" $file\n \n# Resources #\nmkdir -p
$dest_resource/ure\n\n# copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb
$dest_res
ource\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/progra
m/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_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 $dest_resource\nmkdir -p
$dest_resource\n\n#touch $SRCROOT/MobileLibreOffice/main.m\n\n# Libs #\nfor
path in $LO_OUTDIR/lib $LO_INSTDIR/program $LO_WORKDIR/LinkTarget/StaticLibrary
$LO_WORKDIR/UnpackedTarball/*/.libs/ $LO_WORKDIR/UnpackedTarball/*/src/.libs
$LO_WORKDIR/UnpackedTarball/*/src/*/.libs $LO_WORKDIR/UnpackedTarball/openssl;
do\n flags+=\" -L$path\"\n for lib in $path/lib*.a; do\n if [ ! -r
$lib ]; then\n continue\n fi\n base=${lib##*/lib}\n
base=${base%\\.a}\n flags+=\" -l${base}\"\n
done\ndone\n\nfile=../lo.xcconfig\nsed -i '' -e \"s|^\\(LINK_LDFLAGS
=\\).*$|\\1 $flags|\" $file\n \n# Resources #\nmkdir -p
$dest_resource/ure\n\n# copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb
$dest_resource\ncp $LO_O
UTDIR/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\nec
ho '[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 */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
