[Libreoffice-commits] core.git: ios/MobileLibreOffice

[Tor Lillqvist]

 ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1204d2ff819300c17770d4cc84d2b63372963f65
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Oct 16 01:57:45 2013 +0300

    Adapt to changed directory structure in fundamentalrc
    
    With this change, the MobileLibreOffice app builds and runs for me.
    
    Change-Id: I8c7ce3fdedced5eb82ed18e21873e773733d612f

diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index c5a6cf3..d29c166 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}/registry module:${BRAND_BASE_DIR}/registry/modules 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' $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           ";
 		};
 /* End PBXShellScriptBuildPhase section */