summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Rentz [dr] <daniel.rentz@oracle.com>2010-12-27 12:33:29 +0100
committerDaniel Rentz [dr] <daniel.rentz@oracle.com>2010-12-27 12:33:29 +0100
commitf1c483c9e1c464ae7f848fa85903390e00a0dba9 (patch)
treea2051d432d0d48c94e737506e3eabe9da32f4e0f
parentcf64a0ad8c33c2ad658c2fa2b839c7b080f9317b (diff)
parenta23aac32c22c6106b72dcc2f621be535314cbc6e (diff)
dr77: rebase to DEV300m96
Notes
split repo tag: extensions_ooo/DEV300_m97 split repo tag: extensions_ooo/DEV300_m98
-rw-r--r--jfreereport/java/flute/makefile.mk30
-rw-r--r--jfreereport/java/jfreereport/makefile.mk15
-rw-r--r--jfreereport/java/libbase/makefile.mk28
-rw-r--r--jfreereport/java/libfonts/makefile.mk28
-rw-r--r--jfreereport/java/libformula/makefile.mk30
-rw-r--r--jfreereport/java/liblayout/makefile.mk14
-rw-r--r--jfreereport/java/libloader/makefile.mk29
-rw-r--r--jfreereport/java/librepository/makefile.mk29
-rw-r--r--jfreereport/java/libserializer/makefile.mk28
-rw-r--r--jfreereport/java/libxml/makefile.mk28
-rw-r--r--jfreereport/java/sac/makefile.mk4
-rwxr-xr-xjfreereport/patches/common_build.patch76
-rw-r--r--jfreereport/patches/flow-engine.patch4
-rw-r--r--jfreereport/patches/flute.patch19
-rw-r--r--jfreereport/patches/libbase.patch19
-rw-r--r--jfreereport/patches/libfonts.patch10
-rw-r--r--jfreereport/patches/libformula.patch27
-rw-r--r--jfreereport/patches/liblayout.patch4
-rw-r--r--jfreereport/patches/libloader.patch11
-rw-r--r--jfreereport/patches/librepository.patch10
-rw-r--r--jfreereport/patches/libserializer.patch10
-rw-r--r--jfreereport/patches/libxml.patch10
-rw-r--r--jfreereport/prj/d.lst1
-rw-r--r--jfreereport/version.mk12
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf8
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java16
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/makefile.mk14
-rw-r--r--reportbuilder/java/com/sun/star/report/util/makefile.mk6
-rw-r--r--[-rwxr-xr-x]reportbuilder/util/makefile.mk22
-rw-r--r--[-rwxr-xr-x]sdext/source/minimizer/description.xml2
-rw-r--r--sdext/source/pdfimport/config/pdf_import_filter.xcu6
-rw-r--r--[-rwxr-xr-x]sdext/source/presenter/description.xml2
-rw-r--r--sdext/source/presenter/makefile.mk3
-rw-r--r--sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu3
35 files changed, 313 insertions, 250 deletions
diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index 9444d75fb692..413b951d1961 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -29,29 +29,29 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=flute
-VERSION=-1.3.0
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_MD5=f3e2febd267c8e4b13df00dac211dd6d
-TARFILE_ROOTDIR=$(TARGET)
-# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-# CONVERTFILES=build.xml
-
+TARFILE_NAME=$(TARGET)-$(FLUTE_VERSION)
+TARFILE_MD5=d8bd5eed178db6e2b18eeed243f85aa8
+# TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+CONVERTFILES=common_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
@@ -65,9 +65,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.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)-$(FLUTE_VERSION).jar
+
+$(PACKAGE_DIR)$/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(FLUTE_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
+
+$(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(FLUTE_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(FLUTE_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk
index b527d28973e9..483400d23233 100644
--- a/jfreereport/java/jfreereport/makefile.mk
+++ b/jfreereport/java/jfreereport/makefile.mk
@@ -29,21 +29,20 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=flow-engine
-VERSION=-0.9.2
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
.IF "$(L10N_framework)"==""
-TARFILE_NAME=core
-TARFILE_MD5=d4c4d91ab3a8e52a2e69d48d34ef4df4
-TARFILE_ROOTDIR=core
+TARFILE_NAME=$(TARGET)-$(FLOW_ENGINE_VERSION)
+TARFILE_IS_FLAT=true
+TARFILE_MD5=ba2930200c9f019c2d93a8c88c651a0f
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-# ADDITIONAL_FILES=MANIFEST.MF
CONVERTFILES=build.xml
.IF "$(JAVACISGCJ)"=="yes"
@@ -64,8 +63,8 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.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)-$(FLOW_ENGINE_VERSION).jar
+$(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)-$(FLOW_ENGINE_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
index 1cbfc11de0da..bcbe1e68e956 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -29,28 +29,29 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=libbase
-VERSION=-1.0.0
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-TARFILE_NAME=$(TARGET)
-TARFILE_MD5=8ea307d71d11140574bfb9fcc2487e33
-TARFILE_ROOTDIR=$(TARGET)
+TARFILE_NAME=$(TARGET)-$(LIBBASE_VERSION)
+TARFILE_MD5=eeb2c7ddf0d302fba4bfc6e97eac9624
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
-# PATCH_FILES=$(PRJ)$/patches$/libbase.patch
-# CONVERTFILES=build.xml
+PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+CONVERTFILES=common_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
@@ -64,8 +65,13 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
.IF "$(L10N_framework)"==""
.INCLUDE : tg_ext.mk
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBBASE_VERSION).jar
+$(PACKAGE_DIR)$/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBBASE_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
+
# 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
# commons-logging.jar here - yes, even in the system-apache commons case.
@@ -79,7 +85,7 @@ $(CLASSDIR)$/commons-logging.jar :
$(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)-$(LIBBASE_VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBBASE_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBBASE_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index f59b3cc0963f..2c7e60e9e48a 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -29,28 +29,28 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=libfonts
-VERSION=-1.0.0
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_MD5=f7925ba8491fe570e5164d2c72791358
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(LIBFONTS_VERSION)
+TARFILE_IS_FLAT=true
+TARFILE_MD5=3bdf40c0d199af31923e900d082ca2dd
+PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+CONVERTFILES=common_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)" -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
@@ -63,9 +63,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar
+
+$(PACKAGE_DIR)$/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFONTS_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
+
+$(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBFONTS_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBFONTS_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
index 4372ce2b764d..195130d1c2cc 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -29,30 +29,28 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=libformula
-VERSION=-0.2.0
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_MD5=d1a3205871c3c52e8a50c9f18510ae12
-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)-$(LIBFORMULA_VERSION)
+TARFILE_IS_FLAT=true
+TARFILE_MD5=3404ab6b1792ae5f16bbd603bd1e1d03
+PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+CONVERTFILES=common_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)" -f $(ANT_BUILDFILE) jar
.ENDIF
@@ -66,9 +64,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar
+
+$(PACKAGE_DIR)$/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBFORMULA_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
+
+$(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBFORMULA_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBFORMULA_VERSION).jar
.ENDIF
# $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/IsRef-Function.properties :
diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk
index 0340e43ccbd7..778b1b17c87f 100644
--- a/jfreereport/java/liblayout/makefile.mk
+++ b/jfreereport/java/liblayout/makefile.mk
@@ -29,19 +29,19 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=liblayout
-VERSION=-0.2.9
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_MD5=79600e696a98ff95c2eba976f7a8dfbb
-TARFILE_ROOTDIR=$(TARGET)
+TARFILE_NAME=$(TARGET)-$(LIBLAYOUT_VERSION)
+TARFILE_IS_FLAT=true
+TARFILE_MD5=db60e4fde8dd6d6807523deb71ee34dc
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml
@@ -63,9 +63,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar
+$(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)-$(LIBLAYOUT_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index ce97b402d1dd..bb1b6f2e147e 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -29,28 +29,29 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=libloader
-VERSION=-1.0.0
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-TARFILE_NAME=$(TARGET)
-TARFILE_MD5=a06a496d7a43cbdc35e69dbe678efadb
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(LIBLOADER_VERSION)
+TARFILE_IS_FLAT=true
+TARFILE_MD5=97b2d4dba862397f446b217e2b623e71
+PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+CONVERTFILES=common_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)" -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
@@ -63,9 +64,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBLOADER_VERSION).jar
+
+$(PACKAGE_DIR)$/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBLOADER_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
+
+$(CLASSDIR)$/$(TARGET)-$(LIBLOADER_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBLOADER_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBLOADER_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index e11639c7ae62..37da0755618a 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -29,28 +29,29 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=librepository
-VERSION=-1.0.0
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
-TARFILE_NAME=$(TARGET)
-TARFILE_MD5=dbb3757275dc5cc80820c0b4dd24ed95
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(LIBREPOSITORY_VERSION)
+TARFILE_IS_FLAT=true
+TARFILE_MD5=8ce2fcd72becf06c41f7201d15373ed9
+PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+CONVERTFILES=common_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)" -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
@@ -63,9 +64,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar
+
+$(PACKAGE_DIR)$/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBREPOSITORY_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
+
+$(CLASSDIR)$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBREPOSITORY_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
index 12a301edc9e6..170d3fa4c2c6 100644
--- a/jfreereport/java/libserializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -29,28 +29,28 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=libserializer
-VERSION=-1.0.0
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_MD5=5aba06ede2daa9f2c11892fbd7bc3057
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(LIBSERIALIZER_VERSION)
+TARFILE_IS_FLAT=true
+TARFILE_MD5=f94d9870737518e3b597f9265f4e9803
+PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+CONVERTFILES=common_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)" -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
@@ -63,9 +63,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar
+
+$(PACKAGE_DIR)$/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBSERIALIZER_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
+
+$(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBSERIALIZER_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
index d0c8bb427103..356d05fc957e 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -29,28 +29,28 @@ PRJ=..$/..
PRJNAME=jfreereport
TARGET=libxml
-VERSION=-1.0.0
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
+.INCLUDE : $(PRJ)$/version.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
.IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_MD5=67b42915c8432abf0a922438f00860a2
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(LIBXML_VERSION)
+TARFILE_IS_FLAT=true
+TARFILE_MD5=ace6ab49184e329db254e454a010f56d
+PATCH_FILES=$(PACKAGE_DIR)$/$(TARGET).patch
+CONVERTFILES=common_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_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)" -Dantcontrib.available="true" -Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
@@ -63,9 +63,15 @@ BUILD_ACTION=$(ANT) -Dlib="../../../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
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar
+
+$(PACKAGE_DIR)$/$(TARGET).patch :
+ @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
+ ( $(TYPE:s/+//) $(PRJ)$/patches$/common_build.patch | $(SED) 's/libloader-1.1.3/$(TARGET)-$(LIBXML_VERSION)/g' > $(PACKAGE_DIR)$/$(TARGET).patch )
+ $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)$/so_converted_$(TARGET).dummy
+
+$(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(LIBXML_VERSION).jar $(CLASSDIR)$/$(TARGET)-$(LIBXML_VERSION).jar
.ENDIF
.ENDIF
diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk
index 44cb28435142..01d6186fd36d 100644
--- a/jfreereport/java/sac/makefile.mk
+++ b/jfreereport/java/sac/makefile.mk
@@ -58,9 +58,9 @@ ADDITIONAL_FILES=build.xml
.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)" -Dantcontrib.available="true" -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)" -Dantcontrib.available="true" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) all
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/patches/common_build.patch b/jfreereport/patches/common_build.patch
new file mode 100755
index 000000000000..3d5330b9e383
--- /dev/null
+++ b/jfreereport/patches/common_build.patch
@@ -0,0 +1,76 @@
+--- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.000000000 +0100
++++ misc/build/libloader-1.1.3/common_build.xml 2009-12-04 10:22:24.277647200 +0100
+@@ -497,7 +497,7 @@
+ Sets a property build.id to the either "development" or the svn revision
+ if in release mode
+ ====================================================================-->
+- <target name="set-build.id" unless="build.id" depends="install-antcontrib">
++ <target name="set-build.id" unless="build.id" >
+ <if>
+ <istrue value="${release}" />
+ <then>
+@@ -1061,6 +1061,11 @@
+ Performs the actual compile
+ ====================================================================-->
+ <target name="compile.compile" depends="init">
++ <copy todir="${classes.dir}">
++ <fileset dir="source">
++ <include name="**/*.properties"/>
++ </fileset>
++ </copy>
+ <javac destdir="${classes.dir}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+@@ -1082,27 +1082,32 @@
+ duplicate copying of resources from src tree (handled by compile.src_copy
+ if jar.include.source is set.
+ ====================================================================-->
+- <target name="compile.res_copy" depends="install-antcontrib">
+- <if>
+- <available file="${res.dir}" />
+- <then>
+- <copy todir="${classes.dir}">
+- <fileset dir="${res.dir}" />
+- </copy>
+- </then>
+- </if>
++ <target name="compile.res_copy" >
++ <condition property="copy.res.available">
++ <available file="$(res.dir)" type="dir" />
++ </condition>
++ <antcall target="copy.res" />
+
+- <if>
+- <not>
+- <isset property="jar.include.source" />
+- </not>
+- <then>
+- <copy todir="${classes.dir}" flatten="false">
+- <fileset dir="${src.dir}" excludes="**/*.java" />
+- </copy>
+- </then>
+- </if>
+- </target>
++ <condition property="copy.res.class.available">
++ <not>
++ <isset property="jar.include.source" />
++ </not>
++ </condition>
++ <antcall target="copy.res.class" />
++ </target>
++
++ <target name="copy.res" if="copy.res.available" >
++ <copy todir="${classes.dir}">
++ <fileset dir="${res.dir}"/>
++ </copy>
++ </target>
++
++ <target name="copy.res.class" if="copy.res.class.available" >
++ <uptodate targetfile="${classes.dir}" property="s">
++ <srcfiles dir= "${src.dir}" excludes="**/*.java" />
++ <flattenmapper/>
++ </uptodate>
++ </target>
+
+
+ <!--=======================================================================
diff --git a/jfreereport/patches/flow-engine.patch b/jfreereport/patches/flow-engine.patch
index 13da432113fb..aef70cb7fef6 100644
--- a/jfreereport/patches/flow-engine.patch
+++ b/jfreereport/patches/flow-engine.patch
@@ -1,5 +1,5 @@
---- misc/core/build.xml (Revision 6728)
-+++ misc/build/core/build.xml (Arbeitskopie)
+--- misc/flow-engine-0.9.4/build.xml (Revision 6728)
++++ misc/build/flow-engine-0.9.4/build.xml (Arbeitskopie)
@@ -24,6 +24,6 @@
<!-- Setup the compile classpath -->
<path id="classpath">
diff --git a/jfreereport/patches/flute.patch b/jfreereport/patches/flute.patch
deleted file mode 100644
index aad7756c3b65..000000000000
--- a/jfreereport/patches/flute.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- misc/flute/build.xml (Revision 6820)
-+++ misc/build/flute/build.xml (Arbeitskopie)
-@@ -9,6 +9,7 @@
- <property name="build.doc" value="${build}/api"/>
- <property name="build.lib" value="${build}/lib"/>
- <property name="packagenames" value="org.w3c.flute.*"/>
-+ <property name="lib" value="lib"/>
-
- <!-- Targets -->
- <!-- Prepare build directories -->
-@@ -21,7 +22,7 @@
-
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
diff --git a/jfreereport/patches/libbase.patch b/jfreereport/patches/libbase.patch
deleted file mode 100644
index f6a7560de145..000000000000
--- a/jfreereport/patches/libbase.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- misc/libbase/build.xml (Revision 6728)
-+++ misc/build/libbase/build.xml (Arbeitskopie)
-@@ -6,6 +6,7 @@
- <property name="build.classes" value="${build}/classes"/>
- <property name="build.doc" value="${build}/api"/>
- <property name="build.lib" value="${build}/lib"/>
-+ <property name="lib" value="lib"/>
-
- <!-- Targets -->
- <!-- Prepare build directories -->
-@@ -18,7 +19,7 @@
-
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
diff --git a/jfreereport/patches/libfonts.patch b/jfreereport/patches/libfonts.patch
deleted file mode 100644
index 63c5a1a48f93..000000000000
--- a/jfreereport/patches/libfonts.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/libfonts/build.xml (Revision 6728)
-+++ misc/build/libfonts/build.xml (Arbeitskopie)
-@@ -23,6 +23,6 @@
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
diff --git a/jfreereport/patches/libformula.patch b/jfreereport/patches/libformula.patch
deleted file mode 100644
index 07968b448675..000000000000
--- a/jfreereport/patches/libformula.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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 @@
-
- for (int i = 0; i < parameters.length; i++)
- {
-- parameters[i].initialize(context);
-+ if ( parameters[i] != null )
-+ parameters[i].initialize(context);
- }
- }
-
diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch
index ef9cb5bb06b3..4b1c23100987 100644
--- a/jfreereport/patches/liblayout.patch
+++ b/jfreereport/patches/liblayout.patch
@@ -1,5 +1,5 @@
---- misc/liblayout/build.xml (Revision 6728)
-+++ misc/build/liblayout/build.xml (Arbeitskopie)
+--- misc/liblayout-0.2.10/build.xml (Revision 6728)
++++ misc/build/liblayout-0.2.10/build.xml (Arbeitskopie)
@@ -24,6 +24,6 @@
<!-- Setup the compile classpath -->
<path id="classpath">
diff --git a/jfreereport/patches/libloader.patch b/jfreereport/patches/libloader.patch
deleted file mode 100644
index 82a2624855a9..000000000000
--- a/jfreereport/patches/libloader.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/libloader/build.xml 2009-02-12 18:01:56.000000000 +0100
-+++ misc/build/libloader/build.xml 2009-02-13 09:57:21.856601684 +0100
-@@ -23,7 +23,7 @@
-
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
diff --git a/jfreereport/patches/librepository.patch b/jfreereport/patches/librepository.patch
deleted file mode 100644
index 8a981595798c..000000000000
--- a/jfreereport/patches/librepository.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/librepository/build.xml (Revision 6728)
-+++ misc/build/librepository/build.xml (Arbeitskopie)
-@@ -24,6 +24,6 @@
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
diff --git a/jfreereport/patches/libserializer.patch b/jfreereport/patches/libserializer.patch
deleted file mode 100644
index 830fdb9ca348..000000000000
--- a/jfreereport/patches/libserializer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/libserializer/build.xml (Revision 6728)
-+++ misc/build/libserializer/build.xml (Arbeitskopie)
-@@ -24,6 +24,6 @@
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
diff --git a/jfreereport/patches/libxml.patch b/jfreereport/patches/libxml.patch
deleted file mode 100644
index 50981a462de2..000000000000
--- a/jfreereport/patches/libxml.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/libxml/build.xml (Revision 6728)
-+++ misc/build/libxml/build.xml (Arbeitskopie)
-@@ -24,6 +24,6 @@
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
diff --git a/jfreereport/prj/d.lst b/jfreereport/prj/d.lst
index a63f3a1312d5..2527cc676782 100644
--- a/jfreereport/prj/d.lst
+++ b/jfreereport/prj/d.lst
@@ -1 +1,2 @@
..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
+..\version.mk %_DEST%\bin%_EXT%\jfreereport_version.mk
diff --git a/jfreereport/version.mk b/jfreereport/version.mk
new file mode 100644
index 000000000000..cd9a8053bbd9
--- /dev/null
+++ b/jfreereport/version.mk
@@ -0,0 +1,12 @@
+FLUTE_VERSION=1.1.6
+LIBBASE_VERSION=1.1.6
+LIBFONTS_VERSION=1.1.6
+LIBFORMAT_VERSION=1.1.6
+LIBFORMULA_VERSION=1.1.7
+LIBLAYOUT_VERSION=0.2.10
+LIBLOADER_VERSION=1.1.6
+LIBREPOSITORY_VERSION=1.1.6
+LIBSERIALIZER_VERSION=1.1.6
+LIBXML_VERSION=1.1.7
+FLOW_ENGINE_VERSION=0.9.4
+
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
index d68a2f8cedc8..008f50518ff1 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
@@ -32,12 +32,15 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
EXTRAJARFILES = $(LIBBASE_JAR) $(LIBFORMULA_JAR)
.ELSE
-JARFILES = libbase-1.0.0.jar libformula-0.2.0.jar
+JARFILES += \
+ libbase-$(LIBBASE_VERSION).jar \
+ libformula-$(LIBFORMULA_VERSION).jar
.ENDIF
JAVAFILES := AuthorFunction.java \
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf b/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
index 70f3ff695cbb..5d27005f2d65 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
+++ b/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
@@ -1,7 +1,7 @@
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
- flow-engine-0.9.2.jar sac.jar commons-logging-1.1.1.jar
+ flute-1.1.6.jar libserializer-1.1.6.jar libbase-1.1.6.jar
+ libfonts-1.1.6.jar libformula-1.1.7.jar liblayout-0.2.10.jar
+ libloader-1.1.6.jar librepository-1.1.6.jar libxml-1.1.7.jar
+ flow-engine-0.9.4.jar sac.jar commons-logging-1.1.1.jar
UNO-Type-Path:
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
index fc637001d766..97b3db27201e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
@@ -34,6 +34,7 @@ import java.util.HashMap;
import java.util.Map;
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;
@@ -169,4 +170,19 @@ public class InputRepositoryLoader implements 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.");
+ }
}
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
index 9280fcd71b70..d309e1da8385 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
@@ -33,13 +33,25 @@ PACKAGE = com$/sun$/star$/report$/pentaho
nodep=true
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
EXTRAJARFILES += $(FLUTE_JAR) $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR) $(LIBLOADER_JAR) $(SAC_JAR) $(LIBLAYOUT_JAR) $(LIBSERIALIZER_JAR) $(LIBFONTS_JAR) $(LIBFORMULA_JAR) $(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-$(FLUTE_VERSION).jar \
+ libserializer-$(LIBSERIALIZER_VERSION).jar \
+ libbase-$(LIBBASE_VERSION).jar \
+ libfonts-$(LIBFONTS_VERSION).jar \
+ libformula-$(LIBFORMULA_VERSION).jar \
+ liblayout-$(LIBLAYOUT_VERSION).jar \
+ libloader-$(LIBLOADER_VERSION).jar \
+ librepository-$(LIBREPOSITORY_VERSION).jar \
+ libxml-$(LIBXML_VERSION).jar \
+ flow-engine-$(FLOW_ENGINE_VERSION).jar \
+ sac.jar
.ENDIF
.IF "$(SYSTEM_APACHE_COMMONS)" == "YES"
diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk
index 8361ee6bfbf7..70e290e4884e 100644
--- a/reportbuilder/java/com/sun/star/report/util/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk
@@ -32,12 +32,16 @@ PACKAGE = com$/sun$/star$/report$/util
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
EXTRAJARFILES = $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR)
.ELSE
-JARFILES = libbase-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar
+JARFILES += \
+ libbase-$(LIBBASE_VERSION).jar \
+ libxml-$(LIBXML_VERSION).jar \
+ flow-engine-$(FLOW_ENGINE_VERSION).jar
.ENDIF
JAVAFILES = DefaultJobProperties.java DefaultParameterMap.java DefaultReportJobDefinition.java ManifestWriter.java
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index c52e85841f68..810686822593 100755..100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -38,6 +38,8 @@ EXTENSION_VERSION_BASE=1.2.1
# --- Settings ----------------------------------
.INCLUDE : makefile.pmk
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
+
.IF "$(L10N_framework)"==""
# ------------------------------------------------------------------
# calready set in util$/makefile.pmk
@@ -96,16 +98,16 @@ COMPONENT_EXTJARFILES = \
.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)$/liblayout-0.2.9.jar \
- $(EXTENSIONDIR)$/libloader-1.0.0.jar \
- $(EXTENSIONDIR)$/librepository-1.0.0.jar \
- $(EXTENSIONDIR)$/libxml-1.0.0.jar \
- $(EXTENSIONDIR)$/flow-engine-0.9.2.jar \
+ $(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar \
+ $(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar \
+ $(EXTENSIONDIR)$/libbase-$(LIBBASE_VERSION).jar \
+ $(EXTENSIONDIR)$/libfonts-$(LIBFONTS_VERSION).jar \
+ $(EXTENSIONDIR)$/libformula-$(LIBFORMULA_VERSION).jar \
+ $(EXTENSIONDIR)$/liblayout-$(LIBLAYOUT_VERSION).jar \
+ $(EXTENSIONDIR)$/libloader-$(LIBLOADER_VERSION).jar \
+ $(EXTENSIONDIR)$/librepository-$(LIBREPOSITORY_VERSION).jar \
+ $(EXTENSIONDIR)$/libxml-$(LIBXML_VERSION).jar \
+ $(EXTENSIONDIR)$/flow-engine-$(FLOW_ENGINE_VERSION).jar \
$(EXTENSIONDIR)$/sac.jar
.ENDIF
.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index 64a67a05b343..a4f172d0ebe6 100755..100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -17,7 +17,7 @@
</simple-license>
</registration>
- <version value="1.0.2"/>
+ <version value="1.0.3"/>
<platform value="UPDATED_SUPPORTED_PLATFORM"/>
diff --git a/sdext/source/pdfimport/config/pdf_import_filter.xcu b/sdext/source/pdfimport/config/pdf_import_filter.xcu
index 89ad84b7a6cf..628be6db8be9 100644
--- a/sdext/source/pdfimport/config/pdf_import_filter.xcu
+++ b/sdext/source/pdfimport/config/pdf_import_filter.xcu
@@ -20,7 +20,7 @@
<value>pdf_Portable_Document_Format</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="x-default">PDF - Portable Document Format</value>
+ <value xml:lang="x-default">PDF - Portable Document Format (Draw)</value>
</prop>
<prop oor:name="TemplateName"/>
<prop oor:name="UIComponent"/>
@@ -49,7 +49,7 @@
<value>pdf_Portable_Document_Format</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="x-default">PDF - Portable Document Format</value>
+ <value xml:lang="x-default">PDF - Portable Document Format (Impress)</value>
</prop>
<prop oor:name="TemplateName"/>
<prop oor:name="UIComponent"/>
@@ -78,7 +78,7 @@
<value>pdf_Portable_Document_Format</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="x-default">PDF - Portable Document Format</value>
+ <value xml:lang="x-default">PDF - Portable Document Format (Writer)</value>
</prop>
<prop oor:name="TemplateName"/>
<prop oor:name="UIComponent"/>
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index ede52f0bf1bb..19fefec6de8a 100755..100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -8,7 +8,7 @@
<identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
<dependencies>
- <OpenOffice.org-minimal-version value="3.2" dep:name="OpenOffice.org 3.2"/>
+ <OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/>
</dependencies>
<registration>
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 997d43054d3b..e751a6e500ff 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -307,8 +307,11 @@ $(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMON
@-$(MKDIRHIER) $(@:d)
$(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@
+.IF "$(ZIP1TARGETN)"!=""
$(ZIP1TARGETN) : $(HELPLINKALLTARGETS)
+.ENDIF # "$(ZIP1TARGETN)"!=""
+
$(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
@-$(MKDIRHIER) $(@:d)
+$(COPY) $< $@
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
index ba743328e811..1241a72a0243 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
@@ -5,6 +5,9 @@
<prop oor:name="Service">
<value>com.sun.star.comp.Draw.framework.PresenterScreenJob</value>
</prop>
+ <prop oor:name="Context">
+ <value>com.sun.star.presentation.PresentationDocument</value>
+ </prop>
</node>
</node>
<node oor:name="Events">