android/Bootstrap/Makefile.shared | 2 +-
android/CustomTarget_docloader.mk | 33 +++++++++++++++++++++++++++++++++
android/CustomTarget_sdremote.mk | 6 +++++-
android/Module_android.mk | 1 +
configure.in | 34 +++++++++++++++++-----------------
5 files changed, 57 insertions(+), 19 deletions(-)
New commits:
commit 9bf0c91a7d671e0a7d097a7128bdf30c27c25a44
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Aug 22 14:33:49 2012 +0300
Untabify where appropriate
Change-Id: I0af786208356493928129406fd7d03f0912834f3
diff --git a/configure.in b/configure.in
index 87ddf13..39aaecc 100644
--- a/configure.in
+++ b/configure.in
@@ -1354,7 +1354,7 @@ AC_ARG_WITH(system-icu,
AC_ARG_WITH(system-openldap,
AS_HELP_STRING([--with-system-openldap],
[Use the OpenLDAP LDAP SDK already on system.]),,
- [with_system_openldap="$with_system_libs"])
+ [with_system_openldap="$with_system_libs"])
AC_ARG_WITH(system-poppler,
AS_HELP_STRING([--with-system-poppler],
@@ -2219,15 +2219,15 @@ if test $? -eq 0; then
STRIP_COMPONENTS="--strip-components"
else
$GNUTAR --help 2> /dev/null | egrep "strip-path" 2>&1 >/dev/null
- if test $? -eq 0; then
- STRIP_COMPONENTS="--strip-path"
- else
- STRIP_COMPONENTS="unsupported"
- fi
+ if test $? -eq 0; then
+ STRIP_COMPONENTS="--strip-path"
+ else
+ STRIP_COMPONENTS="unsupported"
+ fi
fi
AC_MSG_RESULT($STRIP_COMPONENTS)
if test x$STRIP_COMPONENTS == xunsupported; then
- AC_MSG_ERROR([you need a tar that is able to strip components.])
+ AC_MSG_ERROR([you need a tar that is able to strip components.])
fi
AC_SUBST(STRIP_COMPONENTS)
@@ -2997,7 +2997,7 @@ if test "$_os" = "WINNT"; then
if test -z "$MSPDB_PATH" -a -e
"$with_cl_home/../Common7/IDE/mspdb100.dll"; then
MSPDB_PATH="$with_cl_home/../Common7/IDE"
fi
- dnl MSVS 2012 case
+ dnl MSVS 2012 case
if test -z "$MSPDB_PATH" -a -e
"$with_cl_home/../Common7/IDE/mspdb110.dll"; then
MSPDB_PATH="$with_cl_home/../Common7/IDE"
fi
@@ -3006,7 +3006,7 @@ if test "$_os" = "WINNT"; then
dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
AC_PATH_PROG(MSPDB_PATH, mspdb100.dll)
- AC_PATH_PROG(MSPDB_PATH, mspdb110.dll)
+ AC_PATH_PROG(MSPDB_PATH, mspdb110.dll)
MSPDB_PATH=`dirname "$MSPDB_PATH"`
fi
@@ -3059,7 +3059,7 @@ if test "$_os" = "WINNT"; then
printf (\"%04d\",vertoken[[i]] )
}
}"`
- if test "$CCNUMVER" -ge "001700000000"; then
+ if test "$CCNUMVER" -ge "001700000000"; then
COMEX=14
MSVSVER=2012
elif test "$CCNUMVER" -ge "001600000000"; then
@@ -7769,15 +7769,15 @@ dnl
===================================================================
if test "$_os" != "WINNT"; then
AC_MSG_CHECKING([which openldap library to use])
if test "$with_system_openldap" = "yes"; then
- AC_MSG_RESULT([external])
+ AC_MSG_RESULT([external])
SYSTEM_OPENLDAP=YES
AC_CHECK_HEADERS(ldap.h, [], [AC_MSG_ERROR(ldap.h not found. install
openldap libs)], [])
- AC_CHECK_LIB([ldap], [ldap_simple_bind_s], [:], [AC_MSG_ERROR(openldap
lib not found or functional)], [])
- AC_CHECK_LIB([ldap], [ldap_set_option], [:], [AC_MSG_ERROR(openldap lib
not found or functional)], [])
+ AC_CHECK_LIB([ldap], [ldap_simple_bind_s], [:], [AC_MSG_ERROR(openldap lib
not found or functional)], [])
+ AC_CHECK_LIB([ldap], [ldap_set_option], [:], [AC_MSG_ERROR(openldap lib
not found or functional)], [])
else
AC_MSG_RESULT([internal])
SYSTEM_OPENLDAP=NO
- BUILD_TYPE="$BUILD_TYPE OPENLDAP"
+ BUILD_TYPE="$BUILD_TYPE OPENLDAP"
fi
else
SYSTEM_OPENLDAP=NO
@@ -11557,7 +11557,7 @@ location (/usr/share/java), specify its pathname via
--with-junit=..., or disable it via --without-junit])
fi
if test $OOO_JUNIT_JAR != ""; then
- BUILD_TYPE="$BUILD_TYPE QADEVOOO"
+ BUILD_TYPE="$BUILD_TYPE QADEVOOO"
fi
fi
AC_SUBST(OOO_JUNIT_JAR)
@@ -12005,8 +12005,8 @@ else
;;
Linux)
- BUILD_NCPUS=`getconf _NPROCESSORS_ONLN`
- ;;
+ BUILD_NCPUS=`getconf _NPROCESSORS_ONLN`
+ ;;
# what else than above does profit here *and* has /proc?
*)
BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
commit e2a7989765fcf5fe26ea66c83ecff4a827b0e9d3
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Aug 22 14:26:38 2012 +0300
Build also the DocumentLoader test Android app with gbuild
Serialize the Ant cleaning and building of android/abs-lib so that one
Ant is not cleaning it while another is building something that
depends on it.
Change-Id: I22fde47bf84208fa129b8f6a65a2314c885451a0
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index be26927..f18c187 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -42,7 +42,7 @@ properties:
install: build-ant
unset JAVA_HOME && $(ANT) debug install
@echo
- @echo 'Run it with something like what "make run" does (see Makefile)'
+ @echo 'Run it with "make run"'
@echo
uninstall:
diff --git a/android/CustomTarget_docloader.mk
b/android/CustomTarget_docloader.mk
new file mode 100644
index 0000000..d4007e7
--- /dev/null
+++ b/android/CustomTarget_docloader.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+
+$(eval $(call gb_CustomTarget_CustomTarget,android/docloader))
+
+docloader_DIR := $(call
gb_CustomTarget_get_workdir,android/experimental/DocumentLoader)
+
+# Depending on sw and sc modules hopefully means that all libraries and other
+# files from there (plus all those they depend on), that DocumentLoader needs
+# from solver will have been built? Or should we just move the stuff from
+# android/experimental/DocumentLoader/Makefile here, and depend on them
+# explicitly?
+$(call gb_CustomTarget_get_target,android/docloader) : \
+ $(docloader_DIR)/done \
+ $(call gb_Module_get_target,sw) \
+ $(call gb_Module_get_target,sc)
+
+$(docloader_DIR)/done : $(gb_Helper_PHONY)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)
+# Lock needed to serialize the Ant cleaning/building which cleans/builds also
+# abs-lib both for DocumentLoader and sdremote. We don't want one Ant to be
+# cleaning out abs-lib while another is building stuff that depends on
+# it. yeah, this sucks
+ cd $(SRCDIR)/android/experimental/DocumentLoader && flock
$(SRCDIR)/android/lock sh -c "$(MAKE) clean && $(MAKE) all"
+ mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+ cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk
$(SRCDIR)/instsetoo_native/$(INPATH)/bin
+
+# vim: set noet sw=4 ts=4:
diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk
index 1d552f5..e3f08d7 100644
--- a/android/CustomTarget_sdremote.mk
+++ b/android/CustomTarget_sdremote.mk
@@ -14,7 +14,11 @@ $(call gb_CustomTarget_get_target,android/sdremote) :
$(sdremote_DIR)/done
$(sdremote_DIR)/done : $(gb_Helper_PHONY)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)
- cd $(SRCDIR)/android/sdremote && $(MAKE) clean && $(MAKE) all
+# Lock needed to serialize the Ant cleaning/building which cleans/builds also
+# abs-lib both for DocumentLoader and sdremote. We don't want one Ant to be
+# cleaning out abs-lib while another is building stuff that depends on
+# it. yeah, this sucks
+ cd $(SRCDIR)/android/sdremote && flock $(SRCDIR)/android/lock sh -c
"$(MAKE) clean && $(MAKE) all"
mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk
$(SRCDIR)/instsetoo_native/$(INPATH)/bin
diff --git a/android/Module_android.mk b/android/Module_android.mk
index 2f0d76e..a0a9fa3 100644
--- a/android/Module_android.mk
+++ b/android/Module_android.mk
@@ -12,6 +12,7 @@ ifeq ($(OS),ANDROID)
$(eval $(call gb_Module_add_targets,android,\
CustomTarget_sdremote \
+ CustomTarget_docloader \
))
endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
