[Libreoffice-commits] .: 4 commits - configure.in Makefile.in scripting/Jar_ScriptProviderForBeanShell.mk swext/Extension_wiki-publisher.mk swext/Jar_mediawiki.mk

[René Engelhard]

 Makefile.in                                 |    2 +-
 configure.in                                |    7 ++++++-
 scripting/Jar_ScriptProviderForBeanShell.mk |    5 +++++
 swext/Extension_wiki-publisher.mk           |    2 ++
 swext/Jar_mediawiki.mk                      |   18 ++++++++++++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit a8699a2665b465a19db1fde1159dbeb70253da0b
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 16 13:15:42 2011 +0000

    add Class-Path: to ScriptProviderForBeanShell.jar when using system-beanshell

diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index e81f5b0..7fd3201 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -39,6 +39,11 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\
 $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\
 	bsh \
 ))
+ifeq ($(SYSTEM_BSH),YES)
+$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell,\
+        $(BSH_JAR) \
+))
+endif
 
 $(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com))
 
commit 8e970bc4e75caf40324f821123fdce36cb01918c
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 16 12:19:25 2011 +0000

    fix swext build with SYSTEM_APACHE_COMMONS==YES

diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index 278b467..bdf0855 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -31,10 +31,12 @@ WIKISRC := $(SRCDIR)/swext/mediawiki
 
 $(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src))
 
+ifneq ($(SYSTEM_APACHE_COMMONS),YES)
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.3.jar,$(OUTDIR)/bin/commons-codec-1.3.jar)) 
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar)) 
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar)) 
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar)) 
+endif
 $(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Addons.xcu)) 
 $(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
 $(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk
index acafa86..2a1c7ef 100644
--- a/swext/Jar_mediawiki.mk
+++ b/swext/Jar_mediawiki.mk
@@ -33,12 +33,30 @@ $(eval $(call gb_Jar_set_packageroot,mediawiki,com))
 
 $(eval $(call gb_Jar_set_manifest,mediawiki,$(SRCDIR)/swext/mediawiki/src/com/sun/star/wiki/MANIFEST.MF))
 
+ifeq ($(SYSTEM_APACHE_COMMONS),YES)
+# FIXME: use gb_Jar_use_externals?
+# for the build
+$(eval $(call gb_Jar_add_jars,mediawiki,\
+	$(COMMONS_CODEC_JAR) \
+	$(COMMONS_LANG_JAR) \
+	$(COMMONS_HTTPCLIENT_JAR) \
+	$(COMMONS_LOGGING_JAR) \
+))
+# Class-Path: in MANIFEST.MF
+$(eval $(call gb_Jar_set_jarclasspath,mediawiki,\
+	$(COMMONS_CODEC_JAR) \
+	$(COMMONS_LANG_JAR) \
+	$(COMMONS_HTTPCLIENT_JAR) \
+	$(COMMONS_LOGGING_JAR) \
+))
+else
 $(eval $(call gb_Jar_set_jarclasspath,mediawiki,\
 	commons-codec-1.3.jar \
 	commons-lang-2.3.jar \
 	commons-httpclient-3.1.jar \
 	commons-logging-1.1.1.jar \
 ))
+endif
 
 $(eval $(call gb_Jar_add_jars,mediawiki,\
 	$(OUTDIR)/bin/juh.jar \
commit 4a1d3a8cfef7ebcbb0fe311648237c42f40509f8
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Oct 15 19:46:00 2011 +0000

    don't remove "bootstrap" in make distclean

diff --git a/Makefile.in b/Makefile.in
index a7d884c..197eb8e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,7 +86,7 @@ ifeq (@BUILD_DMAKE@,YES)
 	-test -f dmake/Makefile && $(MAKE) -C dmake distclean
 endif
 	rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun autom4te.cache \
-	bin/repo-list bootstrap config.log config.status configure \
+	bin/repo-list config.log config.status configure \
 	desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
 	set_soenv set_soenv.last set_soenv.stamp src.downloaded warn 
 
commit 6923f3fc13f560fd0a2f4f8a12b6f4d45fb4da71
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Oct 15 17:44:01 2011 +0000

    don't grep /proc/cpuinfo but use getconf on Linux

diff --git a/configure.in b/configure.in
index d7b9a5c..07e2e50 100644
--- a/configure.in
+++ b/configure.in
@@ -6488,8 +6488,9 @@ if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
     # some systems need this. Like Ubuntu....
     AC_CHECK_LIB(m, floor)
     AC_CHECK_LIB(dl, dlopen)
+    AC_CHECK_LIB(colamd, colamd)
     AC_CHECK_LIB(lpsolve55, make_lp, ,
-        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
+        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lpsolve])
     MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS lpsolve55.dll"
 else
     AC_MSG_RESULT([internal])
@@ -9417,6 +9418,10 @@ else
         BUILD_NCPUS=`sysctl -n hw.ncpu`
         ;;
 
+    Linux)
+	BUILD_NCPUS=`getconf _NPROCESSORS_ONLN`
+	;;
+    # what else than above does profit here *and* has /proc?
     *)
         BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
         ;;