strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

We want config_host, not config_build

Browse source 
We use GNU cross-compilation terminology: "host" means the platform
the code being compiled will run on (this is often somewhat surprising
to those unaware), and "build" means the platform the build tools (=
the compiler, linker etc) is running on.

For an iOS app, "host" is iOS and "build" is OS X.

There is also "target" but it is in this case the same as
"host". (Only in a so-called Canadian Cross situation is "target"
different from "host" (and from "build").)

Change-Id: I6eefa982916f0660afd259770bf455cf28793670
This commit is contained in:
Tor Lillqvist 2013-10-15 23:32:04 +03:00
parent f222e8efcf
commit 389a61ab46
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
View file

@ -1491,7 +1491,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "dest_lib=lib_link\ndest_resource=resource_link\nsrc=$BUILDDIR/solver/unxiosr.pro\nsrc2=$BUILDDIR/instdir/unxiosr.pro\nproduct_ver=`sed -ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p' $BUILDDIR/config_build.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 $src/lib/*.a; do\n ln $file $dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n# copy rdb files\ncp $src/bin/offapi.rdb $dest_resource\ncp $src/bin/udkapi.rdb $dest_resource\ncp $src/bin/oovbaapi.rdb $dest_resource\ncp $src/xml/services.rdb $dest_resource\ncp $src/xml/ure/services.rdb $dest_resource/ure\n\n# copy \"registry\" files\nmkdir -p $dest_resource/registry/modules $dest_resource/registry/res\ncp $src/xml/*.xcd $dest_resource/registry\nmv $dest_resource/registry/fcfg_langpack_en-US.xcd $dest_resource/registry/res\ncp -R $src/xml/registry/* $dest_resource/registry\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 $src/bin/*en-US.res $dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p $dest_resource/share/config\ncp -R $src2/share/config/soffice.cfg $dest_resource/share/config\n \n# \"registry\"\nmkdir -p $dest_resource/share/registry/res\ncp $src/xml/*.xcd $dest_resource/share/registry\nmv $dest_resource/share/registry/fcfg_langpack_en-US.xcd $dest_resource/share/registry/res\ncp -R $src/xml/registry/* $dest_resource/share/registry\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 = "dest_lib=lib_link\ndest_resource=resource_link\nsrc=$BUILDDIR/solver/unxiosr.pro\nsrc2=$BUILDDIR/instdir/unxiosr.pro\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 $src/lib/*.a; do\n ln $file $dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n# copy rdb files\ncp $src/bin/offapi.rdb $dest_resource\ncp $src/bin/udkapi.rdb $dest_resource\ncp $src/bin/oovbaapi.rdb $dest_resource\ncp $src/xml/services.rdb $dest_resource\ncp $src/xml/ure/services.rdb $dest_resource/ure\n\n# copy \"registry\" files\nmkdir -p $dest_resource/registry/modules $dest_resource/registry/res\ncp $src/xml/*.xcd $dest_resource/registry\nmv $dest_resource/registry/fcfg_langpack_en-US.xcd $dest_resource/registry/res\ncp -R $src/xml/registry/* $dest_resource/registry\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 $src/bin/*en-US.res $dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p $dest_resource/share/config\ncp -R $src2/share/config/soffice.cfg $dest_resource/share/config\n \n# \"registry\"\nmkdir -p $dest_resource/share/registry/res\ncp $src/xml/*.xcd $dest_resource/share/registry\nmv $dest_resource/share/registry/fcfg_langpack_en-US.xcd $dest_resource/share/registry/res\ncp -R $src/xml/registry/* $dest_resource/share/registry\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 ";
};
/* End PBXShellScriptBuildPhase section */

4
ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
View file

@ -479,8 +479,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(BUILDDIR)/config_host",
../../include,
"$(BUILDDIR)/config_build",
"$(BUILDDIR)/workdir/unxiosr.pro/UnoApiHeadersTarget/udkapi/comprehensive",
"$(BUILDDIR)/workdir/unxiosr.pro/UnoApiHeadersTarget/offapi/comprehensive",
);
@ -514,8 +514,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(BUILDDIR)/config_host",
../../include,
"$(BUILDDIR)/config_build",
"$(BUILDDIR)/workdir/unxiosr.pro/UnoApiHeadersTarget/udkapi/comprehensive",
"$(BUILDDIR)/workdir/unxiosr.pro/UnoApiHeadersTarget/offapi/comprehensive",
);