ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 2 +- solenv/gbuild/platform/IOS_ARM_GCC.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit 3b0aa94f1c2d629ec53034973892e0f66a8d5981 Author: Tor Lillqvist <t...@collabora.com> Date: Tue Oct 29 11:34:22 2013 +0200 Pick up the xslt libs, too Change-Id: Ic35d071e65759adbdc63d76e45459f151f781cfe diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj index 48aea55..7663e69 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_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 $LO_WORKDIR/UnpackedTarball/xslt/*/.libs/*.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_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\n echo '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 th is 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 */ commit 138f40334375bee4689a6b2b95326e6e26408228 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Oct 24 01:54:32 2013 +0300 The icu, xml2 and libxslt libs moved Just so that a full make will succeed in this branch, too. Cherry-pick of beda848f388685b0fcb60c590fb691029c23a26b Change-Id: I202ab418d2cf0d4f0f9d7786fec837dd76abd7b5 diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index fea5802..aac083b 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -123,6 +123,7 @@ define gb_LinkTarget__command_dynamiclink $(HYPHEN_LIB) \ $(MYTHES_LIBS) \ $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \ @@ -131,6 +132,8 @@ define gb_LinkTarget__command_dynamiclink $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/xml2/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs/*.a) \ $(T_LIBS) \ -o $(1)) endef _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits