diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 14:30:14 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 14:30:14 +0000 |
| commit | e0dfccfc39071b5684dd0eb006d0386db5db0d78 (patch) | |
| tree | cc0b5281b21c4490b3adcccd3db3c00a28a446fb /jfreereport/java | |
| parent | 4e585a0f26f5d1680b8676259094d0ab1e0daba4 (diff) | |
INTEGRATION: CWS pentaho1 (1.3.6); FILE MERGED
2007/10/23 05:45:49 oj 1.3.6.2: #i80723# #i81510# makefile changes
2007/10/22 11:41:24 oj 1.3.6.1: #i80723# #i81510# switch to new branch from pentaho
Diffstat (limited to 'jfreereport/java')
| -rw-r--r-- | jfreereport/java/libloader/makefile.mk | 19 | ||||
| -rw-r--r-- | jfreereport/java/librepository/makefile.mk | 19 |
2 files changed, 22 insertions, 16 deletions
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk index cee8b2d98432..64c57ab41035 100644 --- a/jfreereport/java/libloader/makefile.mk +++ b/jfreereport/java/libloader/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2007-08-03 10:12:27 $ +# last change: $Author: ihi $ $Date: 2008-01-14 15:29:55 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,13 +37,14 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=libloader +VERSION=-0.3.6 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk # override buildfile -ANT_BUILDFILE=ant$/build.xml +ANT_BUILDFILE=build.xml .INCLUDE : antsettings.mk @@ -54,17 +55,19 @@ TARFILE_NAME=$(TARGET) TARFILE_ROOTDIR=$(TARGET) -PATCH_FILE_NAME=patches/$(TARGET).patch +PATCH_FILE_NAME=patches$/$(TARGET).patch -CONVERTFILES=ant$/build.xml\ - ant$/build.properties +CONVERTFILES=build.xml\ + build.properties + +OUT2CLASS=$(TARGET)$(VERSION).jar .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) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all +BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk index 8179ae7697c1..30e05204f1fb 100644 --- a/jfreereport/java/librepository/makefile.mk +++ b/jfreereport/java/librepository/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2007-08-03 10:12:38 $ +# last change: $Author: ihi $ $Date: 2008-01-14 15:30:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,13 +37,14 @@ PRJ=..$/.. PRJNAME=jfreereport TARGET=librepository +VERSION=-0.1.4 # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk # override buildfile -ANT_BUILDFILE=ant$/build.xml +ANT_BUILDFILE=build.xml .INCLUDE : antsettings.mk @@ -54,17 +55,19 @@ TARFILE_NAME=$(TARGET) TARFILE_ROOTDIR=$(TARGET) -PATCH_FILE_NAME=patches/$(TARGET).patch +PATCH_FILE_NAME=patches$/$(TARGET).patch -CONVERTFILES=ant$/build.xml\ - ant$/build.properties +CONVERTFILES=build.xml\ + build.properties + +OUT2CLASS=$(TARGET)$(VERSION).jar .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) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all +BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" |