From fb0ea6b88c4dd31944d664a1231ccdd3af2cdc7a Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Mon, 27 Aug 2001 14:16:18 +0000
Subject: [PATCH] #80424# targets and settings for ant builds

---
 solenv/inc/ant.mk         | 101 ++++++++++++++++++++++++++++++++++++++
 solenv/inc/ant.properties |  12 +++++
 solenv/inc/settings.mk    |   5 +-
 3 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 solenv/inc/ant.mk
 create mode 100644 solenv/inc/ant.properties

diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
new file mode 100644
index 000000000000..a036702b5b5d
--- /dev/null
+++ b/solenv/inc/ant.mk
@@ -0,0 +1,101 @@
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+
+.IF "$(J2EE_HOME)"==""
+J2EE_HOME=$(SOLARROOT)$/j2sdkee1.2
+.ENDIF
+
+# --- ANT build environment  ---------------------------------------
+
+.IF "$(ANT_CLASSPATH)" ==""
+ANT_CLASSPATH:=$(SOLARBINDIR)$/ant.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$/$(SOLARBINDIR)$/xerces.jar
+.ENDIF
+
+ANT=java -Xmx1024m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME)
+
+.IF "$(ANT_BUILDFILE)"==""
+ANT_BUILDFILE=build.xml
+.ENDIF
+
+.IF "$(ANT_DEBUG)"==""
+.IF "$(debug)"==""
+ANT_DEBUG=off
+.ELSE
+ANT_DEBUG=on
+.ENDIF
+.ENDIF
+
+.IF "$(ANT_OPT)"==""
+.IF "$(optimize)"==""
+ANT_OPT=off
+.ELSE
+ANT_OPT=on
+.ENDIF
+.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)
+.ELSE
+ANT_FLAGS!:=-f $(ANT_BUILDFILE) -Dwdk.build=$(wdkbuild) $(ANT_FLAGS)
+.ENDIF
+
+.INCLUDE : target.mk
+
+CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA_HOME)$/lib$/tools.jar
+.EXPORT : CLASSPATH
+
+# --- TARGETS -----------------------------------------------------
+
+#$(CLASSDIR)$/solar.properties .PHONY:
+$(CLASSDIR)$/solar.properties : $(SOLARENV)$/inc/minor.mk $(SOLARENV)$/inc/ant.properties
+    @echo Making: $@
+.IF "$(GUI)"=="UNX"
+    @+echo solar.build="$(BUILD)" > $@
+    @+echo solar.rscversion="$(RSCVERSION)" >> $@
+    @+echo solar.rscrevision="$(RSCREVISION)" >> $@
+    @+echo solar.minor="$(LAST_MINOR)" >> $@
+    @+echo solar.sourceversion="$(SOURCEVERSION)" >> $@
+    @+echo solar.udkstamp="$(UDKSTAMP)" >> $@
+    @+echo solar.extstamp="$(EXTSTAMP)" >> $@
+.ELSE
+    @+echo solar.build=$(BUILD) > $@
+    @+echo solar.rscversion=$(RSCVERSION) >> $@
+    @+echo solar.rscrevision=$(RSCREVISION) >> $@
+    @+echo solar.minor=$(LAST_MINOR) >> $@
+    @+echo solar.sourceversion=$(SOURCEVERSION) >> $@
+    @+echo solar.udkstamp=$(UDKSTAMP) >> $@
+    @+echo solar.extstamp=$(EXTSTAMP) >> $@
+.ENDIF
+    @+cat $(DMAKEROOT)$/../ant.properties >> $@
+
+ANTBUILD .PHONY:
+    $(ANT) $(ANT_FLAGS)
+
+clean  .PHONY:
+    $(ANT) $(ANT_FLAGS) $@
+
+prepare .PHONY:
+    $(ANT) $(ANT_FLAGS) $@
+
+main:
+    $(ANT) $(ANT_FLAGS) $@
+
+info:
+    $(ANT) $(ANT_FLAGS) $@
+
+jar .PHONY:
+    $(ANT) $(ANT_FLAGS) $@
+
+javadoc .PHONY:
+    $(ANT) $(ANT_FLAGS) $@
+
+compile .PHONY:
+    $(ANT) $(ANTFLAGS) $@
+
+test:
+    $(ANT) $(ANT_FLAGS) $@
+
+
diff --git a/solenv/inc/ant.properties b/solenv/inc/ant.properties
new file mode 100644
index 000000000000..8a4bb1598224
--- /dev/null
+++ b/solenv/inc/ant.properties
@@ -0,0 +1,12 @@
+solar.jar=${solar.bin}
+build.bin=${build.dir}/bin
+build.class=${build.dir}/class
+build.inc=${build.dir}/inc
+build.lib=${build.dir}/lib
+build.misc=${build.dir}/misc
+build.obj=${build.dir}/obj
+build.res=${build.dir}/res
+build.slb=${build.dir}/slb
+build.slo=${build.dir}/slo
+build.srs=${build.dir}/srs
+
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 106367fc2bdf..4e9ad0b3e104 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: settings.mk,v $
 #
-#   $Revision: 1.62 $
+#   $Revision: 1.63 $
 #
-#   last change: $Author: pl $ $Date: 2001-08-27 09:51:35 $
+#   last change: $Author: hjs $ $Date: 2001-08-27 15:16:18 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -922,6 +922,7 @@ SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(EXT_UPDMINOR)
 SOLARUCRDIR=$(SOLARVERSION)$/$(INPATH)$/ucr$(EXT_UPDMINOR)
 SOLARPARDIR=$(SOLARVERSION)$/$(INPATH)$/par$(EXT_UPDMINOR)
 SOLARXMLDIR=$(SOLARVERSION)$/$(INPATH)$/xml$(EXT_UPDMINOR)
+SOLARDOCDIR=$(SOLARVERSION)$/$(INPATH)$/doc$(EXT_UPDMINOR)
 
 # Full-Debug Pfade
 .IF "$(debug)" != ""