diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-11 10:26:49 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-11 10:26:49 +0300 |
| commit | 96e11b28ca34674b463d848f47b957d66c173bc5 (patch) | |
| tree | 489de3f8c0201704d53feb686ffa12c195b029db /rhino | |
| parent | 80cea83517437d5c852487809a14ef8b88a8232d (diff) | |
Fix rhino build on Windows
Diffstat (limited to 'rhino')
| -rwxr-xr-x | rhino/makefile.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 094e1102ad2f..d7888fc970be 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -49,12 +49,18 @@ PATCH_FILES=rhino1_5R5.patch \ rhino1_5R5-find_swing.patch \ rhino1_5R5-updateToolTip.patch +.IF "$(OS)"=="WNT" +FIXED_TARFILE_LOCATION=`cygpath -m -s "$(TARFILE_LOCATION)"` +.ELSE +FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION) +.ENDIF + .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)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar +BUILD_ACTION=TARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" $(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar .ENDIF # --- Targets ------------------------------------------------------ |