[Libreoffice-commits] .: Branch 'feature/android' - android/qa
android/qa/desktop/Makefile |4 android/qa/sc/Makefile |4 2 files changed, 8 deletions(-) New commits: commit 5f1055eacd2517bad5b471e5c1eca47f9afb2b83 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 13 21:39:33 2012 +0200 Forgot to drop the merged fw* and sfx libs from here diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index c9f4c61..b02ebd0 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -120,9 +120,6 @@ copy-stuff: buildrcs forlo \ foruilo \ freetype \ - fwelo \ - fwilo \ - fwklo \ fsstorage.uno \ gcc3_uno \ i18nisolang1gcc3 \ @@ -149,7 +146,6 @@ copy-stuff: buildrcs saxlo \ sclo \ scfiltlo \ - sfxlo \ sotlo \ stocservices.uno \ store \ diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 0a6a5e8..054ba79 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -67,9 +67,6 @@ copy-stuff: forlo \ foruilo \ freetype \ - fwelo \ - fwilo \ - fwklo \ gcc3_uno \ i18nisolang1gcc3 \ i18npaperlo \ @@ -94,7 +91,6 @@ copy-stuff: saxlo \ sclo \ scfiltlo \ - sfxlo \ sotlo \ stocservices.uno \ store \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - android/qa
android/qa/desktop/Makefile |1 - 1 file changed, 1 deletion(-) New commits: commit 0caced5cd1cf537c6576ec6c147f40373b2eac6a Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Feb 6 15:52:00 2012 +0200 libpackage2 is also in libmergedlo diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index a657fe1..efe0040 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -144,7 +144,6 @@ copy-stuff: buildrcs mergedlo \ msfilterlo \ ooxlo \ - package2 \ reflection.uno \ reg \ saxlo \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - android/qa
android/qa/desktop/Makefile |6 +++--- android/qa/sc/Makefile |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit db1ade41bf6c878753801ed241d6bd1d94466e12 Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 3 13:11:03 2012 +0200 Fix braino diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index ec568b6..3d11362 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -235,11 +235,11 @@ copy-stuff: buildrcs build-ant: copy-stuff - unset JAVA_HOME $ANT debug + unset JAVA_HOME $(ANT) debug install: copy-stuff adb shell rm -r $(APP_DATA_PATH) - unset JAVA_HOME $ANT debug install + unset JAVA_HOME $(ANT) debug install @echo @echo 'Run it with make run' @echo @@ -260,6 +260,6 @@ stop-start-cycle: adb shell stop adb shell start sleep 10 clean: - $ANT clean + $(ANT) clean rm -rf assets $(SODEST) $(OBJLOCAL) diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index ad07d28..59ad5fb 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -165,10 +165,10 @@ copy-stuff: build-ant: copy-stuff - unset JAVA_HOME $ANT debug + unset JAVA_HOME $(ANT) debug install: copy-stuff - unset JAVA_HOME $ANT debug install + unset JAVA_HOME $(ANT) debug install @echo @echo 'Run it with make run' @echo @@ -199,6 +199,6 @@ redirect-stdio: adb shell stop adb shell setprop log.redirect-stdio true adb shell start clean: - $ANT clean + $(ANT) clean rm -rf assets $(SODEST) $(OBJLOCAL) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - android/qa
android/qa/desktop/Makefile |4 1 file changed, 4 deletions(-) New commits: commit 83f2bc57c480dcb6190bef040b721e6f1f8df1cc Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 3 16:28:26 2012 +0200 Drop libs that are in libmerged diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 8e1811d..a657fe1 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -114,7 +114,6 @@ copy-stuff: buildrcs configmgr.uno \ cppcanvaslo \ drawinglayerlo \ - editenglo \ expwrap.uno \ fileacc \ fontconfig \ @@ -158,8 +157,6 @@ copy-stuff: buildrcs store \ svllo \ svtlo \ - svxlo \ - svxcorelo \ test \ tklo \ tllo \ @@ -180,7 +177,6 @@ copy-stuff: buildrcs xcrlo \ xml2 \ xmlreader \ - xolo \ xstor \ \ swlo \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - android/qa
android/qa/desktop/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1b48979a27f280a87087ee99e012285050522b95 Author: Tor Lillqvist t...@iki.fi Date: Fri Feb 3 17:04:40 2012 +0200 services.rdb is in $(OUTDIR)/xml/ure as far as I can see diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index a657fe1..4b8a832 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -202,7 +202,7 @@ copy-stuff: buildrcs # uno types services cp $(OUTDIR)/bin/types.rdb assets/program/types/ cp $(OUTDIR)/bin/ure/types.rdb assets/ure/share/misc/ - cp $(OUTDIR)/xml/services.rdb assets/program/services + cp $(OUTDIR)/xml/ure/services.rdb assets/program/services cp $(OUTDIR)/xml/ure/services.rdb assets/ure/share/misc/ # config cp -R $(OUTDIR)/xml/*.xcd assets/share/registry/ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - android/qa
android/qa/desktop/Makefile |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit c94c9dbdcfc8435f0df61fd326dc25d39d3c44cb
Author: Michael Meeks michael.me...@suse.com
Date: Tue Jan 31 22:24:08 2012 +
android: package missing libraries, and shell branding - we get a shell.
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 3475248..553aefe 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -113,10 +113,9 @@ copy-stuff: buildrcs
comphelpgcc3 \
configmgr.uno \
cppcanvaslo \
- deployment \
- deploymentmisclo \
drawinglayerlo \
editenglo \
+ expwrap.uno \
fileacc \
fontconfig \
forlo \
@@ -125,6 +124,7 @@ copy-stuff: buildrcs
fwelo \
fwilo \
fwklo \
+ fsstorage.uno \
gcc3_uno \
i18nisolang1gcc3 \
i18npaperlo \
@@ -187,6 +187,9 @@ copy-stuff: buildrcs
); do \
$(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
done
+#deployment \
+#deploymentmisclo \
+
#
# Then the shared GNU C++ library
$(call
COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
@@ -218,6 +221,8 @@ copy-stuff: buildrcs
mkdir -p assets/presets/$$D ; \
echo content assets/presets/$$D/stamp; \
done
+# shell / splash images
+ cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program
# Then assets that are unpacked at run-time into the app's data directory.
mkdir -p assets/unpack/etc/fonts
cp fonts.conf assets/unpack/etc/fonts
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - android/qa
android/qa/desktop/Makefile | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 3e52b896843ae0a9e137d4728e2ef73245e7e144
Author: Michael Meeks michael.me...@suse.com
Date: Wed Jan 25 14:45:16 2012 +
android: add versionrc generation for desktop
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 375bb82..1dd0d83 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -38,6 +38,7 @@ buildrcs:
echo OSL_SOCKET_PATH=$(APP_DATA_PATH)/files
assets/program/lofficerc
# - this looks useful but breaks more than it fixes ...
# echo DISABLE_EXTENSION_SYNCHRONIZATION=1 assets/program/lofficerc
+
# fundamentalrc ini ...
echo [Bootstrap] assets/program/fundamentalrc
echo LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc
@@ -71,6 +72,22 @@ buildrcs:
echo ProductKey=LibreOffice 3.5 assets/program/bootstraprc
echo UserInstallation=file://$(APP_DATA_PATH)/files/.libreoffice
assets/program/bootstraprc
+# versionrc ini ...
+ 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
ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update;
assets/program/versionrc
+ echo ProductBuildid=3 assets/program/versionrc
+ echo ProductMajor=360 assets/program/versionrc
+ echo ProductMinor=1 assets/program/versionrc
+ echo ProductSource=OOO350 assets/program/versionrc
+ echo ReferenceOOoMajorMinor=3.6 assets/program/versionrc
+ echo UpdateID=LibreOffice_3_en-US assets/program/versionrc
+ echo UpdateURL= assets/program/versionrc
+ echo UpdateUserAgent=PRODUCT (${buildid}; ${_OS}; ${_ARCH};
BundledLanguages=${AllLanguages}) assets/program/versionrc
+ echo Vendor=SelfCompiledGit assets/program/versionrc
+
copy-stuff: buildrcs
#
# Copy shared libraries we need to libs/armeabi-v7a so that ant will
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - android/qa
android/qa/desktop/Makefile |1 + 1 file changed, 1 insertion(+) New commits: commit 0f32f98564f8e0e66bc2d2ee5c55406930007044 Author: Michael Meeks michael.me...@suse.com Date: Wed Jan 25 22:41:41 2012 + android: add missing deployment component diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 1dd0d83..876c432 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -109,6 +109,7 @@ copy-stuff: buildrcs bootstrap.uno \ comphelpgcc3 \ configmgr.uno \ + deployment \ deploymentmisclo \ fileacc \ fontconfig \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
