ooo-build r14066 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Wed Sep 24 18:22:52 2008
New Revision: 14066
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14066&view=rev

Log:
2008-09-24  Petr Mladek  <pmladek suse cz>

	* another Rene's change from ooo-build-3-0 branch; so all thanks should
	  go to Rene again

	* patches/dev300/build-java-target-swext.diff: move ...
	* patches/dev300/build-java-target-extensions.diff: ...here
	* patches/dev300/build-java-target.diff: remove jfreereport here ...
	* patches/dev300/build-java-target-extensions.diff: .. and add it here



Added:
   trunk/patches/dev300/build-java-target-extensions.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/build-java-target-swext.diff
   trunk/patches/dev300/build-java-target.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Sep 24 18:22:52 2008
@@ -400,7 +400,7 @@
 
 [ ExtensionFixes ]
 wiki-publisher-no-license.diff
-build-java-target-swext.diff, i#93115, pmladek
+build-java-target-extensions.diff, i#93115, pmladek
 
 [ NovellOnlyExtensionFixes ]
 # allow build with ant-1.6

Added: trunk/patches/dev300/build-java-target-extensions.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-java-target-extensions.diff	Wed Sep 24 18:22:52 2008
@@ -0,0 +1,48 @@
+--- apache-commons/java/codec/makefile.mk.old	2008-07-17 15:39:27.000000000 +0200
++++ apache-commons/java/codec/makefile.mk	2008-08-25 16:28:13.000000000 +0200
+@@ -61,7 +61,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -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 # $(SOLAR_JAVA)!= ""
+--- apache-commons/java/httpclient/makefile.mk.old	2008-07-17 15:39:42.000000000 +0200
++++ apache-commons/java/httpclient/makefile.mk	2008-08-25 16:30:51.000000000 +0200
+@@ -64,7 +64,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
+ .ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"  -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"  -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist
+ .ENDIF
+ 
+ .ENDIF # $(SOLAR_JAVA)!= ""
+--- tomcat/makefile.mk.old	2008-06-24 12:13:43.000000000 +0200
++++ tomcat/makefile.mk	2008-08-25 16:21:06.000000000 +0200
+@@ -52,7 +52,12 @@ ADDITIONAL_FILES = jakarta-servletapi-5/
+ PATCH_FILE_NAME=tomcat.patch
+ 
+ BUILD_DIR=jakarta-servletapi-5
++
++.IF "$(JAVACISGCJ)"=="yes"
+ BUILD_ACTION=$(ANT)
++.ELSE
++BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
++.ENDIF
+ 
+ # --- Targets ------------------------------------------------------
+ 
+--- jfreereport/java/sac/makefile.mk.old        2008-07-17 15:36:54.000000000 +0200
++++ jfreereport/java/sac/makefile.mk    2008-08-25 16:25:41.000000000 +0200
+@@ -61,7 +61,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
+ .ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
+ .ENDIF
+
+ .ENDIF # $(SOLAR_JAVA)!= ""

Modified: trunk/patches/dev300/build-java-target-swext.diff
==============================================================================
--- trunk/patches/dev300/build-java-target-swext.diff	(original)
+++ trunk/patches/dev300/build-java-target-swext.diff	Wed Sep 24 18:22:52 2008
@@ -1,37 +0,0 @@
---- apache-commons/java/codec/makefile.mk.old	2008-07-17 15:39:27.000000000 +0200
-+++ apache-commons/java/codec/makefile.mk	2008-08-25 16:28:13.000000000 +0200
-@@ -61,7 +61,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -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 # $(SOLAR_JAVA)!= ""
---- apache-commons/java/httpclient/makefile.mk.old	2008-07-17 15:39:42.000000000 +0200
-+++ apache-commons/java/httpclient/makefile.mk	2008-08-25 16:30:51.000000000 +0200
-@@ -64,7 +64,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
- .ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"  -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
-+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"  -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist
- .ENDIF
- 
- .ENDIF # $(SOLAR_JAVA)!= ""
---- tomcat/makefile.mk.old	2008-06-24 12:13:43.000000000 +0200
-+++ tomcat/makefile.mk	2008-08-25 16:21:06.000000000 +0200
-@@ -52,7 +52,12 @@ ADDITIONAL_FILES = jakarta-servletapi-5/
- PATCH_FILE_NAME=tomcat.patch
- 
- BUILD_DIR=jakarta-servletapi-5
-+
-+.IF "$(JAVACISGCJ)"=="yes"
- BUILD_ACTION=$(ANT)
-+.ELSE
-+BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
-+.ENDIF
- 
- # --- Targets ------------------------------------------------------
- 

Modified: trunk/patches/dev300/build-java-target.diff
==============================================================================
--- trunk/patches/dev300/build-java-target.diff	(original)
+++ trunk/patches/dev300/build-java-target.diff	Wed Sep 24 18:22:52 2008
@@ -194,14 +194,3 @@
  .ENDIF
  
  # --- Targets ------------------------------------------------------
---- jfreereport/java/sac/makefile.mk.old	2008-07-17 15:36:54.000000000 +0200
-+++ jfreereport/java/sac/makefile.mk	2008-08-25 16:25:41.000000000 +0200
-@@ -61,7 +61,7 @@ JAVA_HOME=
- .EXPORT : JAVA_HOME
- BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
- .ELSE
--BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
-+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
- .ENDIF
- 
- .ENDIF # $(SOLAR_JAVA)!= ""