[Libreoffice-commits] core.git: 10 commits - configure.ac ios/.gitignore ios/lo.xcconfig ios/lo.xcconfig.in ios/MobileLibreOffice ios/shared
Tor Lillqvist
tml at collabora.com
Tue Oct 15 14:17:48 PDT 2013
configure.ac | 6 ++--
ios/.gitignore | 9 ++++++
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 4 ++
ios/lo.xcconfig | 8 -----
ios/lo.xcconfig.in | 12 ++++++++
ios/shared/ios_sharedlo.xcodeproj/project.pbxproj | 14 +++++-----
ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m | 2 -
ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m | 4 ++
8 files changed, 40 insertions(+), 19 deletions(-)
New commits:
commit 4afeb5c4adbb6907ca9d6cbcc2036ea2bc83f4a8
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 16 00:15:51 2013 +0300
Adapt to recent changes in solver/instdir/workdir structure
Change-Id: I1286feafa1a11fe30aa4f8383c094661aa10db92
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 846a923..19fbb87 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -1491,7 +1491,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "dest_lib=lib_link\ndest_resource=resource_link\nsrc=$OUTDIR\nsrc2=$INSTDIR\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# progr
am/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 thes
e?\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-U
S' >> $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; 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/rc/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 $de
st_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\nmkdi
r -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 */
commit f42245a1c0556a18ae9ba4a5828f799d1fceb5af
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 15 23:58:46 2013 +0300
Use OUTDIR and INSTDIR in the shell script
Change-Id: I400fc5d0d572b3eab99f8da20162de1191cf3a53
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index cbdca90..846a923 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -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_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_resou
rce/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 an
d 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=$OUTDIR\nsrc2=$INSTDIR\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# progr
am/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 thes
e?\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-U
S' >> $file\necho 'BuildVersion=' >> $file\necho \"buildid=$buildid\" >> $file\necho 'ProductMajor=360' >> $file\necho 'ProductMinor=1' >> $file\n ";
};
/* End PBXShellScriptBuildPhase section */
commit 0cba01cbf66d2aaecff9538c34829cd23870b091
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 15 23:56:14 2013 +0300
Add OUTDIR
Change-Id: I1b3b22a9de54559a0b89c91fb10ef6f90ccb1ceb
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index d46f7fb..5bf254b 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -8,4 +8,5 @@
BUILDDIR = @BUILDDIR@
INSTDIR = @INSTDIR@
+OUTDIR = @OUTDIR@
WORKDIR = @WORKDIR@
commit 93267ff3e52db97d158016b620b6e5ec64ce1531
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 15 23:53:15 2013 +0300
Adapt to changed <touch/touch.h> API
Change-Id: I9304a0a08c6eed79726700cdc8451dc0fbe613cf
diff --git a/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m b/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
index 51492df..ea81427 100644
--- a/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
+++ b/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m
@@ -327,7 +327,7 @@ static const BOOL ENABLE_LO_EVENTS_DURING_PINCH = NO;
[self onScroll:state deltaY: limitedDeltaY];
- lo_pan(limitedDeltaX, limitedDeltaY);
+ touch_lo_pan(limitedDeltaX, limitedDeltaY);
return YES;
}
diff --git a/ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m b/ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m
index 3f9818e..9c428b2 100644
--- a/ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m
+++ b/ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m
@@ -317,8 +317,10 @@ typedef enum {X,Y,Z} MLOGestureDirection;
// dispatch_async() consistently.
-void touch_ui_damaged(CGRect rect)
+void touch_ui_damaged(int minX, int minY, int width, int height)
{
+ CGRect rect = CGRectMake(minX, minY, width, height);
+
dispatch_async(dispatch_get_main_queue(), ^{
[[MLORenderManager getInstance] renderWithRect:rect];
commit a3ff47a4c21518760786a0d15a178ebbe78ac7a7
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 15 23:46:11 2013 +0300
Use WORKDIR instead of hardcoding unxiosr.pro
In a --enable-dbgutil build there is no ".pro" suffix.
Change-Id: Id95f5a4a972059a9c67985a8c15405a9303ad6b2
diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
index aafc896..2c59fbf 100644
--- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
+++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
@@ -481,8 +481,8 @@
HEADER_SEARCH_PATHS = (
"$(BUILDDIR)/config_host",
../../include,
- "$(BUILDDIR)/workdir/unxiosr.pro/UnoApiHeadersTarget/udkapi/comprehensive",
- "$(BUILDDIR)/workdir/unxiosr.pro/UnoApiHeadersTarget/offapi/comprehensive",
+ "$(WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
+ "$(WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
);
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LD_NO_PIE = NO;
@@ -516,8 +516,8 @@
HEADER_SEARCH_PATHS = (
"$(BUILDDIR)/config_host",
../../include,
- "$(BUILDDIR)/workdir/unxiosr.pro/UnoApiHeadersTarget/udkapi/comprehensive",
- "$(BUILDDIR)/workdir/unxiosr.pro/UnoApiHeadersTarget/offapi/comprehensive",
+ "$(WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
+ "$(WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
);
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LD_NO_PIE = NO;
commit 3de8a0fda4fc5de35d6659d02ff9e72e8290dfe3
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 15 23:38:46 2013 +0300
There is no "make" mode at least in my Emacs
Change-Id: If693c4ddcd560336df6878a0a83e445d889d30de
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 4f3183c..d46f7fb 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -1,4 +1,4 @@
-// -*- Mode: make; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+// -*- Mode: text; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
//
// This file is part of the LibreOffice project.
//
commit 389a61ab466b20eee1d854f7c984a1ac673193b9
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 15 23:32:04 2013 +0300
We want config_host, not config_build
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
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 261b60c..cbdca90 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -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_reso
urce/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 a
nd 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_resou
rce/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 an
d 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 */
diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
index 885d1a9..aafc896 100644
--- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
+++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
@@ -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",
);
commit f222e8efcfd290c8fb3a180fd83dde615915d1ef
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 15 23:29:43 2013 +0300
Set ARCHS = armv7 otherwise Xcode complains for me about armv7s
Change-Id: I59767af5fe4b2067a175c6882ecb3edf3c4ee2f7
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index b0a052c..261b60c 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -1530,6 +1530,7 @@
baseConfigurationReference = 688EAAE8180D3130003741B3 /* lo.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_ENABLE_OBJC_ARC = YES;
@@ -1574,6 +1575,7 @@
baseConfigurationReference = 688EAAE8180D3130003741B3 /* lo.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_ENABLE_OBJC_ARC = YES;
diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
index 97714fa..885d1a9 100644
--- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
+++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
@@ -457,6 +457,7 @@
baseConfigurationReference = 689EBADD1806975D002F1CD7 /* lo.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_ENABLE_OBJC_ARC = YES;
@@ -497,6 +498,7 @@
baseConfigurationReference = 689EBADD1806975D002F1CD7 /* lo.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_ENABLE_OBJC_ARC = YES;
commit 298c69d56e6dae8c503b19913b7186d6db829b92
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 15 23:23:29 2013 +0300
Generate the ios/lo.xcconfig at configure time
Also, add INSTDIR and WORKDIR.
Change-Id: I16266202c2e2d005533f7ffbcc2ae41f63833928
diff --git a/configure.ac b/configure.ac
index 0375a34..04c6270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4460,7 +4460,8 @@ if test "$cross_compiling" = "yes"; then
lo.xcent.in \
instsetoo_native/util/openoffice.lst.in \
config_host/*.in \
- sysui/desktop/macosx/Info.plist.in) \
+ sysui/desktop/macosx/Info.plist.in \
+ ios/lo.xcconfig.in) \
| (cd CONF-FOR-BUILD && tar xf -)
cp configure CONF-FOR-BUILD
test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
@@ -12630,7 +12631,8 @@ AC_CONFIG_FILES([config_host.mk
Makefile
lo.xcent
instsetoo_native/util/openoffice.lst
- sysui/desktop/macosx/Info.plist])
+ sysui/desktop/macosx/Info.plist
+ ios/lo.xcconfig])
AC_CONFIG_HEADERS([config_host/config_buildid.h])
AC_CONFIG_HEADERS([config_host/config_clang.h])
AC_CONFIG_HEADERS([config_host/config_features.h])
diff --git a/ios/.gitignore b/ios/.gitignore
new file mode 100644
index 0000000..08c6a68
--- /dev/null
+++ b/ios/.gitignore
@@ -0,0 +1,9 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+#
+
+/lo.xcconfig
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
new file mode 100644
index 0000000..4f3183c
--- /dev/null
+++ b/ios/lo.xcconfig.in
@@ -0,0 +1,11 @@
+// -*- Mode: make; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+//
+// This file is part of the LibreOffice project.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// 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@
+WORKDIR = @WORKDIR@
commit 848d06690c28ab0a634c2ac979c2e34047522dbe
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 15 23:16:27 2013 +0300
Remove file that contained pathname specific to one developer's machine
Change-Id: Ia8eb3ad11c947bae64b5758fd4c0820bf3c09905
diff --git a/ios/lo.xcconfig b/ios/lo.xcconfig
deleted file mode 100644
index 75d711b..0000000
--- a/ios/lo.xcconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- Mode: make; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-//
-// This file is part of the LibreOffice project.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// 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 = /Users/ptyl/skunk/lo-core-poc/cloudon/release_ios/build
\ No newline at end of file
More information about the Libreoffice-commits
mailing list