diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 17:47:03 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 17:47:03 +0000 |
commit | 7ed8c6f71dba6010d49c088723f021ea889c64c5 (patch) | |
tree | 7c048bc1918dd80783d2d7223611c563238e9d96 | |
parent | df3e716b3c4313d9c495c64aa7d84082fb9596e7 (diff) |
CWS-TOOLING: integrate CWS configuretoplevel
2009-01-19 15:47:39 +0100 rene r266508 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@266428 (milestone: DEV300:m39)
2009-01-18 00:35:31 +0100 rene r266462 : #i10000# Mac OS X "of course" has other paths...
2009-01-16 13:24:23 +0100 rene r266415 : make OS2 use STLport...
2009-01-15 22:08:38 +0100 rene r266393 : STLport for FreeBSD
2009-01-15 01:23:51 +0100 rene r266333 : #i98048# harmonize STL default; default to *NOT* use STLport
2009-01-09 22:44:43 +0100 rene r266120 : #i97428# try to find out XLIB via pkg-config
2009-01-09 22:41:18 +0100 rene r266119 : #i97827# fail when we don't find make
2008-12-27 01:19:34 +0100 rene r265812 : add make (dis)clean; force /bin/sh as we source *Enc.Set.sh
2008-12-27 01:16:31 +0100 rene r265811 : fix makefile.rc for config.*/config_office move
2008-12-26 22:37:54 +0100 rene r265810 : #i91641# in some cases, we also need the -Xbootclasspath at the second javac call
2008-12-26 17:55:11 +0100 rene r265806 : actually commit Makefile.in
2008-12-25 19:24:24 +0100 rene r265803 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@265758 (milestone: DEV300:m38)
2008-12-10 22:51:06 +0100 rene r265232 : #i96912# revert, cws swffixes02 has the right fix
2008-12-08 18:47:10 +0100 rene r265014 : xulrunner has no /plugin or /nspr
2008-12-08 17:51:28 +0100 rene r265013 : i96912# fix --with-system-mozilla
2008-12-05 13:05:55 +0100 rene r264903 : #i95339#
2008-12-04 17:53:53 +0100 rene r264865 : fix merge error
#i80238# add help for --with-epm
2008-12-04 17:44:28 +0100 rene r264864 : #i91641# fix build with JDKs already including a version of rhino which conflicts with our ancient one
2008-12-04 17:40:48 +0100 rene r264863 : i93429# check for sanity for expand.exe
2008-12-04 17:34:20 +0100 rene r264862 : config_office changes from m33 to m37
2008-12-04 17:28:55 +0100 rene r264861 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@264807 (milestone: DEV300:m37)
2008-12-04 16:49:03 +0100 rene r264856 : fix cws. part 5
2008-12-04 16:45:06 +0100 rene r264855 : fix cws, part 4
2008-12-04 16:01:49 +0100 rene r264850 : fix cws, part 3
2008-12-04 15:14:12 +0100 rene r264848 : fix cws, part 2
-rwxr-xr-x | scripting/java/build.xml | 23 | ||||
-rw-r--r-- | xmlhelp/source/com/sun/star/help/makefile.mk | 10 |
2 files changed, 32 insertions, 1 deletions
diff --git a/scripting/java/build.xml b/scripting/java/build.xml index adf4b872c4d4..02975b2d4e7f 100755 --- a/scripting/java/build.xml +++ b/scripting/java/build.xml @@ -75,6 +75,24 @@ <pathelement path="${netbeans.install.path}/modules/ext/nb-editor.jar"/> </path> + <condition property="boot_refID" value="macPath" else="nonMacPath"> + <and> + <os family="mac"/> + <os family="unix"/> + </and> + </condition> + <path id="macPath" location="${java.home}/../Classes/classes.jar"/> + <!-- rhino.jar from OpenJDK breaks build --> + <path id="nonMacPath"> + <fileset dir="${java.home}/"> + <include name="jre/lib/*.jar"/> + <include name="lib/*.jar"/> + <exclude name="jre/lib/rhino.jar"/> + <exclude name="lib/rhino.jar"/> + </fileset> + </path> + <path id="my.bootstrap.classpath" refID="${boot_refID}"/> + <!-- ===================== Prepare Directories ========================= --> <target name="prepare"> <mkdir dir="${jardir}"/> @@ -84,10 +102,13 @@ <target name="compile" depends="prepare"> <javac srcdir="com" destdir="${jardir}" includes="**/*.java" classpathref="idlclasspath" - debug="${debug}" optimize="${optimize}" deprecation="off"/> + debug="${debug}" optimize="${optimize}" deprecation="off"> + <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/> + </javac> <javac srcdir="Framework/" destdir="${jardir}" includes="**/*.java" classpathref="idlclasspath" debug="${debug}" optimize="${optimize}" deprecation="off"> + <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/> </javac> </target> diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index 373e8f6c67dc..730121fd7168 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -104,6 +104,7 @@ JAVACLASSFILES = \ JARFILES = ridl.jar jurt.jar unoil.jar juh.jar .IF "$(SYSTEM_LUCENE)" == "YES" XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR) +COMP=fix_system_lucene .ELSE JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar .ENDIF @@ -116,3 +117,12 @@ CUSTOMMANIFESTFILE = MANIFEST.MF # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + +.IF "$(JARTARGETN)"!="" +$(JARTARGETN) : $(COMP) +.ENDIF + +fix_system_lucene: + @echo "Fix Java Class-Path entry for Lucene libraries from system." + @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \ + -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF |