Kaydet (Commit) ef0288de authored tarafından Kurt Zenker's avatar Kurt Zenker

CWS-TOOLING: integrate CWS ause109

...@@ -107,8 +107,8 @@ CFLAGS=-m64 ...@@ -107,8 +107,8 @@ CFLAGS=-m64
.ENDIF .ENDIF
# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto # NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto
CPPFLAGS+:=-I$(SOLARINCDIR)$/external CPPFLAGS+:=-I$(PWD)$/$(INCCOM) -I$(SOLARINCDIR)$/external
LDFLAGS+:=-L$(SOLARLIBDIR) LDFLAGS+:=-L$(PWD)$/$(LB) -L$(SOLARLIBDIR)
.IF "$(SYSBASE)"!="" .IF "$(SYSBASE)"!=""
CPPFLAGS+:=-I$(SYSBASE)$/usr$/include CPPFLAGS+:=-I$(SYSBASE)$/usr$/include
......
...@@ -48,7 +48,8 @@ TARFILE_ROOTDIR=rhino1_5R5 ...@@ -48,7 +48,8 @@ TARFILE_ROOTDIR=rhino1_5R5
ADDITIONAL_FILES= \ ADDITIONAL_FILES= \
toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
PATCH_FILES=rhino1_5R5.patch PATCH_FILES=rhino1_5R5.patch \
rhino1_5R5-find_swing.patch
.IF "$(JAVACISGCJ)"=="yes" .IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME= JAVA_HOME=
......
--- misc/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:46.605524507 +0100
+++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:26.536908810 +0100
@@ -12,6 +12,10 @@
<os family="unix"/>
</and>
</condition>
+ <property environment="solenv"/>
+ <condition property="swing_zip" value="${solenv.TARFILE_LOCATION}/swingExSrc.zip" else="../../../../../download/swingExSrc.zip">
+ <isset property="solenv.TARFILE_LOCATION" />
+ </condition>
<path id="macPath" location="${java.home}/../Classes/classes.jar"/>
<!-- rhino.jar from OpenJDK breaks build -->
<path id="nonMacPath">
@@ -38,7 +42,7 @@
<!-- Download source from Sun's site, unzip it, remove
the files we don't need, and change the package
-->
- <unzip src="../../../../../download/swingExSrc.zip" dest="${src.debugger}"/>
+ <unzip src="${swing_zip}" dest="${src.debugger}"/>
<delete file="${src.debugger}/FileSystemModel2.java" />
<delete file="${src.debugger}/MergeSort.java" />
<delete file="${src.debugger}/TreeTableExample2.java" />
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment