[ooo-build-commit] .: 2 commits - patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Fri Sep 17 05:05:27 PDT 2010
patches/dev300/apply | 8 -
patches/dev300/build-java-target.diff | 230 ------------------------------
patches/dev300/oox-tokenmap.string.h.diff | 19 --
3 files changed, 1 insertion(+), 256 deletions(-)
New commits:
commit c66c83af51a72df6b02eb999076fd9d09f11bac1
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Sep 17 13:56:11 2010 +0200
build-java-target.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b1b48ff..d65a347 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -711,9 +711,6 @@ pushfont-psstream.diff, i#84481, michael
libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
[ BuildBits ]
-# allow to define java target, so the build is usable with the JVM 1.5
-# even when it is built with JDK 1.6
-build-java-target.diff, i#93115, pmladek
solenv-subsequenttest-fix.diff, i#112789, thorsten
# do not create '.' subdirectories
diff --git a/patches/dev300/build-java-target.diff b/patches/dev300/build-java-target.diff
deleted file mode 100644
index a2f37de..0000000
--- a/patches/dev300/build-java-target.diff
+++ /dev/null
@@ -1,230 +0,0 @@
----
- configure.in | 62 +++++++++++++++++++++++++++++++++++++++++++++
- hsqldb/makefile.mk | 2 +-
- qadevOOo/makefile.mk | 2 +-
- rhino/makefile.mk | 2 +-
- set_soenv.in | 3 ++
- solenv/inc/antsettings.mk | 29 +++++++++++---------
- solenv/inc/settings.mk | 3 ++
- 7 files changed, 87 insertions(+), 16 deletions(-)
-
-diff --git configure.in configure.in
-index 0da7e54..99cf64f 100644
---- configure.in
-+++ configure.in
-@@ -595,6 +595,17 @@ AC_ARG_WITH(java,
- no support for Java components, applets, accessibility
- or XML filters.
- ], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
-+AC_ARG_WITH(java_target_version,
-+[ --with-java-target-version Generate class files that will work on JVMs with
-+ the specified version. For example, use
-+ --with-java-target-version=1.4 to make sure that the
-+ application will work with JVM 1.4 even when compiled
-+ with JDK 1.5.
-+
-+ This option is ignored when you compile with gcj/gij.
-+
-+ Usage: --with-java-target-version=<jvm version>
-+],,)
- AC_ARG_ENABLE(gcjaot,
- [ --enable-gcjaot Build with[[out]] using Ahead of Time java compilation
- support to speed up buildsi by compiling the jars also
-@@ -2877,6 +2888,44 @@ else
- JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
- fi
-
-+_java_target_ver="1.5"
-+dnl ===================================================================
-+dnl Check for target java bytecode version
-+dnl ===================================================================
-+if test "$SOLAR_JAVA" != ""; then
-+ AC_MSG_CHECKING([for target java bytecode version])
-+ if test "$JDK" = "gcj" -o "$JDK" = "kaffe"; then
-+ AC_MSG_RESULT([default by $JDK])
-+ if test -n "$with_java_target_version" -a "$with_java_target_version" != "no" ; then
-+ AC_MSG_WARN([Value defined by --with-java-target-version is ignored!])
-+ fi
-+ else
-+ if test -n "$with_java_target_version" -a "$with_java_target_version" != "no" ; then
-+ _java_target_ver="$with_java_target_version"
-+ AC_MSG_RESULT([$_java_target_ver])
-+ elif test $_jdk_ver -gt 10000 ; then
-+ _java_target_ver=`echo "$_jdk_ver" | $AWK '{ maj=substr($0,1,1); min=substr($0,2,2); print int(maj)"."int(min) }'`
-+ AC_MSG_RESULT([$_java_target_ver])
-+ else
-+ AC_MSG_ERROR([Unable to guess java bytecode version from java version!])
-+ fi
-+ fi
-+
-+ if ! test -z "$_java_target_ver" -o \
-+ "$_java_target_ver" = "1.1" -o \
-+ "$_java_target_ver" = "1.2" -o \
-+ "$_java_target_ver" = "1.3" -o \
-+ "$_java_target_ver" = "1.4" -o \
-+ "$_java_target_ver" = "1.5" -o \
-+ "$_java_target_ver" = "1.6" -o \
-+ "$_java_target_ver" = "5" ; then
-+ AC_MSG_ERROR([$_java_target_ver is not supported java bytecode version!])
-+ fi
-+
-+ JAVA_SOURCE_VER="$_java_target_ver"
-+ JAVA_TARGET_VER="$_java_target_ver"
-+fi
-+
- dnl ===================================================================
- dnl Checks for javac
- dnl ===================================================================
-@@ -2937,6 +2986,17 @@ if test "$SOLAR_JAVA" != ""; then
- fi
- AC_SUBST(JAVACISGCJ)
-
-+JAVACISKAFFE=""
-+dnl ===================================================================
-+dnl Checks that javac is kaffe
-+dnl ===================================================================
-+if test "$SOLAR_JAVA" != ""; then
-+ if test `$JAVACOMPILER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
-+ JAVACISKAFFE="yes"
-+ fi
-+fi
-+AC_SUBST(JAVACISKAFFE)
-+
- dnl ===================================================================
- dnl Checks for javadoc
- dnl ===================================================================
-@@ -3151,6 +3211,8 @@ fi
- AC_SUBST(JAVA_HOME)
- AC_SUBST(JDK)
- AC_SUBST(JAVAFLAGS)
-+AC_SUBST(JAVA_SOURCE_VER)
-+AC_SUBST(JAVA_TARGET_VER)
- AC_SUBST(JAVAINTERPRETER)
- AC_SUBST(JAVAIFLAGS)
- AC_SUBST(JAVACOMPILER)
-diff --git hsqldb/makefile.mk hsqldb/makefile.mk
-index 6b3166a..8b3d5b1 100755
---- hsqldb/makefile.mk
-+++ hsqldb/makefile.mk
-@@ -66,7 +66,7 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f
- .IF "$(debug)"!=""
- BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.debug="on" -f $(ANT_BUILDFILE) jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
-+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
- .ENDIF
- .ENDIF
-
-diff --git qadevOOo/makefile.mk qadevOOo/makefile.mk
-index 8d8b4ab..612b866 100755
---- qadevOOo/makefile.mk
-+++ qadevOOo/makefile.mk
-@@ -43,7 +43,7 @@ TST:
-
- .IF "$(SOLAR_JAVA)"=="TRUE"
- .IF "$(ANT_HOME)"!="NO_ANT_HOME"
--ANT_FLAGS+=-Dbuild.source=1.5
-+ANT_FLAGS+=-Dbuild.source=$(JAVA_SOURCE_VER)
- .IF "$(L10N_framework)"==""
- ALLTAR: ANTBUILD
- .ENDIF
-diff --git rhino/makefile.mk rhino/makefile.mk
-index 008fb0c..9f42ca2 100755
---- rhino/makefile.mk
-+++ rhino/makefile.mk
-@@ -53,7 +53,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
- .ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" jar
-+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar
- .ENDIF
-
- # --- Targets ------------------------------------------------------
-diff --git set_soenv.in set_soenv.in
-index 5b876d2..2aceb1f 100644
---- set_soenv.in
-+++ set_soenv.in
-@@ -1741,6 +1741,7 @@ ToFile( "DMAKEROOT", $DMAKEROOT, "e" );
- if ( $JDK ne "gcj" ) {
- ToFile( "CLASSPATH", $CLASSPATH, "e" );
- ToFile( "XCLASSPATH", $XCLASSPATH, "e" );
-+ ToFile( "JAVACISKAFFE", '@JAVACISKAFFE@', "e" );
- }
- else {
- ToFile( "JAVACISGCJ", '@JAVACISGCJ@', "e" );
-@@ -1752,6 +1753,8 @@ if ( '@JDK@' ne '' )
- {
- ToFile( "JDK", "@JDK@", "e" );
- ToFile( "JAVAFLAGS", "@JAVAFLAGS@", "e" );
-+ ToFile( "JAVA_SOURCE_VER", "@JAVA_SOURCE_VER@","e" );
-+ ToFile( "JAVA_TARGET_VER", "@JAVA_TARGET_VER@","e" );
- ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" );
- ToFile( "JAVAIFLAGS", "@JAVAIFLAGS@", "e" );
- ToFile( "JAVACOMPILER", PathFormat("@JAVACOMPILER@"), "e" );
-diff --git solenv/inc/antsettings.mk solenv/inc/antsettings.mk
-index 5a28b24..a06d7c9 100644
---- solenv/inc/antsettings.mk
-+++ solenv/inc/antsettings.mk
-@@ -40,6 +40,18 @@ PATH!:=$(ANT_HOME)/bin:$(PATH)
- ANT*:=$(ANT_HOME)/bin/ant
- ANT_BUILDFILE*=build.xml
-
-+.IF "$(ANT_COMPILER_FLAGS)"==""
-+.IF "$(JAVACISGCJ)" == "yes"
-+ANT_COMPILER_FLAGS=-Dbuild.compiler=gcj
-+.ENDIF
-+.ENDIF
-+
-+.IF "$(ANT_JAVA_VER_FLAGS)"==""
-+.IF "$(JDK)" != "gcj" && $(JAVACISKAFFE) != "yes"
-+ANT_JAVA_VER_FLAGS=-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
-+.ENDIF
-+.ENDIF
-+
- .IF "$(ANT_DEBUG)"==""
- .IF "$(debug)"==""
- ANT_DEBUG=off
-@@ -61,21 +73,12 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- .ENDIF
-
--.IF "$(JAVACISGCJ)" == "yes"
--ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) \
-- -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \
-- -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \
-- -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
-+ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
-+ -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
-+ -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
-+ -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
- -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
- -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
--.ELSE
--ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) \
-- -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" \
-- -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) \
-- -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \
-- -Dsolar.sourceversion=$(SOURCEVERSION) -Dsolar.lastminor=$(LAST_MINOR) \
-- -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
--.ENDIF
- .ELSE # No java
- ANT=
- ANT_FLAGS=
-diff --git solenv/inc/settings.mk solenv/inc/settings.mk
-index ccd8f92..03cc24f 100644
---- solenv/inc/settings.mk
-+++ solenv/inc/settings.mk
-@@ -147,6 +147,9 @@ JAVAI:=$(JAVAINTERPRETER)
- .IF "$(JAVACISGCJ)" == "yes"
- JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
- .ENDIF
-+.IF "$(JDK)" != "gcj" && $(JAVACISKAFFE) != "yes"
-+JAVAC+=-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
-+.ENDIF
-
- #classpath and response
- .IF "$(JDK)" == "J++"
---
-1.7.0.1
-
commit 1d3bdad4dabec8fbb31b39b4a0ddee0c7a91e50b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Sep 17 12:37:19 2010 +0200
oox-tokenmap.string.h.diff: Removing unneeded patch and section
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 287d5e5..b1b48ff 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -17,7 +17,7 @@ Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
Layout, VBABits, VBAObjects, CalcErrors, GCJ, Lwp, \
OOXML, OOXMLExportDevel, OOXMLExport, FrameworkFeature, UnitTesting, \
PopupRemoval, FedoraCommonFixes, LayoutDialogs, Fuzz, \
- CalcRowLimit, Gcc44, BuildFix, WriterDocComparison, \
+ CalcRowLimit, BuildFix, WriterDocComparison, \
MySQL, BorderTypes, WriterNavigation
LinuxCommon : Common, Defaults, FontConfigTemporaryHacks, \
@@ -751,9 +751,6 @@ dmake-space-in-envvar-name.diff, i#101786, jholesov
# return 0 with -h option
# FIXME dev300-m77 transex3-localize.pl-ooo-build.diff, i#107386, pmladek # RENAMED transex3 -> l10ntools
-[ Gcc44 ]
-oox-tokenmap.string.h.diff, i#105219
-
[ Java14 ]
# enable build with Java 1.4; can't go upstream
diff --git a/patches/dev300/oox-tokenmap.string.h.diff b/patches/dev300/oox-tokenmap.string.h.diff
deleted file mode 100644
index 4ec3ed0..0000000
--- a/patches/dev300/oox-tokenmap.string.h.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- oox/source/token/tokenmap.cxx | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git oox/source/token/tokenmap.cxx oox/source/token/tokenmap.cxx
-index 17979d7..a3dac5c 100644
---- oox/source/token/tokenmap.cxx
-+++ oox/source/token/tokenmap.cxx
-@@ -25,6 +25,7 @@
- *
- ************************************************************************/
-
-+#include <string.h>
- #include "oox/token/tokenmap.hxx"
- #include <string.h>
- #include <rtl/strbuf.hxx>
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list