diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-04 14:22:44 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-04 14:22:44 +0000 |
| commit | f15f8668dcdf051afd85c1c8ef43263f3113273a (patch) | |
| tree | 79fa758cd2dadef53d3af6160541b7aecf610a6c /rhino | |
| parent | c00a814a75f9985559d4b5b043de1ac09d57f3de (diff) | |
INTEGRATION: CWS rhino15r5 (1.7.28); FILE MERGED
2007/11/30 16:59:12 cmc 1.7.28.1: #i84133# move to final rhino 1.5 release
Diffstat (limited to 'rhino')
| -rwxr-xr-x | rhino/makefile.mk | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 26587c61fb50..45e90ce0c48d 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2005-09-08 13:15:44 $ +# last change: $Author: obo $ $Date: 2008-01-04 15:22:44 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,20 +45,21 @@ TARGET=ooo_rhino # --- Files -------------------------------------------------------- -TARFILE_NAME=rhino15R4 -TARFILE_ROOTDIR=rhino1_5R4 +TARFILE_NAME=rhino1_5R5 +TARFILE_ROOTDIR=rhino1_5R5 -ADDITIONAL_FILES=makefile.mk \ - toolsrc/org/mozilla/javascript/tools/debugger/AbstractCellEditor.java \ - toolsrc/org/mozilla/javascript/tools/debugger/AbstractTreeTableModel.java \ - toolsrc/org/mozilla/javascript/tools/debugger/JTreeTable.java \ - toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java \ - toolsrc/org/mozilla/javascript/tools/debugger/TreeTableModelAdapter.java \ - toolsrc/org/mozilla/javascript/tools/debugger/TreeTableModel.java +ADDITIONAL_FILES= \ + toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java -PATCH_FILE_NAME=rhino1_5R4.patch +PATCH_FILE_NAME=rhino1_5R5.patch -BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) +.IF "$(JAVACISGCJ)"=="yes" +JAVA_HOME= +.EXPORT : JAVA_HOME +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar +.ELSE +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" jar +.ENDIF # --- Targets ------------------------------------------------------ |