android/Bootstrap/local.properties.in | 2 --
android/experimental/DocumentLoader/Makefile | 8 ++++++--
android/experimental/DocumentLoader/local.properties.in | 2 --
android/qa/desktop/Makefile | 10 +++++++---
android/qa/desktop/local.properties.in | 2 --
android/qa/sc/Makefile | 10 +++++++---
android/qa/sc/local.properties.in | 2 --
configure.in | 12 +-----------
8 files changed, 21 insertions(+), 27 deletions(-)
New commits:
commit 40fab3bd05880e1ee35022037f1f7ea4f5ff999a
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed May 16 18:58:45 2012 +0300
Don't create the local.properties files in the source tree from configure
Change-Id: Ic87be0146360c5e32f1f12f255c897e051c9a50c
diff --git a/android/Bootstrap/local.properties.in
b/android/Bootstrap/local.properties.in
deleted file mode 100644
index 27c8eb5..0000000
--- a/android/Bootstrap/local.properties.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Location of the SDK. This is only used by Ant.
-sdk.dir=@ANDROID_SDK_HOME@
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index cf4ac48..63fefa7 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -32,6 +32,10 @@ endef
all: build-ant
+properties:
+ echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
+ echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties
+
copy-stuff:
# First always clean
rm -rf libs $(OBJLOCAL)
@@ -230,7 +234,7 @@ copy-stuff:
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
-build-ant: copy-stuff
+build-ant: copy-stuff properties
#
# Copy jar files we need, and even construct one.
#
@@ -259,6 +263,6 @@ uninstall:
run:
adb shell am start -n org.libreoffice.android.examples/.DocumentLoader
-e input
/assets/test1.odt:/assets/border.xls:/assets/test.odt:/assets/testVba.doc
-clean:
+clean: properties
$(ANT) clean
rm -rf assets libs $(SODEST) $(OBJLOCAL)
diff --git a/android/experimental/DocumentLoader/local.properties.in
b/android/experimental/DocumentLoader/local.properties.in
deleted file mode 100644
index 27c8eb5..0000000
--- a/android/experimental/DocumentLoader/local.properties.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Location of the SDK. This is only used by Ant.
-sdk.dir=@ANDROID_SDK_HOME@
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 490a7a8..7a15bf5 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -26,6 +26,10 @@ endef
all: build-ant
+properties:
+ echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
+ echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties
+
buildrcs:
# main sofficerc ini ...
mkdir -p assets/program/
@@ -229,10 +233,10 @@ copy-stuff: buildrcs
echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup
-build-ant: copy-stuff
+build-ant: copy-stuff properties
unset JAVA_HOME && $(ANT) debug
-install: copy-stuff
+install: copy-stuff properties
$(ANDROID_SDK_HOME)/platform-tools/adb shell rm -r $(APP_DATA_PATH)
unset JAVA_HOME && $(ANT) debug install
@echo
@@ -254,7 +258,7 @@ run:
stop-start-cycle:
$(ANDROID_SDK_HOME)/platform-tools/adb shell stop &&
$(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10
-clean:
+clean: properties
$(ANT) clean
rm -rf assets $(SODEST) $(OBJLOCAL)
diff --git a/android/qa/desktop/local.properties.in
b/android/qa/desktop/local.properties.in
deleted file mode 100644
index 27c8eb5..0000000
--- a/android/qa/desktop/local.properties.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Location of the SDK. This is only used by Ant.
-sdk.dir=@ANDROID_SDK_HOME@
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index c39adcf..078c9e2 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -23,6 +23,10 @@ endef
all: build-ant
+properties:
+ echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
+ echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties
+
copy-stuff:
#
# Copy shared libraries we need to libs/armeabi-v7a so that ant will
@@ -157,10 +161,10 @@ copy-stuff:
echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup
-build-ant: copy-stuff
+build-ant: copy-stuff properties
unset JAVA_HOME && $(ANT) debug
-install: copy-stuff
+install: copy-stuff properties
unset JAVA_HOME && $(ANT) debug install
@echo
@echo 'Run it with "make run"'
@@ -191,7 +195,7 @@ stop-start-cycle:
redirect-stdio:
$(ANDROID_SDK_HOME)/platform-tools/adb shell stop &&
$(ANDROID_SDK_HOME)/platform-tools/adb shell setprop log.redirect-stdio true &&
$(ANDROID_SDK_HOME)/platform-tools/adb shell start
-clean:
+clean: properties
$(ANT) clean
rm -rf assets $(SODEST) $(OBJLOCAL)
diff --git a/android/qa/sc/local.properties.in
b/android/qa/sc/local.properties.in
deleted file mode 100644
index 27c8eb5..0000000
--- a/android/qa/sc/local.properties.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# Location of the SDK. This is only used by Ant.
-sdk.dir=@ANDROID_SDK_HOME@
diff --git a/configure.in b/configure.in
index a83ae20..4c82f39 100644
--- a/configure.in
+++ b/configure.in
@@ -3429,11 +3429,6 @@ if test "$cross_compiling" = "yes"; then
mkdir CONF-FOR-BUILD
tar cf - \
bin/repo-list.in \
- android/Bootstrap/local.properties.in \
- android/experimental/DocumentLoader/local.properties.in \
- android/experimental/eagles051387/.classpath.in \
- android/qa/sc/local.properties.in \
- android/qa/desktop/local.properties.in \
config.guess \
config_host.mk.in \
configure \
@@ -11815,12 +11810,7 @@ else
echo > config_host.mk.last
fi
-AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list \
-android/Bootstrap/local.properties \
-android/experimental/DocumentLoader/local.properties \
-android/experimental/eagles051387/.classpath \
-android/qa/sc/local.properties \
-android/qa/desktop/local.properties])
+AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list])
AC_OUTPUT
# touch the config timestamp file set_soenv.stamp
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
