CWS-TOOLING: integrate CWS rptfix04

2009-02-23 01:59:54 +0100 rene  r268341 : #i10000# fix system-jfreereport build
2009-02-13 10:17:16 +0100 oj  r267696 : #i98549# integrate zip form pentaho package
2009-02-03 14:48:34 +0100 oj  r267330 : set formula locale to doc locale
2009-02-03 14:45:54 +0100 oj  r267329 : set formula locale to doc locale
2009-02-03 11:50:03 +0100 oj  r267311 : set formula locale to doc locale
2009-02-03 08:55:02 +0100 oj  r267297 : unix line ends
2009-01-28 11:21:24 +0100 rene  r267043 : #i98549# s/DESIGN/BUILDER/ also for Sun
2009-01-27 17:17:50 +0100 rene  r267012 : merge builfix from trunk
2009-01-27 14:16:30 +0100 rene  r266991 : #i10000# fix rebase which left out the whole changes in former config_office; sync variable names (s/LIB_//) and some other things
2009-01-27 10:01:09 +0100 oj  r266959 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266944 (milestone: DEV300:m40)
2009-01-27 08:00:16 +0100 oj  r266951 : conflict in mergeinfo
2009-01-26 12:23:03 +0100 oj  r266914 : #i98383# fix grouping
2009-01-23 22:03:03 +0100 rene  r266852 : fix --enable-report-builder description
2009-01-23 10:37:27 +0100 oj  r266778 : set escape processing when set at query
2009-01-23 09:17:16 +0100 fs  r266770 : add CWS name to version
2009-01-21 13:57:35 +0100 oj  r266669 : merge for build bots
2009-01-20 09:07:24 +0100 oj  r266552 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266428 (milestone: DEV300:m39)
2009-01-20 08:34:16 +0100 oj  r266551 : rebase
2009-01-20 08:33:59 +0100 oj  r266550 : rebase
2009-01-20 08:32:50 +0100 oj  r266549 : rebase
2009-01-20 08:30:13 +0100 oj  r266548 : rebase
2009-01-20 08:29:30 +0100 oj  r266547 : rebase
2009-01-20 08:22:33 +0100 oj  r266546 : merge short cuts from dba31g
2009-01-19 21:04:08 +0100 rene  r266525 : #i10000# we need officecfg for component-update.dtd
2009-01-19 21:01:26 +0100 rene  r266524 : #i10000# fix import
2009-01-19 20:26:20 +0100 rene  r266523 : #i10000# remove svn conflicts markers; fix build
2009-01-19 14:23:56 +0100 rene  r266496 : libbase depends on apache-commons..
2009-01-19 14:00:42 +0100 oj  r266495 : merge from m39
2009-01-19 12:39:00 +0100 oj  r266489 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266428 (milestone: DEV300:m39)
2009-01-16 11:47:04 +0100 oj  r266410 : #i97560# add , between expressions
2009-01-09 17:11:38 +0100 rene  r266103 : don't show "checking which Apache commons-* libs to use" when we neither build the wiki editor nor  the SRB
2009-01-09 16:48:02 +0100 rene  r266099 : #i10000# reportbuilder needs apache-commons
2009-01-09 15:43:35 +0100 oj  r266093 : use of new nspaces
2009-01-09 15:41:34 +0100 oj  r266092 : use of new nspaces
2009-01-09 14:44:15 +0100 rene  r266088 : fix typo/description
2009-01-09 12:48:51 +0100 rene  r266074 : #i10000# fix install
2009-01-09 11:52:53 +0100 rene  r266070 : #i10000# more build fixes
2009-01-09 10:53:13 +0100 rene  r266062 : #i10000# ENABLE_REPORTBUILDER also in set_soenv.in, fix typo
2009-01-09 10:40:24 +0100 rene  r266060 : #i10000# configure fix for new reportbuilder module, typo fix at libfonts
2009-01-09 10:01:52 +0100 rene  r266055 : #i10000# adapt to current configure.in
2009-01-09 09:59:32 +0100 oj  r266054 : add new pentaho jars
2009-01-09 09:47:54 +0100 oj  r266049 : merge changes from DEV300_m39
2009-01-09 09:14:08 +0100 oj  r266048 : merge from DEV300_m39
2009-01-09 08:28:43 +0100 oj  r266045 : merge changes from dba31g
2009-01-09 07:58:10 +0100 oj  r266044 : replace JCOMMON with LIB
2009-01-08 13:42:24 +0100 oj  r266005 : move ext to reportbuilder
2009-01-08 13:41:38 +0100 oj  r266004 : add dep for license
2009-01-08 13:27:56 +0100 oj  r266001 : new module for Sun report Builder extension
2009-01-07 12:58:13 +0100 oj  r265960 : CWS-TOOLING: rebase CWS rptfix04 to trunk@265758 (milestone: DEV300:m38)
2008-12-15 13:47:18 +0100 oj  r265481 : new pentaho resources
2008-12-15 10:04:01 +0100 oj  r265462 : integrate new pentaho sources
2008-12-15 10:02:54 +0100 oj  r265461 : #i96888# fix date time function
2008-12-12 09:23:29 +0100 oj  r265389 : #97174# check of res < 0 removed
2008-12-12 09:15:54 +0100 oj  r265388 : #i9716# fix for DayFunction
2008-12-11 12:24:24 +0100 oj  r265281 : integrate new pentaho sources
2008-12-11 11:49:16 +0100 oj  r265273 : integrate new pentaho sources
2008-12-11 09:34:07 +0100 oj  r265248 : integrate new pentaho sources
2008-12-10 18:58:06 +0100 oj  r265227 : introduce new pentaho sources
2008-12-10 18:56:43 +0100 oj  r265226 : introduce new pentaho sources
2008-12-10 18:54:26 +0100 oj  r265225 : introduce new pentaho sources
2008-12-10 18:42:59 +0100 oj  r265221 : introduce new pentaho sources
2008-12-10 17:24:23 +0100 oj  r265212 : introduce new pentaho sources
2008-12-10 17:24:07 +0100 oj  r265211 : new pentaho sources
2008-12-10 17:23:00 +0100 oj  r265210 : introduce new pentaho sources

10 files changed, 102 insertions, 165 deletions

diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index 347d142daabe..afedcd5edbcc 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -33,37 +33,28 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=flute
-VERSION=-1.3-jfree-20061107
+VERSION=-1.3.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=ant$/build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
+# PATCH_FILE_NAME=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml		 
 
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=ant$/build.xml\
-             ant$/build.properties
-             
-OUT2CLASS=$(TARGET)$(VERSION).jar
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +66,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk
index 0b12ddb1897d..939964906eea 100644
--- a/jfreereport/java/jfreereport/makefile.mk
+++ b/jfreereport/java/jfreereport/makefile.mk
@@ -32,39 +32,29 @@
 PRJ=..$/..
 
 PRJNAME=jfreereport
-TARGET=pentaho-reporting-flow-engine
+TARGET=flow-engine
 VERSION=-0.9.2
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=core
-
 TARFILE_ROOTDIR=core
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-             build.properties \
-             source/org/jfree/report/expressions/ReportFormulaContext.java
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+# ADDITIONAL_FILES=MANIFEST.MF
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -76,4 +66,9 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
diff --git a/jfreereport/java/jcommon/makefile.mk b/jfreereport/java/libbase/makefile.mk
index c5185084c488..36e4c2b06f49 100644
--- a/jfreereport/java/jcommon/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -32,37 +32,28 @@
 PRJ=..$/..
 
 PRJNAME=jfreereport
-TARGET=jcommon-1.0.10
-
+TARGET=libbase
+VERSION=-1.0.0
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=ant$/build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
 
-PATCH_FILES=$(PRJ)$/patches$/jcommon.patch
-
-CONVERTFILES=ant$/build.xml\
-                ant$/build.properties
-                
-OUT2CLASS=$(TARGET).jar
+# PATCH_FILE_NAME=$(PRJ)$/patches$/libbase.patch
+# CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -74,5 +65,14 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) com
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)$/commons-logging-1.1.1.jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+
+$(CLASSDIR)$/commons-logging-1.1.1.jar : 
+    $(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging-1.1.1.jar
+    
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging-1.1.1.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
 .ENDIF
 
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index 8f62cd44756f..e8e289337f5b 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libfonts
-VERSION=-0.3.3
+VERSION=-1.0.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-            build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
index 3319d2c87549..1e4a3093f4bb 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -33,58 +33,29 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libformula
-VERSION=-0.1.14
+VERSION=-0.2.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-                build.properties \
-                source/org/jfree/formula/function/text/MidFunctionDescription.java \
-                source/org/jfree/formula/function/AbstractFunctionDescription.java \
-                source/org/jfree/formula/function/datetime/Hour-Function.properties \
-                source/org/jfree/formula/function/information/IsBlank-Function.properties \
-                source/org/jfree/formula/function/information/IsErr-Function.properties \
-                source/org/jfree/formula/function/information/IsError-Function.properties \
-                source/org/jfree/formula/function/information/IsEven-Function.properties \
-                source/org/jfree/formula/function/information/IsLogical-Function.properties \
-                source/org/jfree/formula/function/information/IsNa-Function.properties \
-                source/org/jfree/formula/function/information/IsNonText-Function.properties \
-                source/org/jfree/formula/function/information/IsNumber-Function.properties \
-                source/org/jfree/formula/function/information/IsOdd-Function.properties \
-                source/org/jfree/formula/function/information/IsText-Function.properties \
-                source/org/jfree/formula/function/logical/If-Function.properties \
-                source/org/jfree/formula/function/logical/Not-Function.properties \
-                source/org/jfree/formula/function/logical/Or-Function.properties \
-                source/org/jfree/formula/function/math/Even-Function.properties \
-                source/org/jfree/formula/function/math/ModFunctionDescription.java \
-                source/org/jfree/formula/function/text/Trim-Function.properties \
-                source/org/jfree/formula/parser/FormulaParser.java
-
-ADDITIONAL_FILES=source/org/jfree/formula/function/information/IsRef-Function.properties
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml \
+            source$/org$/pentaho$/reporting$/libraries$/formula$/function$/datetime$/DateDifFunction.java \
+            source$/org$/pentaho$/reporting$/libraries$/formula$/lvalues$/FormulaFunction.java
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 
@@ -97,6 +68,11 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 # $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/IsRef-Function.properties : 
 #	@@-$(MKDIRHIER) $(@:d)
diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk
index 21e607ab777d..409b9715fe13 100644
--- a/jfreereport/java/liblayout/makefile.mk
+++ b/jfreereport/java/liblayout/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=liblayout
-VERSION=-0.2.8
+VERSION=-0.2.9
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-             build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index c1e1cb8cf8a6..9cb1e93066a8 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libloader
-VERSION=-0.3.6
+VERSION=-1.0.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-                build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index 7dad4ed185b7..d6bdab754f88 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=librepository
-VERSION=-0.1.4
+VERSION=-1.0.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-                build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/jcommon-serializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
index 40147b066c11..e85eeb9ac1e5 100644
--- a/jfreereport/java/jcommon-serializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -32,38 +32,28 @@
 PRJ=..$/..
 
 PRJNAME=jfreereport
-TARGET=jcommon-serializer
-VERSION=-0.2.0
+TARGET=libserializer
+VERSION=-1.0.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-             build.properties
+PATCH_FILE_NAME=$(PRJ)$/patches$/$(TARGET).patch
+CONVERTFILES=build.xml
                 
-OUT2CLASS=$(TARGET)$(VERSION).jar
-
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
index c1dde8f3913a..fafb16753eb3 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libxml
-VERSION=-0.9.9
+VERSION=-1.0.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-                build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF