applied_patches/0621-build-java-target-extensions.diff

   1 --- apache-commons/java/codec/makefile.mk.old   2008-07-17 15:39:27.000000000 +0200
   2 +++ apache-commons/java/codec/makefile.mk       2008-08-25 16:28:13.000000000 +0200
   3 @@ -61,7 +61,7 @@ JAVA_HOME=
   4  .EXPORT : JAVA_HOME
   5  BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
   6  .ELSE
   7 -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
   8 +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
   9  .ENDIF
  10
  11  .ENDIF # $(SOLAR_JAVA)!= ""
  12 --- apache-commons/java/httpclient/makefile.mk.old      2008-07-17 15:39:42.000000000 +0200
  13 +++ apache-commons/java/httpclient/makefile.mk  2008-08-25 16:30:51.000000000 +0200
  14 @@ -64,7 +64,7 @@ JAVA_HOME=
  15  .EXPORT : JAVA_HOME
  16  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
  17  .ELSE
  18 -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"  -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
  19 +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
  20  .ENDIF
  21
  22  .ENDIF # $(SOLAR_JAVA)!= ""
  23 --- tomcat/makefile.mk.old      2008-06-24 12:13:43.000000000 +0200
  24 +++ tomcat/makefile.mk  2008-08-25 16:21:06.000000000 +0200
  25 @@ -52,7 +52,12 @@ ADDITIONAL_FILES = jakarta-servletapi-5/
  26  PATCH_FILE_NAME=tomcat.patch
  27
  28  BUILD_DIR=jakarta-servletapi-5
  29 +
  30 +.IF "$(JAVACISGCJ)"=="yes"
  31  BUILD_ACTION=$(ANT)
  32 +.ELSE
  33 +BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
  34 +.ENDIF
  35
  36  # --- Targets ------------------------------------------------------
  37
  38 --- jfreereport/java/sac/makefile.mk.old        2008-07-17 15:36:54.000000000 +0200
  39 +++ jfreereport/java/sac/makefile.mk    2008-08-25 16:25:41.000000000 +0200
  40 @@ -61,7 +61,7 @@ JAVA_HOME=
  41  .EXPORT : JAVA_HOME
  42  BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
  43  .ELSE
  44 -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
  45 +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
  46  .ENDIF
  47
  48  .ENDIF # $(SOLAR_JAVA)!= ""
  49 --- jfreereport/java/libformula/makefile.mk.old 2009-04-02 12:58:08.000000000 +0200
  50 +++ jfreereport/java/libformula/makefile.mk     2009-04-22 17:02:30.000000000 +0200
  51 @@ -55,7 +55,7 @@ JAVA_HOME=
  52  .EXPORT : JAVA_HOME
  53  BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
  54  .ELSE
  55 -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
  56 +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
  57  .ENDIF
  58
  59
  60 --- jfreereport/java/librepository/makefile.mk.old      2009-04-02 12:58:08.000000000 +0200
  61 +++ jfreereport/java/librepository/makefile.mk  2009-04-22 17:09:33.000000000 +0200
  62 @@ -53,7 +53,7 @@ JAVA_HOME=
  63  .EXPORT : JAVA_HOME
  64  BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
  65  .ELSE
  66 -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
  67 +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
  68  .ENDIF
  69
  70  .ENDIF # $(SOLAR_JAVA)!= ""
  71 --- jfreereport/java/libserializer/makefile.mk.old      2009-04-02 12:58:08.000000000 +0200
  72 +++ jfreereport/java/libserializer/makefile.mk  2009-04-22 17:15:40.000000000 +0200
  73 @@ -53,7 +53,7 @@ JAVA_HOME=
  74  .EXPORT : JAVA_HOME
  75  BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
  76  .ELSE
  77 -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
  78 +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
  79  .ENDIF
  80
  81  .ENDIF # $(SOLAR_JAVA)!= ""
  82 --- jfreereport/java/flute/makefile.mk.old      2009-04-02 12:58:08.000000000 +0200
  83 +++ jfreereport/java/flute/makefile.mk  2009-04-22 17:22:09.000000000 +0200
  84 @@ -54,7 +54,7 @@ JAVA_HOME=
  85  .EXPORT : JAVA_HOME
  86  BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
  87  .ELSE
  88 -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
  89 +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
  90  .ENDIF
  91
  92  .ENDIF # $(SOLAR_JAVA)!= ""
  93 --- jfreereport/java/libfonts/makefile.mk.old   2009-04-02 12:58:08.000000000 +0200
  94 +++ jfreereport/java/libfonts/makefile.mk       2009-04-22 17:24:37.000000000 +0200
  95 @@ -53,7 +53,7 @@ JAVA_HOME=
  96  .EXPORT : JAVA_HOME
  97  BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
  98  .ELSE
  99 -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 100 +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
 101  .ENDIF
 102
 103  .ENDIF # $(SOLAR_JAVA)!= ""
 104 --- jfreereport/java/libxml/makefile.mk.old     2009-04-02 12:58:08.000000000 +0200
 105 +++ jfreereport/java/libxml/makefile.mk 2009-04-22 17:25:42.000000000 +0200
 106 @@ -53,7 +53,7 @@ JAVA_HOME=
 107  .EXPORT : JAVA_HOME
 108  BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 109  .ELSE
 110 -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 111 +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
 112  .ENDIF
 113
 114  .ENDIF # $(SOLAR_JAVA)!= ""
 115 --- jfreereport/java/liblayout/makefile.mk.old  2009-04-02 12:58:08.000000000 +0200
 116 +++ jfreereport/java/liblayout/makefile.mk      2009-04-22 17:29:57.000000000 +0200
 117 @@ -53,7 +53,7 @@ JAVA_HOME=
 118  .EXPORT : JAVA_HOME
 119  BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 120  .ELSE
 121 -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 122 +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
 123  .ENDIF
 124
 125  .ENDIF # $(SOLAR_JAVA)!= ""
 126 --- jfreereport/java/jfreereport/makefile.mk.old        2009-04-02 12:58:08.000000000 +0200
 127 +++ jfreereport/java/jfreereport/makefile.mk    2009-04-22 17:35:02.000000000 +0200
 128 @@ -54,7 +54,7 @@ JAVA_HOME=
 129  .EXPORT : JAVA_HOME
 130  BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 131  .ELSE
 132 -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 133 +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
 134  .ENDIF
 135
 136  .ENDIF # $(SOLAR_JAVA)!= ""
 137 --- jfreereport/java/libloader/makefile.mk.old  2009-04-02 12:58:08.000000000 +0200
 138 +++ jfreereport/java/libloader/makefile.mk      2009-04-22 17:16:48.000000000 +0200
 139 @@ -53,7 +53,7 @@ JAVA_HOME=
 140  .EXPORT : JAVA_HOME
 141  BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 142  .ELSE
 143 -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 144 +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
 145  .ENDIF
 146
 147  .ENDIF # $(SOLAR_JAVA)!= ""
 148 --- jfreereport/java/libbase/makefile.mk.old    2009-03-20 14:44:30.000000000 +0100
 149 +++ jfreereport/java/libbase/makefile.mk        2009-06-25 19:04:50.000000000 +0200
 150 @@ -53,7 +53,7 @@ JAVA_HOME=
 151  .EXPORT : JAVA_HOME
 152  BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 153  .ELSE
 154 -BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 155 +BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
 156  .ENDIF
 157
 158  .ENDIF # $(SOLAR_JAVA)!= ""