[Libreoffice-commits] .: android/qa

2012-02-21 Thread Tor Lillqvist 
 android/qa/desktop/Makefile |1 -
 android/qa/sc/Makefile  |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 0a7058b48a5ce51f7be99f10fc0363859c41a7aa
Author: Tor Lillqvist 
Date:   Tue Feb 21 11:03:02 2012 +0200

xcr has been merged

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 14f5368..f09cdb2 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -161,7 +161,6 @@ copy-stuff: buildrcs
  utllo \
  vbahelperlo \
  vcllo \
- xcrlo \
  xml2 \
  xmlreader \
  xstor \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 81b8251..48f590c 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -108,7 +108,6 @@ copy-stuff:
  utllo \
  vbahelperlo \
  vcllo \
- xcrlo \
  xml2 \
  xmlreader \
  xstor \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/qa

2012-02-16 Thread Michael Meeks 
 android/qa/desktop/Makefile |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1cc602e09b8b6ddaac8ddf526383ed28a1e42bd5
Author: Michael Meeks 
Date:   Thu Feb 16 17:32:04 2012 +

android: prune missing libraries from install list

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 67fdb7c..c0fbe00 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -159,13 +159,11 @@ copy-stuff: buildrcs
  uno_cppuhelpergcc3 \
  uno_sal \
  uno_salhelpergcc3 \
- unoexceptionprotector \
  unotest \
  unoxmllo \
  utllo \
  vbahelperlo \
  vcllo \
- vclplug_svplo \
  xcrlo \
  xml2 \
  xmlreader \
@@ -178,6 +176,7 @@ copy-stuff: buildrcs
done
 #deployment \
 #deploymentmisclo \
+#unoexceptionprotector \
 
 #
 # Then the shared GNU C++ library
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/qa

2012-01-25 Thread Tor Lillqvist 
 android/qa/simple/Makefile |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7175129b2d8549c5e18e1222c943ddda5f2e9ee5
Author: Tor Lillqvist 
Date:   Wed Jan 25 09:53:19 2012 +0200

Add notice that the android/qa/simple directory has not been maintained

diff --git a/android/qa/simple/Makefile b/android/qa/simple/Makefile
index 70fb5c6..8007084 100644
--- a/android/qa/simple/Makefile
+++ b/android/qa/simple/Makefile
@@ -1,3 +1,6 @@
+THIS DIRECTORY IS UNMAINTAINED AND PRESUMABLY BROKEN ALREADY
+
+
 include ../../../config_host.mk
 
 # The package of this app
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/qa

2012-01-24 Thread Tor Lillqvist 
 android/qa/desktop/Makefile |   16 +---
 1 file changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 116f3f2e163327e5494c86fb47853ec2282dd1fe
Author: Tor Lillqvist 
Date:   Tue Jan 24 22:44:40 2012 +0200

We don't do cppunit stuff here

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 09b5fa9..375bb82 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -84,21 +84,7 @@ copy-stuff: buildrcs
 # First the most important one, liblo-bootstrap.so
$(call COPY,$(OUTDIR)/lib/liblo-bootstrap.so)
 #
-# Then the cppunittester "program". As all "program"
-# files we build for Android actually is a shared object.
-   $(call COPY,$(OUTDIR)/bin/cppunit/cppunittester,libcppunittester.so)
-#
-# The cppunit library
-#
-   $(call COPY,$(OUTDIR)/lib/libcppunit-1.12.so)
-#
-# The tests we run here
-#
-   for F in sc_ucalc sc_filters_test; do \
-   $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
-   done
-#
-# Libs and UNO components that the tests need.
+# Libs and UNO components that we need.
 #
for F in $(strip \
  basebmplo \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/qa

2012-01-23 Thread Michael Meeks 
 android/qa/desktop/Makefile |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 9bea733ecf01da09aaf7281868441b8a02fcf5cc
Author: Michael Meeks 
Date:   Mon Jan 23 17:36:14 2012 +

android: add missing component, icon theme, and UI config xml

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 18d..2d55786 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -38,7 +38,7 @@ buildrcs:
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 
module:$${BRAND_BASE_DIR}/share/registry/modules 
res:$${BRAND_BASE_DIR}/share/registry 
bundledext:$${$${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
sharedext:$${$${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
xcsxcu:$${$${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry
 
userext:$${$${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu'
 >> assets/program/fundamentalrc
+   echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
module:$${BRAND_BASE_DIR}/share/registry/modules 
res:$${BRAND_BASE_DIR}/share/registry 
user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu'
 >> 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:///assets/ure/share/misc/types.rdb 
file:///assets/program/types/types.rdb' >> assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb 
file:///assets/program/services/services.rdb <$$ORIGIN/services>*' >> 
assets/program/fundamentalrc
@@ -103,6 +103,7 @@ copy-stuff: buildrcs
  icuuclo \
  jvmaccessgcc3 \
  jvmfwk \
+ localebe1.uno \
  localedata_en \
  localedata_es \
  localedata_euro \
@@ -155,12 +156,17 @@ copy-stuff: buildrcs
mkdir -p assets/program/types assets/program/services
mkdir -p assets/program/resource
mkdir -p assets/ure/share/misc assets/share/registry/res
+   mkdir -p assets/share/config/soffice.cfg
+# 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/ure/share/misc/
+# config
cp -R $(OUTDIR)/xml/*.xcd assets/share/registry/
mv assets/share/registry/fcfg_langpack_en-US.xcd 
assets/share/registry/res/
+   cp -R $(OUTDIR)/xml/uiconfig/* assets/share/config/soffice.cfg
+   cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config/images.zip
 # .res files
cp $(OUTDIR)/bin/*en-US.res assets/program/resource/
 # Then assets that are unpacked at run-time into the app's data directory.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/qa

2012-01-23 Thread Michael Meeks 
 android/qa/desktop/Makefile |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7fddab07f4c8e054a489285097623172b853912f
Author: Michael Meeks 
Date:   Mon Jan 23 09:51:12 2012 +

android: re-installs can fail silently, remove tree before install

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 4578657..c6ddf59 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -177,6 +177,7 @@ build-ant: copy-stuff
unset JAVA_HOME && ant debug
 
 install: copy-stuff
+   adb shell rm -r $(APP_DATA_PATH)
unset JAVA_HOME && ant debug install
@echo
@echo 'Run it with "make run"'
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/qa

2012-01-20 Thread Tor Lillqvist 
 android/qa/sc/Makefile |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5ef52d43a308f8153c6f8ac5b07521080fdeb2db
Author: Tor Lillqvist 
Date:   Fri Jan 20 22:39:17 2012 +0200

filters_test needs a shitload of components

Ugly duplication of the list if components. Could obviously do some
elegant refactoring to have each component mentioned just once. But on
the other hand, this is just a temporary way to build this unit test
app, no? If/when eventually gbuildifying this, the data from the
gb_CppunitTest_add_components calls in the correspondig
CppunitTest_FOO.mk files can be used, one hopes.

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 35e5acd..dbf9fb4 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -133,7 +133,7 @@ copy-stuff:
for F in xml/ure/services; do \
sed -e 
's!uri="vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g'
 <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \
done
-   for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx 
ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml 
configmgr/source/configmgr; do \
+   for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx 
ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml 
configmgr/source/configmgr basic/util/sb 
chart2/source/controller/chartcontroller chart2/source/tools/charttools 
chart2/source/model/chartmodel comphelper/util/comphelp dbaccess/util/dba 
eventattacher/source/evtatt fileaccess/source/fileacc 
filter/source/config/cache/filterconfig1 forms/util/frm oox/util/oox 
package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap 
sax/source/fastparser/fastsax sc/util/sc sc/util/scfilt 
scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot 
svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl 
unoxml/source/rdf/unordf; do \
mkdir -p assets/ComponentTarget/`dirname $$F`; \
sed -e 
's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' 
<$(WORKDIR)/ComponentTarget/$$F.component 
>assets/ComponentTarget/$$F.component; \
done
@@ -168,12 +168,12 @@ uninstall:
adb uninstall $(APP_PACKAGE)
 
 run_ucalc:
-   echo "STAR_RESOURCEPATH=/assets/bin 
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf 
$(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector 
libunoexceptionprotector.so unoexceptionprotector 
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' 
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb  
file:///assets/ComponentTarget/framework/util/fwk.component 
file:///assets/ComponentTarget/i18npool/util/i18npool.component 
file:///assets/ComponentTarget/sfx2/util/sfx.component 
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component 
file:///assets/ComponentTarget/configmgr/source/configmgr.component 
file:///assets/ComponentTarget/ucb/source/core/ucb1.component 
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component' 
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib 
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
+   echo "STAR_RESOURCEPATH=/assets/bin 
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf 
$(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector 
libunoexceptionprotector.so unoexceptionprotector 
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' 
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb' 
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb 
file:///assets/ComponentTarget/framework/util/fwk.component 
file:///assets/ComponentTarget/i18npool/util/i18npool.component 
file:///assets/ComponentTarget/sfx2/util/sfx.component 
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component 
file:///assets/ComponentTarget/configmgr/source/configmgr.component 
file:///assets/ComponentTarget/ucb/source/core/ucb1.component 
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component' 
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib 
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
adb push cmdline $(APP_DATA_PATH)/cmdline
adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library 
libcppunittester -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
 
 run_filters_test:
-   echo "STAR_RESOURCEPATH=/assets/bin 
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf 
$(APP_DATA_PATH)/lib/libtest_sc_filters_test.so --headless --protector 
libunoexceptionprotector.so unoexceptionprotector 
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry 
module:file:///assets/xml/registry/spool' 
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  
'-env:UNO_SERVICES=file:///assets/xml/ure/s

[Libreoffice-commits] .: android/qa

2012-01-20 Thread Tor Lillqvist 
 android/qa/sc/Makefile |4 
 1 file changed, 4 insertions(+)

New commits:
commit cce52394e979d02941e7f9f15f6706502a056800
Author: Tor Lillqvist 
Date:   Fri Jan 20 14:17:42 2012 +0200

Add a target for the stdio redirection magic commands

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 6c499f8..35e5acd 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -185,6 +185,10 @@ run: run_ucalc run_filters_test
 stop-start-cycle:
adb shell stop && adb shell start && sleep 10
 
+# Too hard to remember this stuff;)
+redirect-stdio:
+   adb shell stop && adb shell setprop log.redirect-stdio true && adb 
shell start
+
 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] .: android/qa

2012-01-20 Thread Tor Lillqvist 
 android/qa/desktop/Makefile |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f7c1f80ae4f9a4f33cdac48040e2d48a8610604c
Author: Tor Lillqvist 
Date:   Fri Jan 20 21:19:51 2012 +0200

Fix file: URI syntax

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 96f617f..57dc6a4 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -32,14 +32,14 @@ buildrcs:
echo "[Bootstrap]" > assets/program/sofficerc
echo "Logo=1" >> assets/program/sofficerc
echo "NativeProgress=1" >> assets/program/sofficerc
-   echo "URE_BOOTSTRAP=file://assets/program/fundamentalrc" >> 
assets/program/sofficerc
+   echo "URE_BOOTSTRAP=file:///assets/program/fundamentalrc" >> 
assets/program/sofficerc
 # fundamentalrc ini ...
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 "BRAND_BASE_DIR=file:///assets/" >> assets/program/fundamentalrc
echo "CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry 
module:${BRAND_BASE_DIR}/share/registry/modules 
res:${BRAND_BASE_DIR}/share/registry 
bundledext:${${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
sharedext:${${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
xcsxcu:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry
 
userext:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
user:${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu"
 >> assets/program/fundamentalrc
-   echo 
"URE_BIN_DIR=file://assets/ure/bin/dir/not-here/can-we/exec-anyway" >> 
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:///assets/ure/share/misc/types.rdb 
file:///assets/program/types/types.rdb $${URE_MORE_TYPES}" >> 
assets/program/fundamentalrc
echo "URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb 
file:///assets/program/services/services.rdb $${URE_MORE_SERVICES}" >> 
assets/program/fundamentalrc
 # unorc ini ...
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/qa configure.in vcl/headless

2012-01-18 Thread Michael Meeks 
 android/qa/sc/Makefile  |   12 +---
 android/qa/simple/Makefile  |   20 +++-
 configure.in|1 +
 vcl/headless/svpdummies.cxx |6 ++
 4 files changed, 15 insertions(+), 24 deletions(-)

New commits:
commit 3c9264558e120e9aa0a7bf7e86df14d51b900b42
Author: Michael Meeks 
Date:   Wed Jan 18 17:16:26 2012 +

android: use config_host.mk for unit test goodness

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 22d4eba..d023791 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -1,3 +1,5 @@
+include ../../../config_host.mk
+
 # The package of this app
 APP_PACKAGE=org.libreoffice.android.qa.sc
 
@@ -9,15 +11,11 @@ BOOTSTRAP=org.libreoffice.android.Bootstrap
 
 APP_DATA_PATH=/data/data/$(APP_PACKAGE)
 
-NDK_HOME:=$(shell type -p ndk-build)
-NDK_HOME:=$(shell dirname $(NDK_HOME))
-
 SODEST=libs/armeabi-v7a
 OBJLOCAL=obj/local/armeabi-v7a
 
 define COPY
-cp $(1) $(SODEST)$(if $(2),/$(2)) && \
-arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir 
$(1))) && \
+cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if 
$(2),/$(2),/$(notdir $(1))) && \
 cp $(1) $(OBJLOCAL)$(if $(2),/$(2))
 endef
 
@@ -118,7 +116,7 @@ copy-stuff:
done
 #
 # Then the shared GNU C++ library
-   $(call 
COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
+   $(call 
COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
 #
 # Then other "assets" that can be left in the .apk. Let the directory
 # structure under assets mimic that under solver or workdir for now.
@@ -149,7 +147,7 @@ copy-stuff:
 #
 # Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
 #
-   cp 
$(NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST)
+   cp 
$(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver 
$(SODEST)
echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup
 
 
diff --git a/android/qa/simple/Makefile b/android/qa/simple/Makefile
index a98250b..70fb5c6 100644
--- a/android/qa/simple/Makefile
+++ b/android/qa/simple/Makefile
@@ -1,3 +1,5 @@
+include ../../../config_host.mk
+
 # The package of this app
 APP_PACKAGE=org.libreoffice.android.qa
 
@@ -9,15 +11,11 @@ BOOTSTRAP=org.libreoffice.android.Bootstrap
 
 APP_DATA_PATH=/data/data/$(APP_PACKAGE)
 
-NDK_HOME:=$(shell type -p ndk-build)
-NDK_HOME:=$(shell dirname $(NDK_HOME))
-
 SODEST=libs/armeabi-v7a
 OBJLOCAL=obj/local/armeabi-v7a
 
 define COPY
-cp $(1) $(SODEST)$(if $(2),/$(2)) && \
-arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir 
$(1))) && \
+cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if 
$(2),/$(2),/$(notdir $(1))) && \
 cp $(1) $(OBJLOCAL)$(if $(2),/$(2))
 endef
 
@@ -47,17 +45,13 @@ copy-stuff:
 #
 # cppunit "plug-ins", first ones from sal
 #
-   $(call COPY,$(SRCDIR)/sal/$(INPATH)/lib/*.so)
+   $(call COPY,$(OUTDIR)/lib/libuno_sal*.so)
 #
 # and ones from other modules. Note that depending on when you try
 # this, these might not have been built yet.
 #
-   for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \
-   $(call COPY,$${F},`basename $${F}`); \
-   done
-#
-   for F in i18npool_test_breakiterator; do \
-   $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
+   for F in i18npool_test_breakiterator cppu cppuhelper sal; do \
+   $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}*.so); \
done
 #
 # Other "programs"
@@ -90,7 +84,7 @@ copy-stuff:
done
 #
 # Then the shared GNU C++ library
-   $(call 
COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
+   $(call 
COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
 #
 # bridgetest components, not in solver
for F in bridgetest constructors cppobj; do \
diff --git a/configure.in b/configure.in
index 638a0fd..24d6652 100644
--- a/configure.in
+++ b/configure.in
@@ -104,6 +104,7 @@ if test "z$with_android_ndk" != "z"; then
test -z "$STRIP" && 
STRIP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-strip
test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc 
--sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm  
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ 
--sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -I 
$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include 
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions 
-frtti"
+#   PATH="$ANDROID_NDK_HOME/:$PATH"
 fi
 AC_SUBST(ANDROID_NDK_HOME)
 
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index

[Libreoffice-commits] .: android/qa

2011-12-18 Thread Miklos Vajna 
 dev/null |binary
 1 file changed

New commits:
commit 75b85b12fb8c78410df05852bf3063c267e9710e
Author: Miklos Vajna 
Date:   Sun Dec 18 22:40:04 2011 +0100

android: delete generated lo-bootstrap.jar

diff --git a/android/qa/simple/lo-bootstrap.jar 
b/android/qa/simple/lo-bootstrap.jar
deleted file mode 100644
index b382d24..000
Binary files a/android/qa/simple/lo-bootstrap.jar and /dev/null differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/qa

2011-12-14 Thread Tor Lillqvist 
 android/qa/sc/AndroidManifest.xml|   23 +
 android/qa/sc/Makefile   |  135 +++
 android/qa/sc/ant.properties |   17 
 android/qa/sc/build.xml  |  114 +
 android/qa/sc/project.properties |   14 +++
 android/qa/sc/res/layout/main.xml|   12 +++
 android/qa/sc/res/values/strings.xml |4 +
 7 files changed, 319 insertions(+)

New commits:
commit 535e37abdb43cf41990fcbd0ef85315b2413c4e3
Author: Tor Lillqvist 
Date:   Thu Dec 15 01:00:25 2011 +0200

Add an app for the sc_ucalc unit test

diff --git a/android/qa/sc/AndroidManifest.xml 
b/android/qa/sc/AndroidManifest.xml
new file mode 100644
index 000..49c9cb7
--- /dev/null
+++ b/android/qa/sc/AndroidManifest.xml
@@ -0,0 +1,23 @@
+
+http://schemas.android.com/apk/res/android";
+  package="org.libreoffice.android.qa.sc"
+  android:versionCode="1"
+  android:versionName="1.0">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
new file mode 100644
index 000..f01f8a6
--- /dev/null
+++ b/android/qa/sc/Makefile
@@ -0,0 +1,135 @@
+# The package of this app
+APP_PACKAGE=org.libreoffice.android.qa.sc
+
+# The name of the Bootstrap activity class
+BOOTSTRAP=org.libreoffice.android.Bootstrap
+
+# The full path the the app's directory needs to be supplied in a
+# couple of places, unfortunately.
+
+APP_DATA_PATH=/data/data/$(APP_PACKAGE)
+
+NDK_HOME:=$(shell type -p ndk-build)
+NDK_HOME:=$(shell dirname $(NDK_HOME))
+
+SODEST=libs/armeabi-v7a
+OBJLOCAL=obj/local/armeabi-v7a
+
+define COPY
+cp $(1) $(SODEST)$(if $(2),/$(2)) && \
+arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir 
$(1))) && \
+cp $(1) $(OBJLOCAL)$(if $(2),/$(2))
+endef
+
+# The default target just builds.
+
+all: build-ant
+
+copy-stuff:
+#
+# Copy shared libraries we need to libs/armeabi-v7a so that ant will
+# include them in the .apk.
+#
+# Copy them to obj/local/armeabi-v7a, too, where gdb will look for
+# them.
+#
+   mkdir -p $(SODEST) $(OBJLOCAL)
+#
+# First the most important one, liblo-bootstrap.so
+   $(call COPY,$(OUTDIR)/lib/liblo-bootstrap.so)
+#
+# Then the cppunittester "program". As all "program"
+# files we build for Android actually is a shared object.
+   $(call COPY,$(OUTDIR)/bin/cppunit/cppunittester,libcppunittester.so)
+#
+# The cppunit library
+#
+   $(call COPY,$(OUTDIR)/lib/libcppunit-1.12.so)
+#
+# The tests we run here
+#
+   for F in sc_ucalc; do \
+   $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
+   done
+#
+# Libs and UNO components that the tests need.
+#
+   for F in $(strip \
+ avmedialo \
+ basegfxlo \
+ bootstrap.uno \
+ comphelpgcc3 \
+ fwelo \
+ fwilo \
+ gcc3_uno \
+ i18nisolang1gcc3 \
+ i18npaperlo \
+ i18npool.uno \
+ i18nutilgcc3 \
+ icudatalo \
+ icui18nlo \
+ iculelo \
+ icuuclo \
+ jvmaccessgcc3 \
+ jvmfwk \
+ localedata_en \
+ localedata_others \
+ reg \
+ saxlo \
+ sblo \
+ sfxlo \
+ sotlo \
+ store \
+ svllo \
+ svtlo \
+ tklo \
+ tllo \
+ ucbhelper4gcc3 \
+ uno_cppu \
+ uno_cppuhelpergcc3 \
+ uno_sal \
+ uno_salhelpergcc3 \
+ unoexceptionprotector \
+ utllo \
+ vcllo \
+ vclplug_svplo \
+ xml2 \
+ xmlreader \
+ ); do \
+   $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
+   done
+#
+# Then the shared GNU C++ library
+   $(call 
COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
+#
+# Then other "assets". Let the directory structure under assets mimic
+# that under solver for now.
+   mkdir -p assets/bin assets/lib assets/xml/ure
+   cp $(OUTDIR)/bin/udkapi.rdb assets/bin
+   cp $(OUTDIR)/bin/types.rdb assets/bin
+   cp $(OUTDIR)/xml/ure/services.rdb assets/xml/ure
+   for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx 
unoxml/source/service/unoxml; do \
+   mkdir -p assets/ComponentTarget/`dirname $$F`; \
+   cp $(WORKDIR)/ComponentTarget/$$F.component 
assets/ComponentTarget/`dirname $$F`; \
+   done
+   cp -R $(OUTDIR)/xml/registry assets/xml
+   for F in uno_services uno_types; do \
+   sed -e 's!uri="./!uri="$(APP_DATA_