Skip to content

C
core
Kaydet (Commit) 4e585a0f authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann
Dosyalara gözat
Seçenekler

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:23 oj 1.3.6.1: #i80723# #i81510# switch to new branch from pentaho
üst aec21ea5
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 36 deletions
jfreereport/java/jfreereport/makefile.mk
Dosyayı görüntüle @ 4e585a0f
......@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.3 $
# $Revision: 1.4 $
#
# last change: $Author: hr $ $Date: 2007-08-03 10:11:35 $
# last change: $Author: ihi $ $Date: 2008-01-14 15:29:03 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
......@@ -36,35 +36,37 @@
PRJ=..$/..
PRJNAME=jfreereport
TARGET=jfreereport
TARGET=pentaho-reporting-flow-engine
VERSION=-0.9.2
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
# override buildfile
ANT_BUILDFILE=ant$/build.xml
ANT_BUILDFILE=build.xml
.INCLUDE : antsettings.mk
.IF "$(SOLAR_JAVA)" != ""
# --- Files --------------------------------------------------------
TARFILE_NAME=$(TARGET)
TARFILE_NAME=core
TARFILE_ROOTDIR=$(TARGET)
TARFILE_ROOTDIR=core
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)!= ""
......@@ -77,4 +79,3 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
.ENDIF
jfreereport/java/libfonts/makefile.mk
Dosyayı görüntüle @ 4e585a0f
......@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.3 $
# $Revision: 1.4 $
#
# last change: $Author: hr $ $Date: 2007-08-03 10:11:49 $
# last change: $Author: ihi $ $Date: 2008-01-14 15:29:19 $
#
# 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=libfonts
VERSION=-0.3.3
# --- 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)!= ""
......
jfreereport/java/libformula/makefile.mk
Dosyayı görüntüle @ 4e585a0f
......@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.3 $
# $Revision: 1.4 $
#
# last change: $Author: hr $ $Date: 2007-08-03 10:12:02 $
# last change: $Author: ihi $ $Date: 2008-01-14 15:29:31 $
#
# 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=libformula
VERSION=-0.1.14
# --- 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)!= ""
......
jfreereport/java/liblayout/makefile.mk
Dosyayı görüntüle @ 4e585a0f
......@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.3 $
# $Revision: 1.4 $
#
# last change: $Author: hr $ $Date: 2007-08-03 10:12:15 $
# last change: $Author: ihi $ $Date: 2008-01-14 15:29:42 $
#
# 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=liblayout
VERSION=-0.2.8
# --- 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)!= ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment