diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 09:56:53 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 09:56:53 +0000 |
| commit | 2a82580d242d35dca07d4c612264a8cdcb051e18 (patch) | |
| tree | 82cbfb4fac8ee4eef3f3ed9a245532ec3f314ddd | |
| parent | f57a2ba14e63d83c197da158234035ea5dd4a7b0 (diff) | |
INTEGRATION: CWS socs02 (1.4.164); FILE MERGED
2007/01/10 14:26:43 kso 1.4.164.1: #144483# - pass mws, minor and build id over to ant
| -rw-r--r-- | solenv/inc/antsettings.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk index f934560fac37..8453651ef5b9 100644 --- a/solenv/inc/antsettings.mk +++ b/solenv/inc/antsettings.mk @@ -4,9 +4,9 @@ # # $RCSfile: antsettings.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: hr $ $Date: 2006-08-14 16:19:10 $ +# last change: $Author: obo $ $Date: 2007-01-25 10:56:53 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -74,13 +74,15 @@ ANT_FLAGS!:=-Dbuild.compiler=gcj -Dprj=$(PRJ) -Dprjname=$(PRJNAME) -Ddebug=$(ANT -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on -Dout=$(OUT) -Dinpath=$(INPATH) \ -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) -Dsolar.jar=$(SOLARBINDIR) \ -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \ - -Dcommon.doc=$(SOLARCOMMONDOCDIR) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs + -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \ + -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs .ELSE 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) \ -Dcommon.jar=$(SOLARCOMMONBINDIR) -Dcommon.doc=$(SOLARCOMMONDOCDIR) \ - -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs + -Dsolar.sourceversion=$(SOURCEVERSION) -Dsolar.lastminor=$(LAST_MINOR) \ + -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs .ENDIF .ELSE # No java ANT= |