[Libreoffice-commits] core.git: Branch 'feature/android-viewer-lok' - 7 commits - android/Bootstrap android/experimental desktop/source include/sal sal/osl sal/rtl
Jan Holesovsky
kendy at collabora.com
Mon Jun 30 00:01:37 PDT 2014
android/Bootstrap/Makefile.shared | 95 +++++++++
android/experimental/DocumentLoader/Makefile | 97 ---------
android/experimental/LOAndroid3/AndroidManifest.xml | 1
android/experimental/LOAndroid3/Makefile | 94 ---------
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java | 4
android/experimental/LibreOffice4Android/Makefile | 94 ---------
android/experimental/desktop/Makefile | 99 ----------
desktop/source/lib/init.cxx | 2
include/sal/log-areas.dox | 1
sal/osl/unx/file.cxx | 2
sal/rtl/bootstrap.cxx | 5
11 files changed, 109 insertions(+), 385 deletions(-)
New commits:
commit 02e5efdd87ab6460625084b83525ff7735962f5e
Author: Jan Holesovsky <kendy at collabora.com>
Date: Mon Jun 30 08:10:39 2014 +0200
It is useful to know what macros are we expanding, and to what.
Change-Id: If7704edc5baa9759abc680b8d2040b9cdfe92317
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 1627ad2..c5d1196 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -20,6 +20,7 @@ certain functionality.
@section SAL
+ at li @c sal.bootstrap - SAL bootstrap
@li @c sal.debug - SAL debugging functionality
@li @c sal.file
@li @c sal.osl - SAL OSL library
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index c93aa0c..cf5b9ca 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -895,6 +895,7 @@ rtl::OUString expandMacros(
Bootstrap_Impl const * file, rtl::OUString const & text, LookupMode mode,
ExpandRequestLink const * requestStack)
{
+ SAL_INFO("sal.bootstrap", "expandMacros called with: " << text);
rtl::OUStringBuffer buf;
for (sal_Int32 i = 0; i < text.getLength();) {
bool escaped;
@@ -1020,7 +1021,9 @@ rtl::OUString expandMacros(
}
}
}
- return buf.makeStringAndClear();
+ OUString result(buf.makeStringAndClear());
+ SAL_INFO("sal.bootstrap", "expandMacros result: " << result);
+ return result;
}
}
commit fcc97709ea217b44cc43d8186ecabdc03e963980
Author: Jan Holesovsky <kendy at collabora.com>
Date: Mon Jun 30 07:56:12 2014 +0200
android: Enable debugging messages as the first thing we do.
Additionally log what we are trying to open - very useful for debugging
bootstrap problems ;-)
Change-Id: I942b144d97a57cbcb709b2d67029bfa09b339be2
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 3d30dcc..a4ae79c 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -74,9 +74,11 @@ public class LibreOfficeMainActivity extends Activity {
super.onCreate(savedInstanceState);
try {
- LibreOfficeKit.init(this);
+ // enable debugging messages as the first thing
LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO-INFO.legacy.osl");
+ LibreOfficeKit.init(this);
+
setContentView(R.layout.activity_main);
Log.w(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - onCreate");
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index a7eaac1..092f0ffe 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -827,6 +827,8 @@ openFilePath( const char *cpFilePath, oslFileHandle* pHandle, sal_uInt32 uFlags,
oslFileError eRet;
#ifdef ANDROID
+ SAL_INFO("sal.file", "osl_openFile: " << cpFilePath);
+
/* Opening a file from /assets read-only means
* we should mmap it from the .apk file
*/
commit dcfe0787eb062a57134686cd47ee4cbd5c6ff46a
Author: Jan Holesovsky <kendy at collabora.com>
Date: Mon Jun 30 07:49:44 2014 +0200
android: Correct location and name of sofficerc.
Without that, URE_BOOTSTRAP does not get set up, and we are unable to
bootstrap.
Change-Id: I7727e2a9dcbb958e006fadf6243e1ca343633f7e
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index e16de61..a337a80 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -137,19 +137,15 @@ copy-stuff:
mkdir -p assets/share/config
cp -R $(INSTDIR)/share/registry assets/share
cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
-#
-# Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app
-# doesn't use soffice_main() (at least I think it shouldn't), the
-# rtl::Bootstrap::setIniFilename() call there that hardcodes
-# /assets/program/lofficerc isn't executed. Instead the hardcoding of
-# /assets/rc in BootstrapMap::getBaseIni() gets used.
- echo '[Bootstrap]' > assets/rc
- echo 'Logo=1' >> assets/rc
- echo 'NativeProgress=1' >> assets/rc
- echo 'URE_BOOTSTRAP=file:///assets/program/fundamentalrc' >> assets/rc
-# echo 'RTL_LOGFILE=file:///dev/log/main' >> assets/rc
- echo 'HOME=$$APP_DATA_DIR/cache' >> assets/rc
- echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> assets/rc
+
+ mkdir -p assets/unpack/program
+ echo '[Bootstrap]' > assets/unpack/program/sofficerc
+ echo 'Logo=1' >> assets/unpack/program/sofficerc
+ echo 'NativeProgress=1' >> assets/unpack/program/sofficerc
+ echo 'URE_BOOTSTRAP=file:///assets/program/fundamentalrc' >> assets/unpack/program/sofficerc
+# echo 'RTL_LOGFILE=file:///dev/log/main' >> assets/unpack/program/sofficerc
+ echo 'HOME=$$APP_DATA_DIR/cache' >> assets/unpack/program/sofficerc
+ echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> assets/unpack/program/sofficerc
#
# Set up fundamentalrc
echo '[Bootstrap]' > assets/program/fundamentalrc
commit 77862facf4e3bda1048fc85a1213153bdd40edc7
Author: Jan Holesovsky <kendy at collabora.com>
Date: Mon Jun 30 07:48:17 2014 +0200
lok: Correct sofficerc path for bootstrap.
Change-Id: I229958c0f2c6f8905926c95cabd45fa58aed3da1
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3b163c5..5c1c014 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -535,7 +535,7 @@ static void aBasicErrorFunc(const OUString& rError, const OUString& rAction)
static void initialize_uno(const OUString &aAppURL)
{
- rtl::Bootstrap::setIniFilename( aAppURL + "/sofficerc" );
+ rtl::Bootstrap::setIniFilename(aAppURL + "/" + LIBO_ETC_FOLDER + "/" + SAL_CONFIGFILE("soffice"));
xContext = cppu::defaultBootstrap_InitialComponentContext();
fprintf(stderr, "Uno initialized %d\n", xContext.is());
commit 7a11304a5d873e334b76edcb7af5d746de36095a
Author: Jan Holesovsky <kendy at collabora.com>
Date: Sun Jun 29 10:47:34 2014 +0200
android: Relink liblo-native-code.so when a library changes.
This is so that calls like 'make configmgr android' produce an .apk with
updated code changes from configmgr as expected.
Change-Id: I5f576b01269cf3f559a8a6389af298a3758e7309
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index a8b278f..e16de61 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -75,9 +75,11 @@ clean: android_version_setup properties
# Build / link the single .so for this app
#
+ALL_STATIC_LIBS := $(shell $(SRCDIR)/bin/lo-all-static-libs)
+
LIBS = \
-Wl,--start-group \
- $(shell $(SRCDIR)/bin/lo-all-static-libs) \
+ $(ALL_STATIC_LIBS) \
-Wl,--end-group
WHOLELIBS = \
@@ -88,13 +90,14 @@ WHOLELIBS = \
-Wl,--no-whole-archive
-$(OBJLOCAL)/liblo-native-code.so : native-code.cxx dummies.cxx
+$(OBJLOCAL)/liblo-native-code.so : native-code.cxx dummies.cxx $(ALL_STATIC_LIBS)
mkdir -p $(OBJLOCAL)
$(CXX) -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx dummies.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
$(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so
+ #to keep some symbols, eg.: $(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so -w -K 'Java*'
# shrinkme $(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so
commit c35640c4fd81db76373aba0d5846b274a1aafe97
Author: Jan Holesovsky <kendy at collabora.com>
Date: Sun Jun 29 07:57:01 2014 +0200
android: Make LOAndroid3 debuggable.
Change-Id: I0fcfd784d6705cfab4790e1023851d5c537a482f
diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml b/android/experimental/LOAndroid3/AndroidManifest.xml
index 81e8822..d456ca6 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml
@@ -12,6 +12,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<application
+ android:debuggable="true"
android:allowBackup="true"
android:icon="@drawable/main"
android:label="@string/app_name"
commit 6898c1b322fc7cbc93a1215535b93807b19b03f9
Author: Jan Holesovsky <kendy at collabora.com>
Date: Sun Jun 29 01:19:54 2014 +0200
android: copy-stuff rule is copy'n'pasted around, consolidate it.
Change-Id: I0a746904fa363f987e96165d8def326eb87dcf8f
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 7aae130..a8b278f 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -107,3 +107,95 @@ link-so: $(SODEST)/liblo-native-code.so
stop-start-cycle:
$(ANDROID_SDK_HOME)/platform-tools/adb shell stop && $(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10
+
+copy-stuff:
+# Then "assets". Let the directory structure under assets mimic
+# that under solver for now.
+#
+# Please note that I have no idea what all of this is really necessary and for
+# much of this stuff being copied, no idea whether it makes any sense at all.
+# Much of this is copy-pasted from android/qa/sc/Makefile (where a couple of
+# unit tests for sc are built, and those do seem to mostly work) and
+# android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some
+# extent).
+#
+ mkdir -p assets/gz.unpack/program/ure assets/lib assets/program/services assets/ure/share/misc assets/ComponentTarget/i18npool/util
+ gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb >assets/gz.unpack/program/offapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb
+ gzip -9 <$(INSTDIR)/$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb >assets/gz.unpack/program/udkapi.rdb
+# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!?
+ for F in program/services/services ure/share/misc/services; do \
+ sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$$APP_DATA_DIR/lib/!g' <$(INSTDIR)/$$F.rdb >assets/$$F.rdb; \
+ done
+ cp $(SRC_ROOT)/odk/examples/java/DocumentHandling/test/test1.odt \
+ assets
+ cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util
+#
+ mkdir -p assets/share/config
+ cp -R $(INSTDIR)/share/registry assets/share
+ cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
+#
+# Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app
+# doesn't use soffice_main() (at least I think it shouldn't), the
+# rtl::Bootstrap::setIniFilename() call there that hardcodes
+# /assets/program/lofficerc isn't executed. Instead the hardcoding of
+# /assets/rc in BootstrapMap::getBaseIni() gets used.
+ echo '[Bootstrap]' > assets/rc
+ echo 'Logo=1' >> assets/rc
+ echo 'NativeProgress=1' >> assets/rc
+ echo 'URE_BOOTSTRAP=file:///assets/program/fundamentalrc' >> assets/rc
+# echo 'RTL_LOGFILE=file:///dev/log/main' >> assets/rc
+ echo 'HOME=$$APP_DATA_DIR/cache' >> assets/rc
+ echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> assets/rc
+#
+# Set up fundamentalrc
+ echo '[Bootstrap]' > assets/program/fundamentalrc
+ echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc
+ echo 'URE_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc # checkme - is this used to find configs ?
+ echo 'BRAND_BASE_DIR=file:///assets' >> assets/program/fundamentalrc
+ echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
+ echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway' >> assets/program/fundamentalrc
+#
+# Set up unorc
+ echo '[Bootstrap]' > assets/program/unorc
+ echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/unorc
+ echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/udkapi.rdb file://$$APP_DATA_DIR/program/offapi.rdb file://$$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/unorc
+ echo 'UNO_SERVICES=file:///assets/ure/share/misc/services.rdb file:///assets/program/services/services.rdb' >> assets/program/unorc
+#
+# Set up bootstraprc
+ echo '[Bootstrap]' > assets/program/bootstraprc
+ echo 'InstallMode=<installmode>' >> assets/program/bootstraprc
+ echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' >> assets/program/bootstraprc
+ echo 'UserInstallation=file://$$APP_DATA_DIR' >> assets/program/bootstraprc
+#
+# Set up versionrc
+ echo '[Version]' > assets/program/versionrc
+ echo 'AllLanguages=en-US' >> assets/program/versionrc
+ echo 'BuildVersion=' >> assets/program/versionrc
+ echo 'buildid=dead-beef' >> assets/program/versionrc
+ echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)0' >> assets/program/versionrc
+ echo 'ProductMinor=1' >> assets/program/versionrc
+ echo 'ReferenceOOoMajorMinor=4.1' >> assets/program/versionrc
+#
+# .res files
+ mkdir -p assets/program/resource
+ cp $(INSTDIR)/$(LIBO_SHARE_RESOURCE_FOLDER)/*en-US.res assets/program/resource
+#
+# Assets that are unpacked at run-time into the app's data directory. These
+# are files read by non-LO code, fontconfig and freetype for now, that doesn't
+# understand "/assets" paths.
+ mkdir -p assets/unpack/etc/fonts
+ cp fonts.conf assets/unpack/etc/fonts
+# $UserInstallation/user/fonts is added to the fontconfig path in
+# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
+# set to the app's data dir above.
+ mkdir -p assets/gz.unpack/user/fonts
+ for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf $(INSTDIR)/share/fonts/truetype/Gen*.ttf $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
+ gzip -9 <$$F >assets/gz.unpack/user/fonts/`basename $$F`; \
+ done
+#
+# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
+#
+ mkdir -p $(SODEST)
+ cp $(ANDROID_NDK_GDBSERVER) $(SODEST)
+ echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 7a25fb9..dbe2b5c 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -16,103 +16,6 @@ native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
-g core -g writer \
> $@
-copy-stuff:
-# Then "assets". Let the directory structure under assets mimic
-# that under solver for now.
-#
-# Please note that I have no idea what all of this is really necessary and for
-# much of this stuff being copied, no idea whether it makes any sense at all.
-# Much of this is copy-pasted from android/qa/sc/Makefile (where a couple of
-# unit tests for sc are built, and those do seem to mostly work) and
-# android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some
-# extent).
-#
- mkdir -p assets/gz.unpack/program/ure assets/lib assets/program/services assets/ure/share/misc assets/ComponentTarget/i18npool/util
- gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb >assets/gz.unpack/program/offapi.rdb
- gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 <$(INSTDIR)/$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb >assets/gz.unpack/program/udkapi.rdb
-# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!?
-# So just hardcode the known APP_DATA_PATH for now...
- for F in program/services/services ure/share/misc/services; do \
- sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$(APP_DATA_PATH)/lib/!g' <$(INSTDIR)/$$F.rdb >assets/$$F.rdb; \
- done
- cp $(SRC_ROOT)/odk/examples/java/DocumentHandling/test/test1.odt \
- $(SRC_ROOT)/sw/qa/core/data/odt/test.odt \
- $(SRC_ROOT)/sw/qa/core/data/doc/testVba.doc \
- assets
- cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util
-#
- mkdir -p assets/share/config
- cp -R $(INSTDIR)/share/registry assets/share
- cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
-#
-# Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app
-# doesn't use soffice_main() (at least I think it shouldn't), the
-# rtl::Bootstrap::setIniFilename() call there that hardcodes
-# /assets/program/lofficerc isn't executed. Instead the hardcoding of
-# /assets/rc in BootstrapMap::getBaseIni() gets used.
- echo '[Bootstrap]' > assets/rc
- echo 'Logo=1' >> assets/rc
- echo 'NativeProgress=1' >> assets/rc
- echo 'URE_BOOTSTRAP=file:///assets/program/fundamentalrc' >> assets/rc
-# echo 'RTL_LOGFILE=file:///dev/log/main' >> assets/rc
- echo "HOME=$(APP_DATA_PATH)/cache" >> assets/rc
- echo "OSL_SOCKET_PATH=$(APP_DATA_PATH)/cache" >> assets/rc
-#
-# Set up fundamentalrc
- echo '[Bootstrap]' > assets/program/fundamentalrc
- echo "LO_LIB_DIR=file:$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc
- echo "URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc # checkme - is this used to find configs ?
- echo 'BRAND_BASE_DIR=file:///assets' >> assets/program/fundamentalrc
- echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
- echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> assets/program/fundamentalrc
- echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb file://$(APP_DATA_PATH)/program/oovbaapi.rdb' >> assets/program/fundamentalrc
- echo 'URE_MORE_SERVICES=file:///assets/program/services/services.rdb' >> assets/program/fundamentalrc
-#
-# Set up unorc
- echo '[Bootstrap]' > assets/program/unorc
- echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/unorc
- echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/udkapi.rdb $${URE_MORE_TYPES}' >> assets/program/unorc
- echo 'UNO_SERVICES=file:///assets/ure/share/misc/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc
-#
-# Set up bootstraprc
- echo '[Bootstrap]' > assets/program/bootstraprc
- echo 'InstallMode=<installmode>' >> assets/program/bootstraprc
- echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' >> assets/program/bootstraprc
- echo "UserInstallation=file://$(APP_DATA_PATH)" >> assets/program/bootstraprc
-#
-# Set up versionrc
- echo '[Version]' > assets/program/versionrc
- echo 'AllLanguages=en-US' >> assets/program/versionrc
- echo 'BuildVersion=' >> assets/program/versionrc
- echo 'buildid=dead-beef' >> assets/program/versionrc
- echo 'ProductMajor=360' >> assets/program/versionrc
- echo 'ProductMinor=1' >> assets/program/versionrc
- echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc
-#
-# .res files
- mkdir -p assets/program/resource
- cp $(INSTDIR)/$(LIBO_SHARE_RESOURCE_FOLDER)/*en-US.res assets/program/resource
-#
-# Assets that are unpacked at run-time into the app's data directory. These
-# are files read by non-LO code, fontconfig and freetype for now, that doesn't
-# understand "/assets" paths.
- mkdir -p assets/unpack/etc/fonts
- cp fonts.conf assets/unpack/etc/fonts
-# $UserInstallation/user/fonts is added to the fontconfig path in
-# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
-# set to the app's data dir above.
- mkdir -p assets/gz.unpack/user/fonts
- for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf $(INSTDIR)/share/fonts/truetype/Gen*.ttf $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
- gzip -9 <$$F >assets/gz.unpack/user/fonts/`basename $$F`; \
- done
-#
-# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
-#
- mkdir -p $(SODEST)
- cp $(ANDROID_NDK_GDBSERVER) $(SODEST)
- echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup
-
build-ant: android_version_setup copy-stuff link-so properties
#
# Copy jar files we need
diff --git a/android/experimental/LOAndroid3/Makefile b/android/experimental/LOAndroid3/Makefile
index 5169b2d..445b7fd 100644
--- a/android/experimental/LOAndroid3/Makefile
+++ b/android/experimental/LOAndroid3/Makefile
@@ -15,98 +15,6 @@ include $(BOOTSTRAPDIR)/Makefile.shared
native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< -j -g core -g writer > $@
-copy-stuff:
-# Then "assets". Let the directory structure under assets mimic
-# that under solver for now.
-#
-# Please note that I have no idea what all of this is really necessary and for
-# much of this stuff being copied, no idea whether it makes any sense at all.
-# Much of this is copy-pasted from android/qa/sc/Makefile (where a couple of
-# unit tests for sc are built, and those do seem to mostly work) and
-# android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some
-# extent).
-#
- mkdir -p assets/gz.unpack/program/ure assets/lib assets/program/services assets/ure/share/misc assets/ComponentTarget/i18npool/util
- gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb >assets/gz.unpack/program/offapi.rdb
- gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 <$(INSTDIR)/$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb >assets/gz.unpack/program/udkapi.rdb
-# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!?
- for F in program/services/services ure/share/misc/services; do \
- sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$$APP_DATA_DIR/lib/!g' <$(INSTDIR)/$$F.rdb >assets/$$F.rdb; \
- done
- cp $(SRC_ROOT)/odk/examples/java/DocumentHandling/test/test1.odt \
- assets
- cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util
-#
- mkdir -p assets/share/config
- cp -R $(INSTDIR)/share/registry assets/share
- cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
-#
-# Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app
-# doesn't use soffice_main() (at least I think it shouldn't), the
-# rtl::Bootstrap::setIniFilename() call there that hardcodes
-# /assets/program/lofficerc isn't executed. Instead the hardcoding of
-# /assets/rc in BootstrapMap::getBaseIni() gets used.
- echo '[Bootstrap]' > assets/rc
- echo 'Logo=1' >> assets/rc
- echo 'NativeProgress=1' >> assets/rc
- echo 'URE_BOOTSTRAP=file:///assets/program/fundamentalrc' >> assets/rc
-# echo 'RTL_LOGFILE=file:///dev/log/main' >> assets/rc
- echo 'HOME=$$APP_DATA_DIR/cache' >> assets/rc
- echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> assets/rc
-#
-# Set up fundamentalrc
- echo '[Bootstrap]' > assets/program/fundamentalrc
- echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc
- echo 'URE_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc # checkme - is this used to find configs ?
- echo 'BRAND_BASE_DIR=file:///assets' >> assets/program/fundamentalrc
- echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
- echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway' >> assets/program/fundamentalrc
-#
-# Set up unorc
- echo '[Bootstrap]' > assets/program/unorc
- echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/unorc
- echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/udkapi.rdb file://$$APP_DATA_DIR/program/offapi.rdb file://$$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/unorc
- echo 'UNO_SERVICES=file:///assets/ure/share/misc/services.rdb file:///assets/program/services/services.rdb' >> assets/program/unorc
-#
-# Set up bootstraprc
- echo '[Bootstrap]' > assets/program/bootstraprc
- echo 'InstallMode=<installmode>' >> assets/program/bootstraprc
- echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' >> assets/program/bootstraprc
- echo 'UserInstallation=file://$$APP_DATA_DIR' >> assets/program/bootstraprc
-#
-# Set up versionrc
- echo '[Version]' > assets/program/versionrc
- echo 'AllLanguages=en-US' >> assets/program/versionrc
- echo 'BuildVersion=' >> assets/program/versionrc
- echo 'buildid=dead-beef' >> assets/program/versionrc
- echo 'ProductMajor=360' >> assets/program/versionrc
- echo 'ProductMinor=1' >> assets/program/versionrc
- echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc
-#
-# .res files
- mkdir -p assets/program/resource
- cp $(INSTDIR)/$(LIBO_SHARE_RESOURCE_FOLDER)/*en-US.res assets/program/resource
-#
-# Assets that are unpacked at run-time into the app's data directory. These
-# are files read by non-LO code, fontconfig and freetype for now, that doesn't
-# understand "/assets" paths.
- mkdir -p assets/unpack/etc/fonts
- cp fonts.conf assets/unpack/etc/fonts
-# $UserInstallation/user/fonts is added to the fontconfig path in
-# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
-# set to the app's data dir above.
- mkdir -p assets/gz.unpack/user/fonts
- for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf $(INSTDIR)/share/fonts/truetype/Gen*.ttf $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
- gzip -9 <$$F >assets/gz.unpack/user/fonts/`basename $$F`; \
- done
-#
-# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
-#
- mkdir -p $(SODEST)
- cp $(ANDROID_NDK_GDBSERVER) $(SODEST)
- echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup
-
build-ant: android_version_setup copy-stuff link-so properties
#
# Copy jar files we need
@@ -122,7 +30,7 @@ build-ant: android_version_setup copy-stuff link-so properties
$(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \
done
#
- unset JAVA_HOME && $(ANT) -quiet debug
+ unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug
run:
adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index b707379..f4b4c41 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -17,100 +17,6 @@ native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
-g core -g writer \
> $@
-copy-stuff:
-# Then "assets". Let the directory structure under assets mimic
-# that under solver for now.
-#
-# Please note that I have no idea what all of this is really necessary and for
-# much of this stuff being copied, no idea whether it makes any sense at all.
-# Much of this is copy-pasted from android/qa/sc/Makefile (where a couple of
-# unit tests for sc are built, and those do seem to mostly work) and
-# android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some
-# extent).
-#
- mkdir -p assets/gz.unpack/program/ure assets/lib assets/program/services assets/ure/share/misc assets/ComponentTarget/i18npool/util
- gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb >assets/gz.unpack/program/offapi.rdb
- gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 <$(INSTDIR)/$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb >assets/gz.unpack/program/udkapi.rdb
-# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!?
- for F in program/services/services ure/share/misc/services; do \
- sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$$APP_DATA_DIR/lib/!g' <$(INSTDIR)/$$F.rdb >assets/$$F.rdb; \
- done
- cp $(SRC_ROOT)/odk/examples/java/DocumentHandling/test/test1.odt \
- $(SRC_ROOT)/sw/qa/core/data/odt/test.odt \
- $(SRC_ROOT)/sw/qa/core/data/doc/testVba.doc \
- assets
- cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util
-#
- mkdir -p assets/share/config
- cp -R $(INSTDIR)/share/registry assets/share
- cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
-#
-# Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app
-# doesn't use soffice_main() (at least I think it shouldn't), the
-# rtl::Bootstrap::setIniFilename() call there that hardcodes
-# /assets/program/lofficerc isn't executed. Instead the hardcoding of
-# /assets/rc in BootstrapMap::getBaseIni() gets used.
- echo '[Bootstrap]' > assets/rc
- echo 'Logo=1' >> assets/rc
- echo 'NativeProgress=1' >> assets/rc
- echo 'URE_BOOTSTRAP=file:///assets/program/fundamentalrc' >> assets/rc
-# echo 'RTL_LOGFILE=file:///dev/log/main' >> assets/rc
- echo 'HOME=$$APP_DATA_DIR/cache' >> assets/rc
- echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> assets/rc
-#
-# Set up fundamentalrc
- echo '[Bootstrap]' > assets/program/fundamentalrc
- echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc
- echo 'URE_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc # checkme - is this used to find configs ?
- echo 'BRAND_BASE_DIR=file:///assets' >> assets/program/fundamentalrc
- echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
- echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway' >> assets/program/fundamentalrc
-#
-# Set up unorc
- echo '[Bootstrap]' > assets/program/unorc
- echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/unorc
- echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/udkapi.rdb file://$$APP_DATA_DIR/program/offapi.rdb file://$$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/unorc
- echo 'UNO_SERVICES=file:///assets/ure/share/misc/services.rdb file:///assets/program/services/services.rdb' >> assets/program/unorc
-#
-# Set up bootstraprc
- echo '[Bootstrap]' > assets/program/bootstraprc
- echo 'InstallMode=<installmode>' >> assets/program/bootstraprc
- echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' >> assets/program/bootstraprc
- echo 'UserInstallation=file://$$APP_DATA_DIR' >> assets/program/bootstraprc
-#
-# Set up versionrc
- echo '[Version]' > assets/program/versionrc
- echo 'AllLanguages=en-US' >> assets/program/versionrc
- echo 'BuildVersion=' >> assets/program/versionrc
- echo 'buildid=dead-beef' >> assets/program/versionrc
- echo 'ProductMajor=360' >> assets/program/versionrc
- echo 'ProductMinor=1' >> assets/program/versionrc
- echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc
-#
-# .res files
- mkdir -p assets/program/resource
- cp $(INSTDIR)/$(LIBO_SHARE_RESOURCE_FOLDER)/*en-US.res assets/program/resource
-#
-# Assets that are unpacked at run-time into the app's data directory. These
-# are files read by non-LO code, fontconfig and freetype for now, that doesn't
-# understand "/assets" paths.
- mkdir -p assets/unpack/etc/fonts
- cp fonts.conf assets/unpack/etc/fonts
-# $UserInstallation/user/fonts is added to the fontconfig path in
-# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
-# set to the app's data dir above.
- mkdir -p assets/gz.unpack/user/fonts
- for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf $(INSTDIR)/share/fonts/truetype/Gen*.ttf $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
- gzip -9 <$$F >assets/gz.unpack/user/fonts/`basename $$F`; \
- done
-#
-# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
-#
- mkdir -p $(SODEST)
- cp $(ANDROID_NDK_GDBSERVER) $(SODEST)
- echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup
-
build-ant: android_version_setup copy-stuff link-so properties
echo sdk.dir=$(ANDROID_SDK_HOME) >../../abs-lib/local.properties
# ActionBarSherlock uses the v4 support library, apparently one needs to copy
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index df9a24f..2c30fc4 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -21,99 +21,7 @@ BOOTSTRAP=org.libreoffice.android.Bootstrap
# The default target just builds.
-copy-stuff:
-# Then "assets". Let the directory structure under assets mimic
-# that under solver for now.
-#
-# Please note that some of thses files being set up to be present in
-# the .apk and/or unpacked at install time might be unnecessary.
-#
- mkdir -p assets/gz.unpack/program/ure assets/lib assets/program/services assets/ure/share/misc assets/ComponentTarget/i18npool/util
- gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb >assets/gz.unpack/program/offapi.rdb
- gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb
- gzip -9 <$(INSTDIR)/$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb >assets/gz.unpack/program/udkapi.rdb
-# For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!?
-# So just hardcode the known APP_DATA_PATH for now...
- for F in program/services/services ure/share/misc/services; do \
- sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$(APP_DATA_PATH)/lib/!g' <$(INSTDIR)/$$F.rdb >assets/$$F.rdb; \
- done
- cp $(SRC_ROOT)/odk/examples/java/DocumentHandling/test/test1.odt \
- $(SRC_ROOT)/sw/qa/core/data/odt/test.odt \
- $(SRC_ROOT)/sw/qa/core/data/doc/testVba.doc \
- assets
- cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util
-#
- mkdir -p assets/share/config
- cp -R $(INSTDIR)/share/registry assets/share
- cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
-#
-# Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app
-# doesn't use soffice_main() (at least I think it shouldn't), the
-# rtl::Bootstrap::setIniFilename() call there that hardcodes
-# /assets/program/lofficerc isn't executed. Instead the hardcoding of
-# /assets/rc in BootstrapMap::getBaseIni() gets used.
- echo '[Bootstrap]' > assets/rc
- echo 'Logo=1' >> assets/rc
- echo 'NativeProgress=1' >> assets/rc
- echo 'URE_BOOTSTRAP=file:///assets/program/fundamentalrc' >> assets/rc
-# echo 'RTL_LOGFILE=file:///dev/log/main' >> assets/rc
- echo "HOME=$(APP_DATA_PATH)/cache" >> assets/rc
- echo "OSL_SOCKET_PATH=$(APP_DATA_PATH)/cache" >> assets/rc
-#
-# Set up fundamentalrc
- echo '[Bootstrap]' > assets/program/fundamentalrc
- echo "LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc
- echo "URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc # checkme - is this used to find configs ?
- echo 'BRAND_BASE_DIR=file:///assets' >> assets/program/fundamentalrc
- echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
- echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> assets/program/fundamentalrc
- echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb file://$(APP_DATA_PATH)/program/oovbaapi.rdb' >> assets/program/fundamentalrc
- echo 'URE_MORE_SERVICES=file:///assets/program/services/services.rdb' >> assets/program/fundamentalrc
-#
-# Set up unorc
- echo '[Bootstrap]' > assets/program/unorc
- echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/unorc
- echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/udkapi.rdb $${URE_MORE_TYPES}' >> assets/program/unorc
- echo 'UNO_SERVICES=file:///assets/ure/share/misc/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc
-#
-# Set up bootstraprc
- echo '[Bootstrap]' > assets/program/bootstraprc
- echo 'InstallMode=<installmode>' >> assets/program/bootstraprc
- echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' >> assets/program/bootstraprc
- echo "UserInstallation=file://$(APP_DATA_PATH)" >> assets/program/bootstraprc
-#
-# Set up versionrc
- echo '[Version]' > assets/program/versionrc
- echo 'AllLanguages=en-US' >> assets/program/versionrc
- echo 'BuildVersion=' >> assets/program/versionrc
- echo 'buildid=dead-beef' >> assets/program/versionrc
- echo 'ProductMajor=360' >> assets/program/versionrc
- echo 'ProductMinor=1' >> assets/program/versionrc
- echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc
-#
-# .res files
- mkdir -p assets/program/resource
- cp $(INSTDIR)/$(LIBO_SHARE_RESOURCE_FOLDER)/*en-US.res assets/program/resource
-#
-# Assets that are unpacked at run-time into the app's data directory. These
-# are files read by non-LO code, fontconfig and freetype for now, that doesn't
-# understand "/assets" paths.
- mkdir -p assets/unpack/etc/fonts
- cp fonts.conf assets/unpack/etc/fonts
-# $UserInstallation/user/fonts is added to the fontconfig path in
-# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
-# set to the app's data dir above.
- mkdir -p assets/gz.unpack/user/fonts
- for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf $(INSTDIR)/share/fonts/truetype/Gen*.ttf $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
- gzip -9 <$$F >assets/gz.unpack/user/fonts/`basename $$F`; \
- done
-#
-# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
-#
- mkdir -p $(SODEST)
- cp $(ANDROID_NDK_GDBSERVER) $(SODEST)
- echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup
-# ------------ Pieces not from DocumentLoader ------------
+copy-stuff-desktop:
# tango artwork / icons
cp -R $(INSTDIR)/$(LIBO_SHARE_FOLDER)/config/images_tango.zip assets/share/config
# shell / splash images
@@ -138,7 +46,6 @@ copy-stuff:
# - this looks useful but breaks more than it fixes ...
# echo "DISABLE_EXTENSION_SYNCHRONIZATION=1" >> assets/program/lofficerc
-
setup-jars:
#
# Copy jar files we need
@@ -154,8 +61,8 @@ setup-jars:
$(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \
done
-build-ant: android_version_setup copy-stuff link-so properties setup-jars
- unset JAVA_HOME && $(ANT) -quiet debug
+build-ant: android_version_setup copy-stuff copy-stuff-desktop link-so properties setup-jars
+ unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug
run:
$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/.Desktop
More information about the Libreoffice-commits
mailing list