strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ocke Janssen [oj] 2010-02-09 15:32:51 +01:00
commit b38d922de0
51 changed files with 280 additions and 236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
jfreereport/download/core.zip
View file

Binary file not shown.

BIN
jfreereport/download/flow-engine-0.9.4.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/flute-1.1.2.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/flute.zip
View file

Binary file not shown.

BIN
jfreereport/download/libbase-1.1.3.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/libbase.zip
View file

Binary file not shown.

BIN
jfreereport/download/libfonts-1.1.3.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/libfonts.zip
View file

Binary file not shown.

BIN
jfreereport/download/libformat-1.1.3.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/libformula-1.1.3.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/libformula.zip
View file

Binary file not shown.

BIN
jfreereport/download/liblayout-0.2.10.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/liblayout.zip
View file

Binary file not shown.

BIN
jfreereport/download/libloader-1.1.3.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/libloader.zip
View file

Binary file not shown.

BIN
jfreereport/download/librepository-1.1.3.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/librepository.zip
View file

Binary file not shown.

BIN
jfreereport/download/libserializer-1.1.3.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/libserializer.zip
View file

Binary file not shown.

BIN
jfreereport/download/libxml-1.1.3.zip Normal file
View file

Binary file not shown.

BIN
jfreereport/download/libxml.zip
View file

Binary file not shown.

27
jfreereport/java/flute/makefile.mk
View file

@ -33,28 +33,27 @@ 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_ROOTDIR=$(TARGET)
# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
# CONVERTFILES=build.xml
TARFILE_NAME=$(TARGET)-$(FLUTE_VERSION)
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)!= ""
@ -68,9 +67,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

13
jfreereport/java/jfreereport/makefile.mk
View file

@ -33,20 +33,19 @@ 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_ROOTDIR=core
TARFILE_NAME=$(TARGET)-$(FLOW_ENGINE_VERSION)
TARFILE_IS_FLAT=true
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
# ADDITIONAL_FILES=MANIFEST.MF
CONVERTFILES=build.xml
.IF "$(JAVACISGCJ)"=="yes"
@ -67,8 +66,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

26
jfreereport/java/libbase/makefile.mk
View file

@ -33,27 +33,28 @@ 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_ROOTDIR=$(TARGET)
TARFILE_NAME=$(TARGET)-$(LIBBASE_VERSION)
#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)!= ""
@ -67,8 +68,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.
@ -82,7 +88,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

26
jfreereport/java/libfonts/makefile.mk
View file

@ -33,27 +33,27 @@ 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_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml
TARFILE_NAME=$(TARGET)-$(LIBFONTS_VERSION)
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="$(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)!= ""
@ -66,9 +66,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

28
jfreereport/java/libformula/makefile.mk
View file

@ -33,29 +33,27 @@ 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_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
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
@ -69,9 +67,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 :

12
jfreereport/java/liblayout/makefile.mk
View file

@ -33,18 +33,18 @@ 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_ROOTDIR=$(TARGET)
TARFILE_NAME=$(TARGET)-$(LIBLAYOUT_VERSION)
TARFILE_IS_FLAT=true
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml
@ -66,9 +66,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

27
jfreereport/java/libloader/makefile.mk
View file

@ -33,27 +33,28 @@ 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_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml
TARFILE_NAME=$(TARGET)-$(LIBLOADER_VERSION)
TARFILE_IS_FLAT=true
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)!= ""
@ -66,9 +67,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

27
jfreereport/java/librepository/makefile.mk
View file

@ -33,27 +33,28 @@ 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_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml
TARFILE_NAME=$(TARGET)-$(LIBREPOSITORY_VERSION)
TARFILE_IS_FLAT=true
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)!= ""
@ -66,9 +67,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

26
jfreereport/java/libserializer/makefile.mk
View file

@ -33,27 +33,27 @@ 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_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml
TARFILE_NAME=$(TARGET)-$(LIBSERIALIZER_VERSION)
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="$(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)!= ""
@ -66,9 +66,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

26
jfreereport/java/libxml/makefile.mk
View file

@ -33,27 +33,27 @@ 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_ROOTDIR=$(TARGET)
PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml
TARFILE_NAME=$(TARGET)-$(LIBXML_VERSION)
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="$(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)!= ""
@ -66,9 +66,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

4
jfreereport/java/sac/makefile.mk
View file

@ -61,9 +61,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)!= ""

64
jfreereport/patches/common_build.patch Normal file
View file

@ -0,0 +1,64 @@
--- 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>
@@ -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>
<!--=======================================================================

4
jfreereport/patches/flow-engine.patch
View file

@ -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">

19
jfreereport/patches/flute.patch
View file

@ -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>

19
jfreereport/patches/libbase.patch
View file

@ -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>

10
jfreereport/patches/libfonts.patch
View file

@ -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>

27
jfreereport/patches/libformula.patch
View file

@ -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);
}
}

4
jfreereport/patches/liblayout.patch
View file

@ -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">

11
jfreereport/patches/libloader.patch
View file

@ -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>

10
jfreereport/patches/librepository.patch
View file

@ -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>

10
jfreereport/patches/libserializer.patch
View file

@ -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>

10
jfreereport/patches/libxml.patch
View file

@ -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>

1
jfreereport/prj/d.lst
View file

@ -1 +1,2 @@
..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
..\version.mk %_DEST%\bin%_EXT%\jfreereport_version.mk

12
jfreereport/version.mk Normal file
View file

@ -0,0 +1,12 @@
FLUTE_VERSION=1.1.2
LIBBASE_VERSION=1.1.3
LIBFONTS_VERSION=1.1.3
LIBFORMAT_VERSION=1.1.3
LIBFORMULA_VERSION=1.1.3
LIBLAYOUT_VERSION=0.2.10
LIBLOADER_VERSION=1.1.3
LIBREPOSITORY_VERSION=1.1.3
LIBSERIALIZER_VERSION=1.1.3
LIBXML_VERSION=1.1.3
FLOW_ENGINE_VERSION=0.9.4

5
reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
View file

@ -36,12 +36,15 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
CLASSPATH!:==$(CLASSPATH)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(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 \

8
reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
View file

@ -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.2.jar libserializer-1.1.3.jar libbase-1.1.3.jar
libfonts-1.1.3.jar libformula-1.1.3.jar liblayout-0.2.10.jar
libloader-1.1.3.jar librepository-1.1.3.jar libxml-1.1.3.jar
flow-engine-0.9.4.jar sac.jar commons-logging-1.1.1.jar
UNO-Type-Path:

16
reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
View file

@ -35,6 +35,7 @@ import java.util.HashMap;
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;
@ -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.");
}
}

14
reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
View file

@ -37,13 +37,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"
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-$(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"

6
reportbuilder/java/com/sun/star/report/util/makefile.mk
View file

@ -36,12 +36,16 @@ PACKAGE = com$/sun$/star$/report$/util
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(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

24
reportbuilder/util/makefile.mk
View file

@ -32,7 +32,7 @@
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)
@ -42,6 +42,8 @@ EXTENSION_VERSION_BASE=1.2.0
# --- Settings ----------------------------------
.INCLUDE : makefile.pmk
.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
.IF "$(L10N_framework)"==""
# ------------------------------------------------------------------
# calready set in util$/makefile.pmk
@ -100,16 +102,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"