Commits

Anonymous committed 4732948 Merge

Automated merge with file:///net/so-cwsserv01/export/cws/hg_clean/ooo/DEV300

Comments (0)

Files changed (31)

jfreereport/download/flute-1.1.2.zip

Binary file added.

jfreereport/download/flute.zip

Binary file removed.

jfreereport/download/libbase-1.1.2.zip

Binary file added.

jfreereport/download/libbase.zip

Binary file removed.

jfreereport/download/libfonts-1.1.2.zip

Binary file added.

jfreereport/download/libfonts.zip

Binary file removed.

jfreereport/download/libformula-1.1.2.zip

Binary file added.

jfreereport/download/libformula.zip

Binary file removed.

jfreereport/download/libloader-1.1.2.zip

Binary file added.

jfreereport/download/libloader.zip

Binary file removed.

jfreereport/download/librepository-1.1.2.zip

Binary file added.

jfreereport/download/librepository.zip

Binary file removed.

jfreereport/download/libserializer-1.1.2.zip

Binary file added.

jfreereport/download/libserializer.zip

Binary file removed.

jfreereport/download/libxml-1.1.2.zip

Binary file added.

jfreereport/download/libxml.zip

Binary file removed.

jfreereport/java/flute/makefile.mk

 
 PRJNAME=jfreereport
 TARGET=flute
-VERSION=-1.3.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-# CONVERTFILES=build.xml		 
-
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 .IF "$(L10N_framework)"==""
-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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 .ENDIF
 .ENDIF
 

jfreereport/java/jfreereport/makefile.mk

 
 PRJNAME=jfreereport
 TARGET=flow-engine
-VERSION=-0.9.2
+VERSION=0.9.2
 
 # --- Settings -----------------------------------------------------
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 .IF "$(L10N_framework)"==""
-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
+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
 .ENDIF

jfreereport/java/libbase/makefile.mk

 
 PRJNAME=jfreereport
 TARGET=libbase
-VERSION=-1.0.0
+VERSION=1.1.2
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
 
 # PATCH_FILES=$(PRJ)$/patches$/libbase.patch
 # CONVERTFILES=build.xml
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
 .IF "$(L10N_framework)"==""
 .INCLUDE : tg_ext.mk
 
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
 
 # XCLASSPATH/CLASSPATH does not work and we only can give lib once. But
 # the build.xmls fortunately take *.jar out of lib so we can copy our
 	$(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)$/commons-logging.jar
 .ENDIF
 
-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 .ENDIF
 .ENDIF

jfreereport/java/libfonts/makefile.mk

 
 PRJNAME=jfreereport
 TARGET=libfonts
-VERSION=-1.0.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
 .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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 
 .ENDIF
 .ENDIF

jfreereport/java/libformula/makefile.mk

 
 PRJNAME=jfreereport
 TARGET=libformula
-VERSION=-0.2.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml \
-            source$/org$/pentaho$/reporting$/libraries$/formula$/function$/datetime$/DateDifFunction.java \
-            source$/org$/pentaho$/reporting$/libraries$/formula$/lvalues$/FormulaFunction.java
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+#PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+#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) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 
 .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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 	
 .ENDIF
 # $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/IsRef-Function.properties : 

jfreereport/java/libloader/makefile.mk

 
 PRJNAME=jfreereport
 TARGET=libloader
-VERSION=-1.0.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml
 .IF "$(L10N_framework)"==""
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
 .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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 	
 .ENDIF
 .ENDIF

jfreereport/java/librepository/makefile.mk

 
 PRJNAME=jfreereport
 TARGET=librepository
-VERSION=-1.0.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml
 .IF "$(L10N_framework)"==""
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
 .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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 	
 .ENDIF
 .ENDIF

jfreereport/java/libserializer/makefile.mk

 
 PRJNAME=jfreereport
 TARGET=libserializer
-VERSION=-1.0.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml
 				
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
 .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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 	
 .ENDIF
 .ENDIF

jfreereport/java/libxml/makefile.mk

 
 PRJNAME=jfreereport
 TARGET=libxml
-VERSION=-1.0.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
 .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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 	
 .ENDIF
 .ENDIF

jfreereport/java/sac/makefile.mk

 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -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)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) all
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""

jfreereport/patches/libformula.patch

---- misc/libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateDifFunction.java	2008-12-12 13:04:46.000000000 +0100
-+++ misc/build/libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateDifFunction.java	2008-12-15 08:15:18.293125000 +0100
-@@ -198,12 +198,6 @@
-           LibFormulaErrorValue.ERROR_INVALID_ARGUMENT_VALUE);
-     }
- 
--    if (res < 0)
--    {
--      throw new EvaluationException(
--          LibFormulaErrorValue.ERROR_INVALID_ARGUMENT_VALUE);
--    }
--
-     //noinspection UnpredictableBigDecimalConstructorCall
-     return new TypeValuePair(NumberType.GENERIC_NUMBER, new BigDecimal((double) res));
-   }
 --- misc/libformula/source/org/pentaho/reporting/libraries/formula/lvalues/FormulaFunction.java	2008-12-12 13:04:46.000000000 +0100
 +++ misc/build/libformula/source/org/pentaho/reporting/libraries/formula/lvalues/FormulaFunction.java	2008-12-15 08:13:14.308750000 +0100
 @@ -161,7 +161,8 @@

reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf

 RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
 Class-Path: reportbuilderwizard.jar
-  flute-1.3.0.jar libserializer-1.0.0.jar libbase-1.0.0.jar
-  libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar
-  libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar
+  flute-1.1.2.jar libserializer-1.1.2.jar libbase-1.1.2.jar
+  libfonts-1.1.2.jar libformula-1.1.2.jar liblayout-0.2.9.jar
+  libloader-1.1.2.jar librepository-1.1.2.jar libxml-1.1.2.jar
   flow-engine-0.9.2.jar sac.jar commons-logging-1.1.1.jar
 UNO-Type-Path: 

reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java

 
 import com.sun.star.report.InputRepository;
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
+import org.pentaho.reporting.libraries.resourceloader.ResourceException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceLoader;
     {
         return resourceManager;
     }
+
+    public boolean isSupportedDeserializer(String string)
+    {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public String serialize(ResourceKey rk, ResourceKey rk1) throws ResourceException
+    {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public ResourceKey deserialize(ResourceKey rk, String string) throws ResourceKeyCreationException
+    {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 }

reportbuilder/java/com/sun/star/report/pentaho/makefile.mk

 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
 XCLASSPATH!:=$(XCLASSPATH)$(FLUTE_JAR)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(LIBSERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)
 .ELSE
-JARFILES += flute-1.3.0.jar libbase-1.0.0.jar libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar sac.jar
+JARFILES += flute-1.1.2.jar libbase-1.1.2.jar libfonts-1.1.2.jar libformula-1.1.2.jar liblayout-0.2.9.jar libloader-1.1.2.jar librepository-1.1.2.jar libxml-1.1.2.jar flow-engine-0.9.2.jar sac.jar
 .ENDIF
 
 .IF "$(SYSTEM_APACHE_COMMONS)" == "YES"

reportbuilder/util/makefile.mk

 PRJ=..
 PRJNAME=reportbuilder
 TARGET=rpt
-EXTENSION_VERSION_BASE=1.2.0
+EXTENSION_VERSION_BASE=1.2.1
 
 .IF "$(CWS_WORK_STAMP)" == ""
     EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
 
 .IF "$(SYSTEM_JFREEREPORT)" != "YES"
 COMPONENT_EXTJARFILES += \
-	$(EXTENSIONDIR)$/flute-1.3.0.jar				            \
-	$(EXTENSIONDIR)$/libserializer-1.0.0.jar				    \
-	$(EXTENSIONDIR)$/libbase-1.0.0.jar                          \
-	$(EXTENSIONDIR)$/libfonts-1.0.0.jar							\
-	$(EXTENSIONDIR)$/libformula-0.2.0.jar						\
+	$(EXTENSIONDIR)$/flute-1.1.2.jar				            \
+	$(EXTENSIONDIR)$/libserializer-1.1.2.jar				    \
+	$(EXTENSIONDIR)$/libbase-1.1.2.jar                          \
+	$(EXTENSIONDIR)$/libfonts-1.1.2.jar							\
+	$(EXTENSIONDIR)$/libformula-1.1.2.jar						\
 	$(EXTENSIONDIR)$/liblayout-0.2.9.jar						\
-	$(EXTENSIONDIR)$/libloader-1.0.0.jar						\
-	$(EXTENSIONDIR)$/librepository-1.0.0.jar					\
-	$(EXTENSIONDIR)$/libxml-1.0.0.jar							\
+	$(EXTENSIONDIR)$/libloader-1.1.2.jar						\
+	$(EXTENSIONDIR)$/librepository-1.1.2.jar					\
+	$(EXTENSIONDIR)$/libxml-1.1.2.jar							\
 	$(EXTENSIONDIR)$/flow-engine-0.9.2.jar 	                    \
 	$(EXTENSIONDIR)$/sac.jar
 .ENDIF