[ooo-build-commit] Branch 'ooo/master' - 2 commits - odk/pack odk/source odk/util
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 16 19:48:25 PDT 2009
odk/pack/checkbin/makefile.mk | 7 +++++++
odk/pack/checkidl/makefile.mk | 7 +++++++
odk/pack/checkinc/makefile.mk | 5 +++++
odk/pack/checkinc2/makefile.mk | 5 +++++
odk/pack/copying/makefile.mk | 5 +++++
odk/pack/gendocu/makefile.mk | 5 +++++
odk/source/com/sun/star/lib/loader/Loader.java | 1 +
odk/util/makefile.mk | 7 +++++--
8 files changed, 40 insertions(+), 2 deletions(-)
New commits:
commit 9d41f5c168a834250cfef9fdfef55424d5a752f6
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Wed Sep 16 14:37:52 2009 +0000
CWS-TOOLING: integrate CWS sb113
2009-09-01 sb #i76393# second attempt at properly #ifdef-ing previous HG commit d598efdbf012
2009-08-28 sb #i102469# change back <T extends XInterface> to just <T> on queryInterface, to avoid binary incompatibility (method changing its signature from (Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object; to (Ljava/lang/Class;Ljava/lang/Object;)Lcom/sun/star/uno/XInterface;)
2009-08-28 sb #i76393# properly #ifdef previous HG commit d598efdbf012
2009-08-27 sb #i94421# work around compiler error (based on a patch supplied by cloph)
2009-08-26 sb merged in DEV300_m56
2009-08-26 sb #i76393# on Linux, include dynamic section offset in crash report so as to be able to map "prelinked" callstacks back to original (patch by cmc)
2009-08-26 sb #i88162# remove unnecessary whitespace lines from per-locale xcu files (patch by tora)
2009-08-17 Juergen Schmidt #i104292# set context classloader after create new custom UNO loader
2009-08-17 Juergen Schmidt #i103749# integrate patch
2009-08-14 sb #i103269# cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r 5124ebd5edd1 ("#i101955# changed encoding of XML file content from erroneous ISO-8859-1 to UTF-8")
2009-08-12 sb #i102469# fixed mis-applications of UnoRuntime.queryInterface (detected via the simplified UnoRuntime.queryInterface, the HG changeset 29de35fc9554) to use AnyConverter instead; changed qadevOOo's lib.MultiMethodTest.before to allow throwing arbitrary exceptions, to cater for IllegalArgumentException thrown by AnyConverter
2009-08-12 sb #i104178# drop extra libxml2-config script from libxmlsec
2009-08-10 sb #i101754# simplified osl_getProcessInfo for LINUX (patch by cmc)
2009-08-10 sb #i95018# avoid closing -1 fds (patch supplied by cmc)
2009-08-10 sb #i103585# removed (apparently unnecessary) zlib support from libxml2; in turn, removed zlib dependencies from libxmlsec, libxslt, and redland (assuming those were transitive dependencies brought in by direct dependencies on libxml2)
2009-08-10 sb #i102469# simplified UnoRuntime.queryInterface using Java 5 generics; adapted URE-related modules accordingly
2009-08-10 sb #i101213# adapted setsolar env (solenv/config/) to set PYTHONPATH (and not set PYTHONHOME) in accordance with configure env (set_soenv.in); fixed testtools/source/bridgetest/pyuno (which now should work everywhere out of the box, thanks to the fixed setsolar PYTHONPATH)
2009-08-10 sb cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r ea8de6d9396b ("#i101955# work in progress for a .hgignore file, continued")
diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java
index 871ad44..348bdb6 100644
--- a/odk/source/com/sun/star/lib/loader/Loader.java
+++ b/odk/source/com/sun/star/lib/loader/Loader.java
@@ -135,6 +135,7 @@ public final class Loader {
// invoke the main method
if ( className != null ) {
ClassLoader cl = getCustomLoader();
+ Thread.currentThread().setContextClassLoader(cl);
Class c = cl.loadClass( className );
Method m = c.getMethod( "main", new Class[] { String[].class } );
m.invoke( null, new Object[] { args } );
commit 28ced7649e310549e333ea14a9a7acd27efd2953
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Sep 16 11:45:54 2009 +0000
CWS-TOOLING: integrate CWS l10nframework01
diff --git a/odk/pack/checkbin/makefile.mk b/odk/pack/checkbin/makefile.mk
index abc2687..38183ff 100644
--- a/odk/pack/checkbin/makefile.mk
+++ b/odk/pack/checkbin/makefile.mk
@@ -36,6 +36,8 @@ TARGET=checkbin
.INCLUDE: settings.mk
.INCLUDE: $(PRJ)$/util$/makefile.pmk
#----------------------------------------------------------------
+.IF "$(L10N_framework)"==""
+
ODKCHECKFILE=$(MISC)$/$(TARGET).txt
all: $(ODKCHECKFILE)
@@ -46,3 +48,8 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
$(PERL) $(PRJ)$/util$/check.pl $(DESTDIR) $(DESTPLATFROM) "$(EXEPOSTFIX)" $(ODKCHECKFILE)
# RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
cat $(ODKCHECKFILE)
+
+.ELSE
+pseudo:
+
+.ENDIF
diff --git a/odk/pack/checkidl/makefile.mk b/odk/pack/checkidl/makefile.mk
index e0fcd53..707c89d 100644
--- a/odk/pack/checkidl/makefile.mk
+++ b/odk/pack/checkidl/makefile.mk
@@ -36,6 +36,8 @@ TARGET=checkidl
.INCLUDE: settings.mk
.INCLUDE: $(PRJ)$/util$/makefile.pmk
#----------------------------------------------------------------
+
+.IF "$(L10N_framework)"==""
ODKCHECKFILE=$(MISC)$/$(TARGET).txt
all : $(ODKCHECKFILE)
@@ -46,3 +48,8 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
-diff -br $(DESTDIRIDL) $(SOLARIDLDIR) $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
# RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
cat $(ODKCHECKFILE)
+
+.ELSE
+pseudo:
+
+.ENDIF
diff --git a/odk/pack/checkinc/makefile.mk b/odk/pack/checkinc/makefile.mk
index d61b46f..9c1e67b 100644
--- a/odk/pack/checkinc/makefile.mk
+++ b/odk/pack/checkinc/makefile.mk
@@ -36,6 +36,7 @@ TARGET=checkinc
.INCLUDE: settings.mk
.INCLUDE: $(PRJ)$/util$/makefile.pmk
#----------------------------------------------------------------
+.IF "$(L10N_framework)"==""
ODKCHECKFILE=$(MISC)$/$(TARGET).txt
all : $(ODKCHECKFILE)
@@ -51,3 +52,7 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
-diff -br $(DESTDIRINC)$/vos $(SOLARINCDIR)$/vos $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
# RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
cat $(ODKCHECKFILE)
+.ELSE
+pseudo:
+
+.ENDIF
diff --git a/odk/pack/checkinc2/makefile.mk b/odk/pack/checkinc2/makefile.mk
index cac17f4..9335919 100644
--- a/odk/pack/checkinc2/makefile.mk
+++ b/odk/pack/checkinc2/makefile.mk
@@ -36,6 +36,7 @@ TARGET=checkinc2
.INCLUDE: settings.mk
.INCLUDE: $(PRJ)$/util$/makefile.pmk
#----------------------------------------------------------------
+.IF "$(L10N_framework)"==""
ODKCHECKFILE=$(MISC)$/$(TARGET).txt
all : $(ODKCHECKFILE)
@@ -51,3 +52,7 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
-diff -br $(DESTDIRINC)$/cppuhelper $(SOLARINCDIR)$/cppuhelper $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
# RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
cat $(ODKCHECKFILE)
+.ELSE
+pseudo:
+
+.ENDIF
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 24bbdc2..f67cbd1 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -214,10 +214,15 @@ MYZIPLIST=com$/* win$/*
#--------------------------------------------------
# TARGETS
#--------------------------------------------------
+
+.IF "$(L10N_framework)"==""
+
all : CLEAN_DKVERSION_CHECK \
$(DIR_FILE_LIST) \
$(DIR_FILE_FLAG) \
+.ENDIF
+
#--------------------------------------------------
# use global rules
#--------------------------------------------------
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 697d5cb..5b070ca 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -37,6 +37,7 @@ TARGET=gendocu
.INCLUDE: settings.mk
.INCLUDE: $(PRJ)$/util$/makefile.pmk
#----------------------------------------------------------------
+.IF "$(L10N_framework)"==""
CPPDOCREFNAME="UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) C/C++ API Reference"
JAVADOCREFNAME="UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) Java API Reference"
@@ -120,3 +121,7 @@ $(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(JAVA_SRC_FILES)
-$(MKDIRHIER) $(@:d)
$(JAVADOC) -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
.ENDIF
+
+.ELSE
+pseudo:
+.ENDIF
diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk
index 078ecb9..a2e62ad 100644
--- a/odk/util/makefile.mk
+++ b/odk/util/makefile.mk
@@ -6,18 +6,21 @@ TARGET=odk
.INCLUDE: settings.mk
.INCLUDE: makefile.pmk
# ------------------------------------------------------------------
+.IF "$(L10N_framework)"==""
ZIP1TARGET=odkexamples
ZIP1FLAGS=-u -r
ZIP1DIR=$(PRJ)
ZIP1LIST=examples -x "*.svn*" -x "*CVS*" -x "*makefile.mk" -x "*Inspector*" -x "*Container1*" -x "*Storage*" -x "*register_component*" -x "*examples.html"
-.INCLUDE : target.mk
+.ENDIF
+.INCLUDE : target.mk
+.IF "$(L10N_framework)"==""
ALLTAR:\
$(BIN)$/$(PRODUCTZIPFILE)
# $(BIN)$/odk_oo.zip
-
+.ENDIF
$(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS)
cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . $(CHECKZIPRESULT)
More information about the ooo-build-commit
mailing list