strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge with DEV300m65

Browse source
This commit is contained in:
Philipp Lohmann [pl] 2009-11-25 17:29:52 +01:00
commit b17875df16
4 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icc/makefile.mk
View file

@ -54,7 +54,7 @@ CONVERTFILES= \
Contrib$/ICC_utils$/Stubs.h \
Contrib$/ICC_utils$/Vetters.cpp
CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip
CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip
BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
# --- Targets ------------------------------------------------------

4
redland/redland/makefile.mk
View file

@ -107,8 +107,8 @@ CFLAGS=-m64
.ENDIF
# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto
CPPFLAGS+:=-I$(SOLARINCDIR)$/external
LDFLAGS+:=-L$(SOLARLIBDIR)
CPPFLAGS+:=-I$(PWD)$/$(INCCOM) -I$(SOLARINCDIR)$/external
LDFLAGS+:=-L$(PWD)$/$(LB) -L$(SOLARLIBDIR)
.IF "$(SYSBASE)"!=""
CPPFLAGS+:=-I$(SYSBASE)$/usr$/include

3
rhino/makefile.mk
View file

@ -48,7 +48,8 @@ TARFILE_ROOTDIR=rhino1_5R5
ADDITIONAL_FILES= \
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"
JAVA_HOME=

22
rhino/rhino1_5R5-find_swing.patch Normal file
View file

@ -0,0 +1,22 @@
--- 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" />