diff options
| author | Bernd Eilers <bei@openoffice.org> | 2001-09-25 16:38:16 +0000 |
|---|---|---|
| committer | Bernd Eilers <bei@openoffice.org> | 2001-09-25 16:38:16 +0000 |
| commit | 3aa59c91734832a93b195252ca8f9774743cafb6 (patch) | |
| tree | a5a965f58729ca9a017b9272f28a499b9a7b67a8 /solenv/inc/ant.mk | |
| parent | 2733ece8715a3a5bbb1fb537d22b66e4683fef47 (diff) | |
#80424#
Diffstat (limited to 'solenv/inc/ant.mk')
| -rw-r--r-- | solenv/inc/ant.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk index c197cd15df8d..eab1299a46a1 100644 --- a/solenv/inc/ant.mk +++ b/solenv/inc/ant.mk @@ -10,18 +10,20 @@ J2EE_HOME=$(SOLARROOT)$/j2sdkee1.2 # --- ANT build environment --------------------------------------- +ANT_HOME=$(SOLARBINDIR) + .IF "$(ANT_OPTIONAL)" =="" -ANT_OPTIONAL=$(SOLARBINDIR)$/jakarta-ant-1.3-optional.jar +ANT_OPTIONAL=$(SOLARBINDIR)$/jakarta-ant-1.4-optional.jar .ENDIF .IF "$(ANT_CLASSPATH)"=="" -ANT_CLASSPATH:=$(SOLARBINDIR)$/ant.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$/$(SOLARBINDIR)$/xerces.jar$(PATH_SEPERATOR)$(ANT_OPTIONAL) +ANT_CLASSPATH:=$(SOLARBINDIR)$/xerces.jar$(PATH_SEPERATOR)$/$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$/$(SOLARBINDIR)$/ant.jar$(PATH_SEPERATOR)$(ANT_OPTIONAL)$(PATH_SEPERATOR)$/$(SOLARBINDIR)$/junit.jar .IF "$(ANTPRJ_BOOTSTRAP)"=="" ANT_CLASSPATH!:=$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/antprj.jar .ENDIF .ENDIF -ANT=java -Xmx1024m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) +ANT=java -Xmx1024m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME) -Dant.home=$(ANT_HOME) .IF "$(ANT_BUILDFILE)"=="" ANT_BUILDFILE=build.xml @@ -44,9 +46,9 @@ ANT_OPT=on .ENDIF .IF "$(wdkbuild)"=="" -ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext=$(PROEXT) -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -f $(ANT_BUILDFILE) $(ANT_FLAGS) +ANT_FLAGS!:=-Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext=$(PROEXT) -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs .ELSE -ANT_FLAGS!:=-f $(ANT_BUILDFILE) -Dwdk.build=$(wdkbuild) $(ANT_FLAGS) +ANT_FLAGS!:=-f $(ANT_BUILDFILE) -Dwdk.build=$(wdkbuild) $(ANT_FLAGS) -emacs -v .ENDIF .INCLUDE : target.mk |