Attachment #33684 for issue #52974

View | Details | Raw Unified | Return to issue 52974
Collapse All | Expand All

Lines 39-44 Link Here

(-)openoffice.org.orig/beanshell/makefile.mk (+7 lines)
39	TARGET=ooo_beanshell	39	TARGET=ooo_beanshell
40		40
41	.IF "$(SOLAR_JAVA)"!=""	41	.IF "$(SOLAR_JAVA)"!=""
		42
		43	.IF "$(SYSTEM_BSH)" == "YES"
		44	all:
		45	@echo "An already available installation of beanshell should exist on your system."
		46	@echo "Therefore the version provided here does not need to be built in addition."
		47	.ENDIF
		48
42	# --- Settings -----------------------------------------------------	49	# --- Settings -----------------------------------------------------
43		50
44	.INCLUDE : settings.mk	51	.INCLUDE : settings.mk

Lines 1-3 Link Here

(-)openoffice.org.orig/beanshell/prj/build.lst (-1 / +1 lines)
1	be beanshell : solenv xalan NULL	1	be beanshell : solenv XALAN:xalan NULL
2	be beanshell usr1 - all be_mkout NULL	2	be beanshell usr1 - all be_mkout NULL
3	be beanshell nmake - all be_beanshell NULL	3	be beanshell nmake - all be_beanshell NULL




[  --with-db-jar=JARFILE   Specify path to jarfile manually ],
[ DB_JAR="$withval"
])
AC_ARG_WITH(system-hsqldb,
[  --with-system-hsqldb    Use hsqldb already on system
],,)
AC_ARG_WITH(hsqldb-jar,
[  --with-hsqldb-jar=JARFILE   Specify path to jarfile manually ],
[ HSQLDB_JAR="$withval"
])
AC_ARG_WITH(system-beanshell,
[  --with-system-beanshell Use beanshell already on system
],,)
AC_ARG_WITH(beanshell-jar,
[  --with-beanshell-jar=JARFILE   Specify path to jarfile manually ],
[ BSH_JAR="$withval"
])
AC_ARG_WITH(system-xml-apis,
[  --with-system-xml-apis  Use xml-apis already on system
],,)
AC_ARG_WITH(xml-apis-jar,
[  --with-xml-apis-jar=JARFILE   Specify path to jarfile manually ],
[ XML_APIS_JAR="$withval"
])
AC_ARG_WITH(system-xerces,
[  --with-system-xerces    Use xerces already on system
],,)
AC_ARG_WITH(xerces-jar,
[  --with-xerces-jar=JARFILE   Specify path to jarfile manually ],
[ XERCES_JAR="$withval"
])
AC_ARG_WITH(system-xalan,
[  --with-system-xalan     Use xalan already on system
],,)
AC_ARG_WITH(xalan-jar,
[  --with-xalan-jar=JARFILE   Specify path to jarfile manually ],
[ XALAN_JAR="$withval"
])
AC_ARG_WITH(system-sablot,
[  --with-system-sablot    Use sablot already on system
],,)

AC_SUBST(DB_JAR)

dnl ===================================================================
dnl Check for system hsqldb
dnl ===================================================================
AC_MSG_CHECKING([which hsqldb to use])
if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
       test "$with_system_hsqldb" != "no"; then
        AC_MSG_RESULT([external])
        SYSTEM_HSQLDB=YES
        if test -z $HSQLDB_JAR; then
               HSQLDB_JAR=/usr/share/java/hsqldb.jar
        fi
        AC_CHECK_FILE($HSQLDB_JAR, [],
               [AC_MSG_ERROR(hsqldb.jar not found.)], [])
        AC_MSG_CHECKING([whether hsqldb is >= 1.8.0])
        export HSQLDB_JAR
        if $PERL -e 'use Archive::Zip;
            my $file = "$ENV{'HSQLDB_JAR'}";
            my $zip = Archive::Zip->new( $file );
            my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
            if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
               exit 0;
            } else {
               exit 1;
            }'; then
            AC_MSG_RESULT([yes])
         else
            AC_MSG_ERROR([no, hsqldb >= 1.8.0 is needed])
         fi
else
    AC_MSG_RESULT([internal])
    SYSTEM_HSQLDB=NO
    BUILD_TYPE="$BUILD_TYPE HSQLDB"
fi
AC_SUBST(SYSTEM_HSQLDB)
AC_SUBST(HSQLDB_JAR)

dnl ===================================================================
dnl Check for system beanshell
dnl ===================================================================
AC_MSG_CHECKING([which beanshell to use])
if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
       test "$with_system_beanshell" != "no"; then
        AC_MSG_RESULT([external])
        SYSTEM_BSH=YES
        if test -z $BSH_JAR; then
               BSH_JAR=/usr/share/java/bsh.jar
        fi
        AC_CHECK_FILE($BSH_JAR, [],
               [AC_MSG_ERROR(bsh.jar not found.)], [])
else
    AC_MSG_RESULT([internal])
    SYSTEM_BSH=NO
    BUILD_TYPE="$BUILD_TYPE BSH"
fi
AC_SUBST(SYSTEM_BSH)
AC_SUBST(BSH_JAR)

dnl ===================================================================
dnl Check for system xml-apis
dnl ===================================================================
AC_MSG_CHECKING([which xml-apis to use])
if test -n "$with_system_xml_apis" -o -n "$with_system_libs" && \
       test "$with_system_xml_apis" != "no"; then
        AC_MSG_RESULT([external])
        SYSTEM_XML_APIS=YES
        if test -z $XML_APIS_JAR; then
          AC_CHECK_FILE(/usr/share/java/xml-commons-apis.jar, 
            [ XML_APIS_JAR=/usr/share/java/xml-commons-apis.jar ],
            [
              AC_CHECK_FILE(/usr/share/java/xml-apis.jar, 
                [ XML_APIS_JAR=/usr/share/java/xml-apis.jar ],
                [ AC_CHECK_FILE(/usr/share/java/jaxp-1.2.jar,
                    [ XML_APIS_JAR=/usr/share/java/jaxp-1.2.jar ],
                    [ AC_MSG_ERROR(xml-apis.jar replacement not found)]
                  )
                ]
              )
            ]
          )
        else
          AC_CHECK_FILE($XML_APIS_JAR, [],
               [AC_MSG_ERROR(xml-apis.jar replacement not found.)], [])
        fi
else
    AC_MSG_RESULT([internal])
    SYSTEM_XML_APIS=NO
    NEED_XALAN=TRUE
fi
AC_SUBST(SYSTEM_XML_APIS)
AC_SUBST(XML_APIS_JAR)

dnl ===================================================================
dnl Check for system xerces
dnl ===================================================================
AC_MSG_CHECKING([which xerces to use])
if test -n "$with_system_xerces" -o -n "$with_system_libs" && \
       test "$with_system_xerces" != "no"; then
        AC_MSG_RESULT([external])
        SYSTEM_XERCES=YES
        if test -z $XERCES_JAR; then
          AC_CHECK_FILE(/usr/share/java/xerces-j2.jar, 
            [ XERCES_JAR=/usr/share/java/xerces-j2.jar ],
            [
              AC_CHECK_FILE(/usr/share/java/xercesImpl.jar, 
                [ XERCES_JAR=/usr/share/java/xercesImpl.jar ],
                [ AC_MSG_ERROR(xercesImpl.jar replacement not found)]
              )
            ]
          )
        else
          AC_CHECK_FILE($XERCES_JAR, [],
               [AC_MSG_ERROR(xercesImpl.jar replacement not found.)], [])
        fi
else
    AC_MSG_RESULT([internal])
    SYSTEM_XERCES=NO
    NEED_XALAN=TRUE
fi
AC_SUBST(SYSTEM_XERCES)
AC_SUBST(XERCES_JAR)

dnl ===================================================================
dnl Check for system xalan
dnl ===================================================================
AC_MSG_CHECKING([which xalan to use])
if test -n "$with_system_xalan" -o -n "$with_system_libs" && \
       test "$with_system_xalan" != "no"; then
        AC_MSG_RESULT([external])
        SYSTEM_XALAN=YES
        if test -z $XALAN_JAR; then
          AC_CHECK_FILE(/usr/share/java/xalan-j2.jar, 
            [ XALAN_JAR=/usr/share/java/xalan-j2.jar ],
            [
              AC_CHECK_FILE(/usr/share/java/xalan2.jar, 
                [ XALAN_JAR=/usr/share/java/xalan2.jar ],
                [ AC_CHECK_FILE(/usr/share/java/xalan.jar,
                    [ XALAN_JAR=/usr/share/java/xalan.jar ],
                    [ AC_MSG_ERROR(xalan.jar replacement not found)]
                  )
                ]
              )
            ]
          )
        else
          AC_CHECK_FILE($XALAN_JAR, [],
               [AC_MSG_ERROR(xml-apis.jar replacement not found.)], [])
        fi
else
    AC_MSG_RESULT([internal])
    SYSTEM_XALAN=NO
    NEED_XALAN=TRUE
fi
AC_SUBST(SYSTEM_XALAN)
AC_SUBST(XALAN_JAR)

if test -n "$NEED_XALAN"; then
BUILD_TYPE="$BUILD_TYPE XALAN"
fi

dnl ===================================================================
dnl Check for system sablot
dnl ===================================================================
AC_MSG_CHECKING([which sablot to use])

   AC_MSG_RESULT([$with_local_solver])
fi
AC_SUBST(LOCAL_SOLVER)

BUILD_TYPE="$BUILD_TYPE XALAN"

AC_SUBST(BUILD_TYPE)





ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
ToFile( "DB_JAR",            "@DB_JAR@",           "e" );
ToFile( "SYSTEM_HSQLDB",     "@SYSTEM_HSQLDB@",    "e" );
ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
ToFile( "BSH_JAR",           "@BSH_JAR@",          "e" );
ToFile( "SYSTEM_XML_APIS",   "@SYSTEM_XML_APIS@",  "e" );
ToFile( "XML_APIS_JAR",      "@XML_APIS_JAR@",     "e" );
ToFile( "SYSTEM_XERCES",     "@SYSTEM_XERCES@",    "e" );
ToFile( "XERCES_JAR",        "@XERCES_JAR@",       "e" );
ToFile( "SYSTEM_XALAN",      "@SYSTEM_XALAN@",     "e" );
ToFile( "XALAN_JAR",         "@XALAN_JAR@",        "e" );
ToFile( "SYSTEM_SABLOT",     "@SYSTEM_SABLOT@",    "e" );
ToFile( "SABLOT_LIBS",       "@SABLOT_LIBS@",      "e" );
ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );

Lines 43-49 Link Here

(-)openoffice.org.orig/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk (-1 / +6 lines)
43	# --- Files --------------------------------------------------------	43	# --- Files --------------------------------------------------------
44		44
45		45
46	JARFILES = ridl.jar unoil.jar jurt.jar juh.jar hsqldb.jar	46	JARFILES = ridl.jar unoil.jar jurt.jar juh.jar
		47	.IF "$(SYSTEM_HSQLDB)" == "YES"
		48	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
		49	.ELSE
		50	JARFILES+= hsqldb.jar
		51	.ENDIF
47	JAVAFILES =\	52	JAVAFILES =\
48	NativeInputStreamHelper.java\	53	NativeInputStreamHelper.java\
49	NativeOutputStreamHelper.java\	54	NativeOutputStreamHelper.java\

Lines 1-4 Link Here

(-)openoffice.org.orig/connectivity/prj/build.lst (-1 / +1 lines)
1	cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper hsqldb NULL	1	cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper HSQLDB:hsqldb NULL
2	cn connectivity usr1 - all cn_mkout NULL	2	cn connectivity usr1 - all cn_mkout NULL
3	cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb NULL	3	cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb NULL
4	cn connectivity\source\types nmake - all cn_types NULL	4	cn connectivity\source\types nmake - all cn_types NULL

Lines 156-162 Link Here

(-)openoffice.org.orig/filter/source/config/fragments/makefile.mk (-1 / +2 lines)
156	MERGE:=python ../tools/merge/pyAltFCFGMerge	156	MERGE:=python ../tools/merge/pyAltFCFGMerge
157	.ELSE	157	.ELSE
158	MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar	158	MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
159	PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl	159	XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
		160	PACKLANG := $(JAVAI) $(JAVACPS) $(XALAN_JAR) org.apache.xalan.xslt.Process -XSL langfilter.xsl
160	.ENDIF	161	.ENDIF
161		162
162	# -----------------------------------------------------------------------------	163	# -----------------------------------------------------------------------------




                    jurt.jar        \
                    juh.jar         \
                    jut.jar         \
                    java_uno.jar

.IF "$(SYSTEM_XML_APIS)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
.ELSE
JARFILES += xml-apis.jar
.ENDIF

.IF "$(SYSTEM_XERCES)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
.ELSE
JARFILES += xercesImpl.jar
.ENDIF

JAVACLASSFILES  =   \
                    $(CLASSDIR)$/$(PACKAGE)$/AnalyzeStartupLog.class              \





#USE_UDK_EXTENDED_MANIFESTFILE=TRUE
#USE_EXTENDED_MANIFESTFILE=TRUE
JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar

.IF "$(SYSTEM_XALAN)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
.ELSE
JARFILES += xalan.jar
.ENDIF

.IF "$(SYSTEM_XERCES)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
.ELSE
JARFILES += xercesImpl.jar
.ENDIF

.IF "$(SYSTEM_XML_APIS)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
.ELSE
JARFILES += xml-apis.jar
.ENDIF

JAVAFILES		= $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
CUSTOMMANIFESTFILE = Manifest  
#JARMANIFEST = Manifest

#JARDIR=$(CLASSDIR)

JARCOMPRESS		= TRUE  
JARCLASSDIRS	= XSLTFilter*.class XSLTransformer*.class XSLTFilterOLEExtracter*.class




CLASSDIR!:=$(CLASSDIR)$/$(TARGET)
#USE_UDK_EXTENDED_MANIFESTFILE=TRUE
#USE_EXTENDED_MANIFESTFILE=TRUE
JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar crimson.jar

.IF "$(SYSTEM_XALAN)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
.ELSE
JARFILES += xalan.jar
.ENDIF

.IF "$(SYSTEM_XML_APIS)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
.ELSE
JARFILES += xml-apis.jar
.ENDIF

JAVAFILES		= $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
CUSTOMMANIFESTFILE = Manifest  
#JARMANIFEST = Manifest




XML_APIS_JAR*=$(SOLARBINDIR)$/xml-apis.jar
XERCES_JAR*=$(SOLARBINDIR)$/xercesImpl.jar
DB_JAR*=$(SOLARBINDIR)$/db.jar

my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar$(PATH_SEPERATOR)$(DB_JAR)

.IF "$(SYSTEM_DB)" == "YES"
my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR)
.ELSE
my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)$/db.jar
.ENDIF

.INCLUDE : $(INCCOM)$/aux_langs.mk

aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))


Lines 44-49 Link Here

(-)openoffice.org.orig/hsqldb/makefile.mk (+6 lines)
44	.INCLUDE : version.mk	44	.INCLUDE : version.mk
45	.INCLUDE : minor.mk	45	.INCLUDE : minor.mk
46		46
		47	.IF "$(SYSTEM_HSQLDB)" == "YES"
		48	all:
		49	@echo "An already available installation of hsqldb should exist on your system."
		50	@echo "Therefore the version provided here does not need to be built in addition."
		51	.ENDIF
		52
47	.IF "$(SOLAR_JAVA)" != ""	53	.IF "$(SOLAR_JAVA)" != ""
48	# --- Files --------------------------------------------------------	54	# --- Files --------------------------------------------------------
49		55

Lines 70-76 Link Here

(-)openoffice.org.orig/readlicense_oo/util/makefile.pmk (-2 / +2 lines)
70	$(MISC)$/readme%.html :	70	$(MISC)$/readme%.html :
71	@+-$(MKDIR) $(@:d)	71	@+-$(MKDIR) $(@:d)
72	.IF "$(XSLTPROC)"=="NO_XSLTPROC"	72	.IF "$(XSLTPROC)"=="NO_XSLTPROC"
73	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@	73	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
74	.ELSE	74	.ELSE
75	sed 's\|xmlns:xt="http://www.jclark.com/xt"\|\|;s\|extension-element-prefixes="xt"\|\|;s\|.xt:document.\|\|;s\|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />\|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />\|' < ..$/readme.xsl \| xsltproc -o $@ \	75	sed 's\|xmlns:xt="http://www.jclark.com/xt"\|\|;s\|extension-element-prefixes="xt"\|\|;s\|.xt:document.\|\|;s\|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />\|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />\|' < ..$/readme.xsl \| xsltproc -o $@ \
76	--stringparam os1 $(OS) \	76	--stringparam os1 $(OS) \
Lines 86-92 Link Here
86	$(MISC)$/readme%.txt :	86	$(MISC)$/readme%.txt :
87	@+-$(MKDIR) $(@:d)	87	@+-$(MKDIR) $(@:d)
88	.IF "$(XSLTPROC)"=="NO_XSLTPROC"	88	.IF "$(XSLTPROC)"=="NO_XSLTPROC"
89	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@	89	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
90	.ELSE	90	.ELSE
91	sed 's\|xmlns:xt="http://www.jclark.com/xt"\|\|;s\|extension-element-prefixes="xt"\|\|;s\|.xt:document.\|\|;s\|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />\|<xsl:output method="text" />\|' < ..$/readme.xsl \| xsltproc -o $@ \	91	sed 's\|xmlns:xt="http://www.jclark.com/xt"\|\|;s\|extension-element-prefixes="xt"\|\|;s\|.xt:document.\|\|;s\|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />\|<xsl:output method="text" />\|' < ..$/readme.xsl \| xsltproc -o $@ \
92	--stringparam os1 $(OS) \	92	--stringparam os1 $(OS) \

Lines 1-3 Link Here

(-)openoffice.org.orig/rhino/prj/build.lst (-1 / +1 lines)
1	xh rhino : soltools xalan NULL	1	xh rhino : soltools XALAN:xalan NULL
2	xh rhino usr1 - all xh_mkout NULL	2	xh rhino usr1 - all xh_mkout NULL
3	xh rhino nmake - all xh_rhino NULL	3	xh rhino nmake - all xh_rhino NULL

Lines 41-46 Link Here

(-)openoffice.org.orig/sandbox/util/makefile.mk (+5 lines)
41		41
42	.INCLUDE : settings.mk	42	.INCLUDE : settings.mk
43		43
		44	.IF "$(JDK)" == "gcj"
		45	all:
		46	@echo sandbox cannot be build with gcj because of sun.applet.AppletAudioClip
		47	.ELSE
44	JARCLASSDIRS = com$/sun$/star$/lib$/sandbox	48	JARCLASSDIRS = com$/sun$/star$/lib$/sandbox
45	JARTARGET = sandbox.jar	49	JARTARGET = sandbox.jar
46	JARCOMPRESS = TRUE	50	JARCOMPRESS = TRUE
Lines 56-58 Link Here
56	# --- Targets ------------------------------------------------------	60	# --- Targets ------------------------------------------------------
57		61
58	.INCLUDE : target.mk	62	.INCLUDE : target.mk
		63	.ENDIF




#endif

#ifdef SOLAR_JAVA
#ifndef SYSTEM_BSH
STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
#endif
#endif

#ifdef SOLAR_JAVA

#endif

#ifdef SOLAR_JAVA
#ifndef SYSTEM_HSQLDB
STD_JAR_FILE_PATCH( gid_File_Jar_Hsqldb, hsqldb )
#endif
STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
#endif


#endif

#ifdef SOLAR_JAVA
#ifndef GCJ
File gid_File_Jar_Sandbox
    TXT_FILE_BODY;
    Name = JARFILENAME(sandbox);
    Dir = gid_Dir_Classes;
    Styles = (PACKED,PATCH);
End
#endif
#endif

#ifdef SOLAR_JAVA

#endif

#ifdef SOLAR_JAVA

STD_JAR_FILE( gid_File_Jar_Xt, xt )

#ifndef SYSTEM_XALAN
STD_JAR_FILE( gid_File_Jar_Xalan, xalan )
#endif
#ifndef SYSTEM_XERCES
STD_JAR_FILE( gid_File_Jar_XercesImpl, xercesImpl )
#endif
#ifndef SYSTEM_XML_APIS
STD_JAR_FILE( gid_File_Jar_Xml_Apis, xml-apis )
#endif

#endif

File gid_File_Mod_Chart




SCPDEFS+=-DSYSTEM_HUNSPELL
.ENDIF

.IF "$(SYSTEM_BSH)" == "YES"
SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
.ENDIF

.IF "$(SYSTEM_HSQLDB)" == "YES" 
SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
.ENDIF 

.IF "$(SYSTEM_XML_APIS)" == "YES" 
SCPDEFS+=-DSYSTEM_XML_APIS
.ENDIF

.IF "$(SYSTEM_XERCES)" == "YES" 
SCPDEFS+=-DSYSTEM_XERCES
.ENDIF

.IF "$(SYSTEM_XALAN)" == "YES" 
SCPDEFS+=-DSYSTEM_XALAN
.ENDIF

.IF "$(JDK)" == "gcj"
SCPDEFS+=-DGCJ
.ENDIF

SCPDEFS+=\




    Section = "Bootstrap";
    Order = 7;
    Key = "UNO_JAVA_JFW_CLASSPATH_URLS";
    Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH}";
    ValueList1  = "${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}";
    ValueList2  = "$ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar";
    ValueList3  = "$ORIGIN/classes/java_uno.jar";
#ifndef GCJ
    ValueList4  = "$ORIGIN/classes/sandbox.jar";
#endif
#ifdef SYSTEM_BSH
    ValueList5  = BSH_JAR;
#else
    ValueList6  = "$ORIGIN/classes/bsh.jar";
#endif
    ValueList7  = "$ORIGIN/classes/classes.jar";
    ValueList8  = "$ORIGIN/classes/commonwizards.jar";
    ValueList9  = "$ORIGIN/classes/htmlsoff.jar";
    ValueList10  = "$ORIGIN/classes/java_uno_accessbridge.jar";
    ValueList11 = "$ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar";
    ValueList12 = "$ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar";
    ValueList13 = "$ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar";
    ValueList14 = "$ORIGIN/classes/report.jar";
    ValueList15 = "$ORIGIN/classes/ScriptFramework.jar";
    ValueList16 = "$ORIGIN/classes/ScriptProviderForBeanShell.jar";
    ValueList17 = "$ORIGIN/classes/ScriptProviderForJava.jar";
    ValueList18 = "$ORIGIN/classes/ScriptProviderForJavaScript.jar";
    ValueList10 = "$ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar";
    ValueList20 = "$ORIGIN/classes/web.jar $ORIGIN/classes/xmerge.jar";
    ValueList21 = "$ORIGIN/classes/XMergeBridge.jar";
    ValueList22 = "$ORIGIN/classes/XSLTFilter.jar";
    ValueList23 = "$ORIGIN/classes/XSLTValidate.jar";
    ValueList24 = "$ORIGIN/classes/xt.jar";
    ValueList25 = "$ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar";
    ValueList26 = "$ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar";
    ValueList27 = "$ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar";
    ValueList28 = "$ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar";
    ValueList29 = "$ORIGIN/classes/mail.jar";
#ifdef SYSTEM_HSQLDB
    ValueList30 = HSQLDB_JAR;
#else
    ValueList31 = "$ORIGIN/classes/hsqldb.jar";
#endif
    ValueList32 = "$ORIGIN/classes/sdbc_hsqldb.jar";
End


Lines 50-55 Link Here

(-)openoffice.org.orig/scripting/java/build.xml (-1 / +4 lines)
50	Not needed in default build -->	50	Not needed in default build -->
51	<property name="netbeans.install.path" value="/export/home/netbeans"/>	51	<property name="netbeans.install.path" value="/export/home/netbeans"/>
52		52
		53	<property environment="env"/>
		54	<property name="env.BSH_JAR" value="${solar.jar}/bsh.jar"/>
		55
53	<!-- ==================== classpath setting ============================ -->	56	<!-- ==================== classpath setting ============================ -->
54	<path id="idlclasspath">	57	<path id="idlclasspath">
55	<pathelement location="${solar.jar}/jurt.jar"/>	58	<pathelement location="${solar.jar}/jurt.jar"/>
Lines 58-64 Link Here
58	<pathelement location="${solar.jar}/juh.jar"/>	61	<pathelement location="${solar.jar}/juh.jar"/>
59	<pathelement location="${solar.jar}/java_uno.jar"/>	62	<pathelement location="${solar.jar}/java_uno.jar"/>
60	<pathelement location="${solar.jar}/ridl.jar"/>	63	<pathelement location="${solar.jar}/ridl.jar"/>
61	<pathelement location="${solar.jar}/bsh.jar"/>	64	<pathelement location="${env.BSH_JAR}"/>
62	<pathelement location="${solar.jar}/js.jar"/>	65	<pathelement location="${solar.jar}/js.jar"/>
63	<pathelement location="${jardir}"/>	66	<pathelement location="${jardir}"/>
64	</path>	67	</path>

Lines 1-4 Link Here

(-)openoffice.org.orig/scripting/prj/build.lst (-1 / +1 lines)
1	tc scripting : bridges rdbmaker vcl xmlscript basic sfx2 rhino beanshell javaunohelper NULL	1	tc scripting : bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
2	tc scripting usr1 - all tc_mkout NULL	2	tc scripting usr1 - all tc_mkout NULL
3	tc scripting\source\provider nmake - all tc_scriptingprovider NULL	3	tc scripting\source\provider nmake - all tc_scriptingprovider NULL
4	tc scripting\source\basprov nmake - all tc_scriptingbasprov NULL	4	tc scripting\source\basprov nmake - all tc_scriptingbasprov NULL

Lines 108-114 Link Here

(-)openoffice.org.orig/solenv/config/ssrc680.ini (-1 / +1 lines)
108	BIG_SVX TRUE	108	BIG_SVX TRUE
109	BIG_GOODIES TRUE	109	BIG_GOODIES TRUE
110	BMP_WRITES_FLAG TRUE	110	BMP_WRITES_FLAG TRUE
111	BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG	111	BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG
112	RES_ENUS TRUE	112	RES_ENUS TRUE
113	RES_GER TRUE	113	RES_GER TRUE
114	NO_REC_RES TRUE	114	NO_REC_RES TRUE




                $(XSLDIR)$/schema_trim.xsl 
.ENDIF

XML_APIS_JAR*=$(SOLARBINDIR)$/xml-apis.jar
XERCES_JAR*=$(SOLARBINDIR)$/xercesImpl.jar

$(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs
    @+echo -------------+ validating and stripping schema files
	-$(MKDIRHIER) $(@:d)
.IF "$(XSLTPROC)"=="NO_XSLTPROC"
.IF "$(NO_INSPECTION)"==""
	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
.ENDIF			# "$(NO_INSPECTION)"==""
	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$*
	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san 
	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp
	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
.ELSE
# xsltproc already validates against the dtd.  For additional validation,
# org.openoffice.configuration.Inspector should be replaced and the

    @+echo -------------+ creating locale dependent resource bundles
	-$(MKDIRHIER) $(@:d)
.IF "$(XSLTPROC)"=="NO_XSLTPROC"
	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
.ELSE
	$(XSLTPROC) -o $@ \
	            --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \

	-$(MKDIRHIER) $(@:d) 
.IF "$(XSLTPROC)"=="NO_XSLTPROC"
.IF "$(NO_INSPECTION)"==""
	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
.ENDIF			# "$(NO_INSPECTION)"==""
	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
.ELSE
# xsltproc already validates against the dtd.  For additional validation,
# org.openoffice.configuration.Inspector should be replaced and the

    @+echo -------------+ creating locale dependent entries
	-$(MKDIRHIER) $(@:d)
.IF "$(XSLTPROC)"=="NO_XSLTPROC"
	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
.ELSE
	$(XSLTPROC) -o $(@:d)$*.tmp \
	            --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \

    @+echo -------------+ creating a module file
	-$(MKDIRHIER) $(@:d) 
.IF "$(XSLTPROC)"=="NO_XSLTPROC"
	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
.ELSE
	$(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \
	            --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \





CUSTOMMANIFESTFILEDEP:=$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f)

.IF "$(SYSTEM_XML_APIS)" == "YES"
XML_APIS_SUBST=$(XML_APIS_JAR)
.ELSE
XML_APIS_SUBST=xml-apis.jar
.ENDIF

.IF "$(SYSTEM_XERCES)" == "YES"
XERCES_SUBST=$(XERCES_JAR)
.ELSE
XERCES_SUBST=xercesImpl.jar
.ENDIF

.IF "$(SYSTEM_XALAN)" == "YES"
XALAN_SUBST=$(XALAN_JAR)
.ELSE
XALAN_SUBST=xalan.jar
.ENDIF


$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,$/ $(DMAKE_WORK_DIR))$/$(CUSTOMMANIFESTFILE)
	+-$(RM) $@
	+$(TYPE) $< | $(SED) s/xml-apis.jar/$(XML_APIS_SUBST)/g | $(SED) s/xercesImpl.jar/$(XERCES_SUBST)/g | $(SED) s/xalan.jar/$(XALAN_SUBST)/g > $@
	+$(COPY) $< $@
.ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""

$(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)

Lines 187-192 Link Here

(-)openoffice.org.orig/solenv/bin/modules/installer/profiles.pm (+6 lines)
187	my $section = $oneprofileitem->{'Section'};	187	my $section = $oneprofileitem->{'Section'};
188	my $key = $oneprofileitem->{'Key'};	188	my $key = $oneprofileitem->{'Key'};
189	my $value = $oneprofileitem->{'Value'};	189	my $value = $oneprofileitem->{'Value'};
		190	for (my $j = 1; $j <= 50; $j++)
		191	{
		192	my $key = "ValueList" . $j;
		193	if ( $oneprofileitem->{$key} )
		194	{ $value = $value . " " . $oneprofileitem->{$key} }
		195	}
190	my $order = $oneprofileitem->{'Order'}; # ignoring order at the moment	196	my $order = $oneprofileitem->{'Order'}; # ignoring order at the moment
191		197
192	my $line = "[" . $section . "]" . "\n";	198	my $line = "[" . $section . "]" . "\n";




.INCLUDE : settings.mk
#.INCLUDE :  $(PRJ)$/util$/makefile.pmk

JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge 

.IF "$(SYSTEM_XALAN)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
.ELSE
JARFILES += xalan.jar
.ENDIF

.IF "$(SYSTEM_XERCES)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
.ELSE
JARFILES += xercesImpl.jar
.ENDIF

.IF "$(SYSTEM_XML_APIS)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
.ELSE
JARFILES += xml-apis.jar
.ENDIF

JARCLASSDIRS	=                                               \
	com$/sun$/star$/wizards$/common	       	 		\

Line 1 Link Here

(-)openoffice.org.orig/wizards/com/sun/star/wizards/common/MANIFEST.MF (-1 / +1 lines)
1	Class-Path: xalan.jar xercesImp.jar xml-apis.jar	1	Class-Path: xalan.jar xercesImpl.jar xml-apis.jar

Lines 1-2 Link Here

(-)openoffice.org.orig/wizards/com/sun/star/wizards/web/MANIFEST.MF (-1 / +1 lines)
1	RegistrationClassName: com.sun.star.wizards.web.CallWizard	1	RegistrationClassName: com.sun.star.wizards.web.CallWizard
2	Class-Path: xalan.jar xercesImp.jar xml-apis.jar	2	Class-Path: xalan.jar xercesImpl.jar xml-apis.jar





.INCLUDE : settings.mk
#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 

.IF "$(SYSTEM_XALAN)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
.ELSE
JARFILES += xalan.jar
.ENDIF

.IF "$(SYSTEM_XERCES)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
.ELSE
JARFILES += xercesImpl.jar
.ENDIF

.IF "$(SYSTEM_XML_APIS)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
.ELSE
JARFILES += xml-apis.jar
.ENDIF

CUSTOMMANIFESTFILE= MANIFEST.MF

JARCLASSDIRS	= com$/sun$/star$/wizards$/web




.INCLUDE : settings.mk

#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 

.IF "$(SYSTEM_XALAN)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
.ELSE
JARFILES += xalan.jar
.ENDIF

.IF "$(SYSTEM_XERCES)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
.ELSE
JARFILES += xercesImpl.jar
.ENDIF

.IF "$(SYSTEM_XML_APIS)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
.ELSE
JARFILES += xml-apis.jar
.ENDIF

#JARCLASSDIRS	= com$/sun$/star$/wizards$/web
#JARTARGET		= $(TARGET).jar




.INCLUDE : settings.mk

#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 

.IF "$(SYSTEM_XALAN)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
.ELSE
JARFILES += xalan.jar
.ENDIF

.IF "$(SYSTEM_XERCES)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
.ELSE
JARFILES += xercesImpl.jar
.ENDIF

.IF "$(SYSTEM_XML_APIS)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
.ELSE
JARFILES += xml-apis.jar
.ENDIF

#JARCLASSDIRS	= com$/sun$/star$/wizards$/web
#JARTARGET		= $(TARGET).jar

Lines 56-65 Link Here

(-)openoffice.org.orig/xmerge/source/xmerge/build.xml (-4 / +39 lines)
56	<project name="xmerge" default="all" basedir=".">	56	<project name="xmerge" default="all" basedir=".">
57		57
58	<property file="../inc/antbuild.properties"/>	58	<property file="../inc/antbuild.properties"/>
		59
		60	<property environment="env"/>
		61	<property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
		62	<property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
59		63
60	<path id="classpath">	64	<path id="classpath">
61	<pathelement location="${solar.jar}/xml-apis.jar"/>	65	<pathelement location="${env.XML_APIS_JAR}"/>
62	<pathelement location="${solar.jar}/xercesImpl.jar"/>	66	<pathelement location="${env.XERCES_JAR}"/>
63	<pathelement location="${solar.jar}/unoil.jar"/>	67	<pathelement location="${solar.jar}/unoil.jar"/>
64	<pathelement location="${solar.jar}/ridl.jar"/>	68	<pathelement location="${solar.jar}/ridl.jar"/>
65	<pathelement location="${solar.jar}/jurt.jar"/>	69	<pathelement location="${solar.jar}/jurt.jar"/>
Lines 81-89 Link Here
81	<classpath refid="classpath"/>	85	<classpath refid="classpath"/>
82	</javac>	86	</javac>
83	</target>	87	</target>
		88
		89	<target name="makeclasspath_xmlapis">
		90	<condition property="makeclasspath_xmlapis_true">
		91	<equals arg1="${env.SYSTEM_XML_APIS}" arg2="YES" />
		92	</condition>
		93	</target>
		94
		95	<target name="makeclasspath_xmlapis_if" depends="makeclasspath_xmlapis" if="makeclasspath_xmlapis_true">
		96	<property name="xml_apis_manifest" value="${env.XML_APIS_JAR}"/>
		97	</target>
		98
		99	<target name="makeclasspath_xmlapis_else" depends="makeclasspath_xmlapis" unless="makeclasspath_xmlapis_true">
		100	<property name="xml_apis_manifest" value="xml-apis.jar"/>
		101	</target>
		102
		103	<target name="makeclasspath_xerces">
		104	<condition property="makeclasspath_xerces_true">
		105	<equals arg1="${env.SYSTEM_XERCES}" arg2="YES" />
		106	</condition>
		107	</target>
		108
		109	<target name="makeclasspath_xerces_if" depends="makeclasspath_xerces" if="makeclasspath_xerces_true">
		110	<property name="xerces_manifest" value="${env.XERCES_JAR}"/>
		111	</target>
		112
		113	<target name="makeclasspath_xerces_else" depends="makeclasspath_xerces" unless="makeclasspath_xerces_true">
		114	<property name="xerces_manifest" value="xercesImpl.jar"/>
		115	</target>
		116
		117	<target name="makeclasspath"
		118	depends="makeclasspath_xmlapis_if,makeclasspath_xmlapis_else,makeclasspath_xerces_if,makeclasspath_xerces_else"/>
84		119
85	<!-- package to jar -->	120	<!-- package to jar -->
86	<target name="jar" depends="compile">	121	<target name="jar" depends="compile,makeclasspath">
87	<jar destfile="${target.jar}">	122	<jar destfile="${target.jar}">
88	<fileset dir="${target.dir}"	123	<fileset dir="${target.dir}"
89	includes="*/.class" />	124	includes="*/.class" />
Lines 95-101 Link Here
95	<attribute name="Specification-Vendor" value="OpenOffice.org"/>	130	<attribute name="Specification-Vendor" value="OpenOffice.org"/>
96	<attribute name="Specification-Version" value="0.6.0"/>	131	<attribute name="Specification-Version" value="0.6.0"/>
97	<attribute name="Implementation-Version" value="#IMPL-VERSION#"/>	132	<attribute name="Implementation-Version" value="#IMPL-VERSION#"/>
98	<attribute name="Class-Path" value="xml-apis.jar xercesImpl.jar"/>	133	<attribute name="Class-Path" value="${xml_apis_manifest} ${xerces_manifest}"/>
99	</manifest>	134	</manifest>
100	</jar>	135	</jar>
101	</target>	136	</target>

Lines 76-86 Link Here

(-)openoffice.org.orig/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml (-2 / +6 lines)
76	<!-- define how to handle CLASSPATH environment -->	76	<!-- define how to handle CLASSPATH environment -->
77	<property name="build.sysclasspath" value="ignore"/>	77	<property name="build.sysclasspath" value="ignore"/>
78		78
		79	<property environment="env"/>
		80	<property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
		81	<property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
		82
79	<!-- classpath settings for javac tasks -->	83	<!-- classpath settings for javac tasks -->
80	<path id="classpath">	84	<path id="classpath">
81	<pathelement location="${build.class}"/>	85	<pathelement location="${build.class}"/>
82	<pathelement location="${solar.jar}/xml-apis.jar"/>	86	<pathelement location="${env.XML_APIS_JAR}"/>
83	<pathelement location="${solar.jar}/xercesImpl.jar"/>	87	<pathelement location="${env.XERCES_JAR}"/>
84	</path>	88	</path>
85		89
86	<!-- set whether we want to compile with or without deprecation -->	90	<!-- set whether we want to compile with or without deprecation -->

Lines 37-46 Link Here

(-)openoffice.org.orig/xmerge/util/build.xml (-2 / +6 lines)
37	<property file="../source/inc/antbuild.properties"/>	37	<property file="../source/inc/antbuild.properties"/>
38		38
39	<property name="javadoc.dir" location="${build.dir}/javadoc"/>	39	<property name="javadoc.dir" location="${build.dir}/javadoc"/>
		40
		41	<property environment="env"/>
		42	<property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
		43	<property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
40		44
41	<path id="classpath">	45	<path id="classpath">
42	<pathelement location="${solar.jar}/xml-apis.jar"/>	46	<pathelement location="${env.XML_APIS_JAR}"/>
43	<pathelement location="${solar.jar}/xercesImpl.jar"/>	47	<pathelement location="${env.XERCES_JAR}"/>
44	<pathelement location="${solar.jar}/unoil.jar"/>	48	<pathelement location="${solar.jar}/unoil.jar"/>
45	<pathelement location="${solar.jar}/ridl.jar"/>	49	<pathelement location="${solar.jar}/ridl.jar"/>
46	<pathelement location="${solar.jar}/jurt.jar"/>	50	<pathelement location="${solar.jar}/jurt.jar"/>

Lines 57-67 Link Here

(-)openoffice.org.orig/xmerge/workben/build.xml (-2 / +6 lines)
57	<!-- define how to handle CLASSPATH environment -->	57	<!-- define how to handle CLASSPATH environment -->
58	<property name="build.sysclasspath" value="ignore"/>	58	<property name="build.sysclasspath" value="ignore"/>
59		59
		60	<property environment="env"/>
		61	<property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
		62	<property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
		63
60	<!-- classpath settings for javac tasks -->	64	<!-- classpath settings for javac tasks -->
61	<path id="classpath">	65	<path id="classpath">
62	<pathelement location="${build.class}"/>	66	<pathelement location="${build.class}"/>
63	<pathelement location="${solar.jar}/xml-apis.jar"/>	67	<pathelement location="${env.XML_APIS_JAR}"/>
64	<pathelement location="${solar.jar}/xercesImpl.jar"/>	68	<pathelement location="${env.XERCES_JAR}"/>
65	</path>	69	</path>
66		70
67	<!-- set wether we want to compile with or without deprecation -->	71	<!-- set wether we want to compile with or without deprecation -->





.INCLUDE : settings.mk

JARFILES 	= xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar
EXTRAJARFILES 	= 

.IF "$(SYSTEM_XML_APIS)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
.ELSE
JARFILES += xml-apis.jar
.ENDIF

.IF "$(SYSTEM_XERCES)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
.ELSE
JARFILES += xercesImpl.jar
.ENDIF

.IF "$(SYSTEM_DB)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(DB_JAR)
.ELSE
JARFILES += db.jar
.ENDIF

CLASSGENDIR		= $(OUT)$/classgen
RDB	 		= $(SOLARBINDIR)$/types.rdb
JAVAFILES		= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 

# --- Files --------------------------------------------------------





.INCLUDE : settings.mk

JARFILES 		=  xt.jar

.IF "$(SYSTEM_XML_APIS)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
.ELSE
JARFILES += xml-apis.jar
.ENDIF

.IF "$(SYSTEM_XERCES)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
.ELSE
JARFILES += xercesImpl.jar
.ENDIF

JAVAFILES		= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 





        $(JAVA_SRC_DIR)$/jut_src.zip \
        $(JAVA_SRC_DIR)$/juh_src.zip \
        $(JAVA_SRC_DIR)$/ridl_src.zip \
        $(JAVA_SRC_DIR)$/sandbox_src.zip \
        $(JAVA_SRC_DIR)$/unoloader_src.zip

.IF "$(JDK)" != "gcj"
	JAVA_SRC_FILES+=$(JAVA_SRC_DIR)$/sandbox_src.zip
.ENDIF

JAVA_BEAN_SRC_FILES=\
        $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/ContainerFactory.java \

Return to issue 52974

Lines 1766-1771 Link Here

(-)openoffice.org.orig/config_office/set_soenv.in (+10 lines)
1766	ToFile( "DB_VERSION", "@DB_VERSION@", "e" );	1766	ToFile( "DB_VERSION", "@DB_VERSION@", "e" );
1767	ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );	1767	ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
1768	ToFile( "DB_JAR", "@DB_JAR@", "e" );	1768	ToFile( "DB_JAR", "@DB_JAR@", "e" );
		1769	ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" );
		1770	ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" );
		1771	ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" );
		1772	ToFile( "BSH_JAR", "@BSH_JAR@", "e" );
		1773	ToFile( "SYSTEM_XML_APIS", "@SYSTEM_XML_APIS@", "e" );
		1774	ToFile( "XML_APIS_JAR", "@XML_APIS_JAR@", "e" );
		1775	ToFile( "SYSTEM_XERCES", "@SYSTEM_XERCES@", "e" );
		1776	ToFile( "XERCES_JAR", "@XERCES_JAR@", "e" );
		1777	ToFile( "SYSTEM_XALAN", "@SYSTEM_XALAN@", "e" );
		1778	ToFile( "XALAN_JAR", "@XALAN_JAR@", "e" );
1769	ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" );	1779	ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" );
1770	ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" );	1780	ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" );
1771	ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );	1781	ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );

Lines 631-639 Link Here

(-)openoffice.org.orig/scp2/source/ooo/file_ooo.scp (-7 / +10 lines)
631	#endif	631	#endif
632		632
633	#ifdef SOLAR_JAVA	633	#ifdef SOLAR_JAVA
634		634	#ifndef SYSTEM_BSH
635	STD_JAR_FILE( gid_File_Jar_Bsh, bsh )	635	STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
636		636	#endif
637	#endif	637	#endif
638		638
639	#ifdef SOLAR_JAVA	639	#ifdef SOLAR_JAVA
Lines 729-735 Link Here
729	#endif	729	#endif
730		730
731	#ifdef SOLAR_JAVA	731	#ifdef SOLAR_JAVA
		732	#ifndef SYSTEM_HSQLDB
732	STD_JAR_FILE_PATCH( gid_File_Jar_Hsqldb, hsqldb )	733	STD_JAR_FILE_PATCH( gid_File_Jar_Hsqldb, hsqldb )
		734	#endif
733	STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )	735	STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
734	#endif	736	#endif
735		737
Lines 754-767 Link Here
754	#endif	756	#endif
755		757
756	#ifdef SOLAR_JAVA	758	#ifdef SOLAR_JAVA
757		759	#ifndef GCJ
758	File gid_File_Jar_Sandbox	760	File gid_File_Jar_Sandbox
759	TXT_FILE_BODY;	761	TXT_FILE_BODY;
760	Name = JARFILENAME(sandbox);	762	Name = JARFILENAME(sandbox);
761	Dir = gid_Dir_Classes;	763	Dir = gid_Dir_Classes;
762	Styles = (PACKED,PATCH);	764	Styles = (PACKED,PATCH);
763	End	765	End
764		766	#endif
765	#endif	767	#endif
766		768
767	#ifdef SOLAR_JAVA	769	#ifdef SOLAR_JAVA
Lines 783-797 Link Here
783	#endif	785	#endif
784		786
785	#ifdef SOLAR_JAVA	787	#ifdef SOLAR_JAVA
786
787	STD_JAR_FILE( gid_File_Jar_Xt, xt )	788	STD_JAR_FILE( gid_File_Jar_Xt, xt )
788
789	#ifndef SYSTEM_XALAN	789	#ifndef SYSTEM_XALAN
790	STD_JAR_FILE( gid_File_Jar_Xalan, xalan )	790	STD_JAR_FILE( gid_File_Jar_Xalan, xalan )
		791	#endif
		792	#ifndef SYSTEM_XERCES
791	STD_JAR_FILE( gid_File_Jar_XercesImpl, xercesImpl )	793	STD_JAR_FILE( gid_File_Jar_XercesImpl, xercesImpl )
		794	#endif
		795	#ifndef SYSTEM_XML_APIS
792	STD_JAR_FILE( gid_File_Jar_Xml_Apis, xml-apis )	796	STD_JAR_FILE( gid_File_Jar_Xml_Apis, xml-apis )
793	#endif	797	#endif
794
795	#endif	798	#endif
796		799
797	File gid_File_Mod_Chart	800	File gid_File_Mod_Chart

Lines 758-763 Link Here

(-)openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp (-2 / +41 lines)
758	Section = "Bootstrap";	758	Section = "Bootstrap";
759	Order = 7;	759	Order = 7;
760	Key = "UNO_JAVA_JFW_CLASSPATH_URLS";	760	Key = "UNO_JAVA_JFW_CLASSPATH_URLS";
761	Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar $ORIGIN/classes/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";	761	Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH}";
		762	ValueList1 = "${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}";
		763	ValueList2 = "$ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar";
		764	ValueList3 = "$ORIGIN/classes/java_uno.jar";
		765	#ifndef GCJ
		766	ValueList4 = "$ORIGIN/classes/sandbox.jar";
		767	#endif
		768	#ifdef SYSTEM_BSH
		769	ValueList5 = BSH_JAR;
		770	#else
		771	ValueList6 = "$ORIGIN/classes/bsh.jar";
		772	#endif
		773	ValueList7 = "$ORIGIN/classes/classes.jar";
		774	ValueList8 = "$ORIGIN/classes/commonwizards.jar";
		775	ValueList9 = "$ORIGIN/classes/htmlsoff.jar";
		776	ValueList10 = "$ORIGIN/classes/java_uno_accessbridge.jar";
		777	ValueList11 = "$ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar";
		778	ValueList12 = "$ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar";
		779	ValueList13 = "$ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar";
		780	ValueList14 = "$ORIGIN/classes/report.jar";
		781	ValueList15 = "$ORIGIN/classes/ScriptFramework.jar";
		782	ValueList16 = "$ORIGIN/classes/ScriptProviderForBeanShell.jar";
		783	ValueList17 = "$ORIGIN/classes/ScriptProviderForJava.jar";
		784	ValueList18 = "$ORIGIN/classes/ScriptProviderForJavaScript.jar";
		785	ValueList10 = "$ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar";
		786	ValueList20 = "$ORIGIN/classes/web.jar $ORIGIN/classes/xmerge.jar";
		787	ValueList21 = "$ORIGIN/classes/XMergeBridge.jar";
		788	ValueList22 = "$ORIGIN/classes/XSLTFilter.jar";
		789	ValueList23 = "$ORIGIN/classes/XSLTValidate.jar";
		790	ValueList24 = "$ORIGIN/classes/xt.jar";
		791	ValueList25 = "$ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar";
		792	ValueList26 = "$ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar";
		793	ValueList27 = "$ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar";
		794	ValueList28 = "$ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar";
		795	ValueList29 = "$ORIGIN/classes/mail.jar";
		796	#ifdef SYSTEM_HSQLDB
		797	ValueList30 = HSQLDB_JAR;
		798	#else
		799	ValueList31 = "$ORIGIN/classes/hsqldb.jar";
		800	#endif
		801	ValueList32 = "$ORIGIN/classes/sdbc_hsqldb.jar";
762	End	802	End
763

Lines 239-244 Link Here

(-)openoffice.org.orig/config_office/configure.in (-2 / +194 lines)
239	[ --with-db-jar=JARFILE Specify path to jarfile manually ],	239	[ --with-db-jar=JARFILE Specify path to jarfile manually ],
240	[ DB_JAR="$withval"	240	[ DB_JAR="$withval"
241	])	241	])
		242	AC_ARG_WITH(system-hsqldb,
		243	[ --with-system-hsqldb Use hsqldb already on system
		244	],,)
		245	AC_ARG_WITH(hsqldb-jar,
		246	[ --with-hsqldb-jar=JARFILE Specify path to jarfile manually ],
		247	[ HSQLDB_JAR="$withval"
		248	])
		249	AC_ARG_WITH(system-beanshell,
		250	[ --with-system-beanshell Use beanshell already on system
		251	],,)
		252	AC_ARG_WITH(beanshell-jar,
		253	[ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
		254	[ BSH_JAR="$withval"
		255	])
		256	AC_ARG_WITH(system-xml-apis,
		257	[ --with-system-xml-apis Use xml-apis already on system
		258	],,)
		259	AC_ARG_WITH(xml-apis-jar,
		260	[ --with-xml-apis-jar=JARFILE Specify path to jarfile manually ],
		261	[ XML_APIS_JAR="$withval"
		262	])
		263	AC_ARG_WITH(system-xerces,
		264	[ --with-system-xerces Use xerces already on system
		265	],,)
		266	AC_ARG_WITH(xerces-jar,
		267	[ --with-xerces-jar=JARFILE Specify path to jarfile manually ],
		268	[ XERCES_JAR="$withval"
		269	])
		270	AC_ARG_WITH(system-xalan,
		271	[ --with-system-xalan Use xalan already on system
		272	],,)
		273	AC_ARG_WITH(xalan-jar,
		274	[ --with-xalan-jar=JARFILE Specify path to jarfile manually ],
		275	[ XALAN_JAR="$withval"
		276	])
242	AC_ARG_WITH(system-sablot,	277	AC_ARG_WITH(system-sablot,
243	[ --with-system-sablot Use sablot already on system	278	[ --with-system-sablot Use sablot already on system
244	],,)	279	],,)
Lines 2643-2648 Link Here
2643	AC_SUBST(DB_JAR)	2678	AC_SUBST(DB_JAR)
2644		2679
2645	dnl ===================================================================	2680	dnl ===================================================================
		2681	dnl Check for system hsqldb
		2682	dnl ===================================================================
		2683	AC_MSG_CHECKING([which hsqldb to use])
		2684	if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
		2685	test "$with_system_hsqldb" != "no"; then
		2686	AC_MSG_RESULT([external])
		2687	SYSTEM_HSQLDB=YES
		2688	if test -z $HSQLDB_JAR; then
		2689	HSQLDB_JAR=/usr/share/java/hsqldb.jar
		2690	fi
		2691	AC_CHECK_FILE($HSQLDB_JAR, [],
		2692	[AC_MSG_ERROR(hsqldb.jar not found.)], [])
		2693	AC_MSG_CHECKING([whether hsqldb is >= 1.8.0])
		2694	export HSQLDB_JAR
		2695	if $PERL -e 'use Archive::Zip;
		2696	my $file = "$ENV{'HSQLDB_JAR'}";
		2697	my $zip = Archive::Zip->new( $file );
		2698	my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
		2699	if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
		2700	exit 0;
		2701	} else {
		2702	exit 1;
		2703	}'; then
		2704	AC_MSG_RESULT([yes])
		2705	else
		2706	AC_MSG_ERROR([no, hsqldb >= 1.8.0 is needed])
		2707	fi
		2708	else
		2709	AC_MSG_RESULT([internal])
		2710	SYSTEM_HSQLDB=NO
		2711	BUILD_TYPE="$BUILD_TYPE HSQLDB"
		2712	fi
		2713	AC_SUBST(SYSTEM_HSQLDB)
		2714	AC_SUBST(HSQLDB_JAR)
		2715
		2716	dnl ===================================================================
		2717	dnl Check for system beanshell
		2718	dnl ===================================================================
		2719	AC_MSG_CHECKING([which beanshell to use])
		2720	if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
		2721	test "$with_system_beanshell" != "no"; then
		2722	AC_MSG_RESULT([external])
		2723	SYSTEM_BSH=YES
		2724	if test -z $BSH_JAR; then
		2725	BSH_JAR=/usr/share/java/bsh.jar
		2726	fi
		2727	AC_CHECK_FILE($BSH_JAR, [],
		2728	[AC_MSG_ERROR(bsh.jar not found.)], [])
		2729	else
		2730	AC_MSG_RESULT([internal])
		2731	SYSTEM_BSH=NO
		2732	BUILD_TYPE="$BUILD_TYPE BSH"
		2733	fi
		2734	AC_SUBST(SYSTEM_BSH)
		2735	AC_SUBST(BSH_JAR)
		2736
		2737	dnl ===================================================================
		2738	dnl Check for system xml-apis
		2739	dnl ===================================================================
		2740	AC_MSG_CHECKING([which xml-apis to use])
		2741	if test -n "$with_system_xml_apis" -o -n "$with_system_libs" && \
		2742	test "$with_system_xml_apis" != "no"; then
		2743	AC_MSG_RESULT([external])
		2744	SYSTEM_XML_APIS=YES
2745	if test -z $XML_APIS_JAR; then
2746	AC_CHECK_FILE(/usr/share/java/xml-commons-apis.jar,
2747	[ XML_APIS_JAR=/usr/share/java/xml-commons-apis.jar ],
2748	[
2749	AC_CHECK_FILE(/usr/share/java/xml-apis.jar,
2750	[ XML_APIS_JAR=/usr/share/java/xml-apis.jar ],
2751	[ AC_CHECK_FILE(/usr/share/java/jaxp-1.2.jar,
2752	[ XML_APIS_JAR=/usr/share/java/jaxp-1.2.jar ],
2753	[ AC_MSG_ERROR(xml-apis.jar replacement not found)]
2754	)
2755	]
2756	)
2757	]
2758	)
2759	else
2760	AC_CHECK_FILE($XML_APIS_JAR, [],
2761	[AC_MSG_ERROR(xml-apis.jar replacement not found.)], [])
2762	fi
2763	else
2764	AC_MSG_RESULT([internal])
2765	SYSTEM_XML_APIS=NO
2766	NEED_XALAN=TRUE
2767	fi
2768	AC_SUBST(SYSTEM_XML_APIS)
2769	AC_SUBST(XML_APIS_JAR)
2770
2771	dnl ===================================================================
2772	dnl Check for system xerces
2773	dnl ===================================================================
2774	AC_MSG_CHECKING([which xerces to use])
2775	if test -n "$with_system_xerces" -o -n "$with_system_libs" && \
2776	test "$with_system_xerces" != "no"; then
2777	AC_MSG_RESULT([external])
2778	SYSTEM_XERCES=YES
2779	if test -z $XERCES_JAR; then
2780	AC_CHECK_FILE(/usr/share/java/xerces-j2.jar,
2781	[ XERCES_JAR=/usr/share/java/xerces-j2.jar ],
2782	[
2783	AC_CHECK_FILE(/usr/share/java/xercesImpl.jar,
2784	[ XERCES_JAR=/usr/share/java/xercesImpl.jar ],
2785	[ AC_MSG_ERROR(xercesImpl.jar replacement not found)]
2786	)
2787	]
2788	)
2789	else
2790	AC_CHECK_FILE($XERCES_JAR, [],
2791	[AC_MSG_ERROR(xercesImpl.jar replacement not found.)], [])
2792	fi
2793	else
2794	AC_MSG_RESULT([internal])
2795	SYSTEM_XERCES=NO
2796	NEED_XALAN=TRUE
2797	fi
2798	AC_SUBST(SYSTEM_XERCES)
2799	AC_SUBST(XERCES_JAR)
2800
2801	dnl ===================================================================
2802	dnl Check for system xalan
2803	dnl ===================================================================
2804	AC_MSG_CHECKING([which xalan to use])
2805	if test -n "$with_system_xalan" -o -n "$with_system_libs" && \
2806	test "$with_system_xalan" != "no"; then
2807	AC_MSG_RESULT([external])
2808	SYSTEM_XALAN=YES
2809	if test -z $XALAN_JAR; then
2810	AC_CHECK_FILE(/usr/share/java/xalan-j2.jar,
2811	[ XALAN_JAR=/usr/share/java/xalan-j2.jar ],
2812	[
2813	AC_CHECK_FILE(/usr/share/java/xalan2.jar,
2814	[ XALAN_JAR=/usr/share/java/xalan2.jar ],
2815	[ AC_CHECK_FILE(/usr/share/java/xalan.jar,
2816	[ XALAN_JAR=/usr/share/java/xalan.jar ],
2817	[ AC_MSG_ERROR(xalan.jar replacement not found)]
2818	)
2819	]
2820	)
2821	]
2822	)
2823	else
2824	AC_CHECK_FILE($XALAN_JAR, [],
2825	[AC_MSG_ERROR(xml-apis.jar replacement not found.)], [])
2826	fi
2827	else
2828	AC_MSG_RESULT([internal])
2829	SYSTEM_XALAN=NO
2830	NEED_XALAN=TRUE
2831	fi
2832	AC_SUBST(SYSTEM_XALAN)
2833	AC_SUBST(XALAN_JAR)
2834
2835	if test -n "$NEED_XALAN"; then
2836	BUILD_TYPE="$BUILD_TYPE XALAN"
2837	fi
2838
2839	dnl ===================================================================
2646	dnl Check for system sablot	2840	dnl Check for system sablot
2647	dnl ===================================================================	2841	dnl ===================================================================
2648	AC_MSG_CHECKING([which sablot to use])	2842	AC_MSG_CHECKING([which sablot to use])
Lines 4299-4306 Link Here
4299	AC_MSG_RESULT([$with_local_solver])	4493	AC_MSG_RESULT([$with_local_solver])
4300	fi	4494	fi
4301	AC_SUBST(LOCAL_SOLVER)	4495	AC_SUBST(LOCAL_SOLVER)
4302
4303	BUILD_TYPE="$BUILD_TYPE XALAN"
4304		4496
4305	AC_SUBST(BUILD_TYPE)	4497	AC_SUBST(BUILD_TYPE)
4306		4498

Lines 50-58 Link Here

(-)openoffice.org.orig/filter/source/config/tools/utils/makefile.mk (-3 / +13 lines)
50	jurt.jar \	50	jurt.jar \
51	juh.jar \	51	juh.jar \
52	jut.jar \	52	jut.jar \
53	java_uno.jar \	53	java_uno.jar
54	xml-apis.jar \	54
55	xercesImpl.jar	55	.IF "$(SYSTEM_XML_APIS)" == "YES"
		56	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
		57	.ELSE
		58	JARFILES += xml-apis.jar
		59	.ENDIF
		60
		61	.IF "$(SYSTEM_XERCES)" == "YES"
		62	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
		63	.ELSE
		64	JARFILES += xercesImpl.jar
		65	.ENDIF
56		66
57	JAVACLASSFILES = \	67	JAVACLASSFILES = \
58	$(CLASSDIR)$/$(PACKAGE)$/AnalyzeStartupLog.class \	68	$(CLASSDIR)$/$(PACKAGE)$/AnalyzeStartupLog.class \

Lines 70-81 Link Here

(-)openoffice.org.orig/filter/source/xsltfilter/makefile.mk (-4 / +20 lines)
70		70
71	#USE_UDK_EXTENDED_MANIFESTFILE=TRUE	71	#USE_UDK_EXTENDED_MANIFESTFILE=TRUE
72	#USE_EXTENDED_MANIFESTFILE=TRUE	72	#USE_EXTENDED_MANIFESTFILE=TRUE
73	JARFILES = ridl.jar unoil.jar jurt.jar juh.jar xalan.jar xercesImpl.jar xml-apis.jar	73	JARFILES = ridl.jar unoil.jar jurt.jar juh.jar
		74
		75	.IF "$(SYSTEM_XALAN)" == "YES"
		76	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
		77	.ELSE
		78	JARFILES += xalan.jar
		79	.ENDIF
		80
		81	.IF "$(SYSTEM_XERCES)" == "YES"
		82	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
		83	.ELSE
		84	JARFILES += xercesImpl.jar
		85	.ENDIF
		86
		87	.IF "$(SYSTEM_XML_APIS)" == "YES"
		88	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
		89	.ELSE
		90	JARFILES += xml-apis.jar
		91	.ENDIF
		92
74	JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))	93	JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))
75	CUSTOMMANIFESTFILE = Manifest	94	CUSTOMMANIFESTFILE = Manifest
76	#JARMANIFEST = Manifest
77
78	#JARDIR=$(CLASSDIR)
79		95
80	JARCOMPRESS = TRUE	96	JARCOMPRESS = TRUE
81	JARCLASSDIRS = XSLTFilter.class XSLTransformer.class XSLTFilterOLEExtracter*.class	97	JARCLASSDIRS = XSLTFilter.class XSLTransformer.class XSLTFilterOLEExtracter*.class

Lines 44-50 Link Here

(-)openoffice.org.orig/filter/source/xsltvalidate/makefile.mk (-1 / +14 lines)
44	CLASSDIR!:=$(CLASSDIR)$/$(TARGET)	44	CLASSDIR!:=$(CLASSDIR)$/$(TARGET)
45	#USE_UDK_EXTENDED_MANIFESTFILE=TRUE	45	#USE_UDK_EXTENDED_MANIFESTFILE=TRUE
46	#USE_EXTENDED_MANIFESTFILE=TRUE	46	#USE_EXTENDED_MANIFESTFILE=TRUE
47	JARFILES = ridl.jar unoil.jar jurt.jar juh.jar xalan.jar xml-apis.jar crimson.jar	47	JARFILES = ridl.jar unoil.jar jurt.jar juh.jar crimson.jar
		48
		49	.IF "$(SYSTEM_XALAN)" == "YES"
		50	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
		51	.ELSE
		52	JARFILES += xalan.jar
		53	.ENDIF
		54
		55	.IF "$(SYSTEM_XML_APIS)" == "YES"
		56	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
		57	.ELSE
		58	JARFILES += xml-apis.jar
		59	.ENDIF
		60
48	JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))	61	JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))
49	CUSTOMMANIFESTFILE = Manifest	62	CUSTOMMANIFESTFILE = Manifest
50	#JARMANIFEST = Manifest	63	#JARMANIFEST = Manifest

Lines 1-13 Link Here

(-)openoffice.org.orig/helpcontent2/settings.pmk (-8 / +4 lines)
		1	XML_APIS_JAR*=$(SOLARBINDIR)$/xml-apis.jar
		2	XERCES_JAR*=$(SOLARBINDIR)$/xercesImpl.jar
		3	DB_JAR*=$(SOLARBINDIR)$/db.jar
1		4
2	my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar	5	my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar$(PATH_SEPERATOR)$(DB_JAR)
3
4	.IF "$(SYSTEM_DB)" == "YES"
5	my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR)
6	.ELSE
7	my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)$/db.jar
8	.ENDIF
9		6
10	.INCLUDE : $(INCCOM)$/aux_langs.mk	7	.INCLUDE : $(INCCOM)$/aux_langs.mk
11		8
12	aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))	9	aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))
13

Lines 139-146 Link Here

(-)openoffice.org.orig/scp2/source/ooo/makefile.mk (-1 / +21 lines)
139	SCPDEFS+=-DSYSTEM_HUNSPELL	139	SCPDEFS+=-DSYSTEM_HUNSPELL
140	.ENDIF	140	.ENDIF
141		141
142	.IF "$(SYSTEM_XALAN)" == "YES"	142	.IF "$(SYSTEM_BSH)" == "YES"
		143	SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
		144	.ENDIF
		145
		146	.IF "$(SYSTEM_HSQLDB)" == "YES"
		147	SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
		148	.ENDIF
		149
		150	.IF "$(SYSTEM_XML_APIS)" == "YES"
		151	SCPDEFS+=-DSYSTEM_XML_APIS
		152	.ENDIF
		153
		154	.IF "$(SYSTEM_XERCES)" == "YES"
		155	SCPDEFS+=-DSYSTEM_XERCES
		156	.ENDIF
		157
		158	.IF "$(SYSTEM_XALAN)" == "YES"
143	SCPDEFS+=-DSYSTEM_XALAN	159	SCPDEFS+=-DSYSTEM_XALAN
		160	.ENDIF
		161
		162	.IF "$(JDK)" == "gcj"
		163	SCPDEFS+=-DGCJ
144	.ENDIF	164	.ENDIF
145		165
146	SCPDEFS+=\	166	SCPDEFS+=\

Lines 57-73 Link Here

(-)openoffice.org.orig/solenv/inc/tg_config.mk (-14 / +17 lines)
57	$(XSLDIR)$/schema_trim.xsl	57	$(XSLDIR)$/schema_trim.xsl
58	.ENDIF	58	.ENDIF
59		59
		60	XML_APIS_JAR*=$(SOLARBINDIR)$/xml-apis.jar
		61	XERCES_JAR*=$(SOLARBINDIR)$/xercesImpl.jar
		62
60	$(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs	63	$(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs
61	@+echo -------------+ validating and stripping schema files	64	@+echo -------------+ validating and stripping schema files
62	-$(MKDIRHIER) $(@:d)	65	-$(MKDIRHIER) $(@:d)
63	.IF "$(XSLTPROC)"=="NO_XSLTPROC"	66	.IF "$(XSLTPROC)"=="NO_XSLTPROC"
64	.IF "$(NO_INSPECTION)"==""	67	.IF "$(NO_INSPECTION)"==""
65	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<	68	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
66	.ENDIF # "$(NO_INSPECTION)"==""	69	.ENDIF # "$(NO_INSPECTION)"==""
67	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$.val componentName=$(PACKAGE).$	70	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$.val componentName=$(PACKAGE).$
68	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san	71	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san
69	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp	72	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp
70	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@	73	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
71	.ELSE	74	.ELSE
72	# xsltproc already validates against the dtd. For additional validation,	75	# xsltproc already validates against the dtd. For additional validation,
73	# org.openoffice.configuration.Inspector should be replaced and the	76	# org.openoffice.configuration.Inspector should be replaced and the
Lines 101-107 Link Here
101	@+echo -------------+ creating locale dependent resource bundles	104	@+echo -------------+ creating locale dependent resource bundles
102	-$(MKDIRHIER) $(@:d)	105	-$(MKDIRHIER) $(@:d)
103	.IF "$(XSLTPROC)"=="NO_XSLTPROC"	106	.IF "$(XSLTPROC)"=="NO_XSLTPROC"
104	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	107	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
105	.ELSE	108	.ELSE
106	$(XSLTPROC) -o $@ \	109	$(XSLTPROC) -o $@ \
107	--stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \	110	--stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \
Lines 129-139 Link Here
129	-$(MKDIRHIER) $(@:d)	132	-$(MKDIRHIER) $(@:d)
130	.IF "$(XSLTPROC)"=="NO_XSLTPROC"	133	.IF "$(XSLTPROC)"=="NO_XSLTPROC"
131	.IF "$(NO_INSPECTION)"==""	134	.IF "$(NO_INSPECTION)"==""
132	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<	135	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
133	.ENDIF # "$(NO_INSPECTION)"==""	136	.ENDIF # "$(NO_INSPECTION)"==""
134	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$.xcs schemaRoot=$(XCSROOT)$/registry$/schema	137	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$.xcs schemaRoot=$(XCSROOT)$/registry$/schema
135	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$.xcs schemaRoot=$(XCSROOT)$/registry$/schema	138	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$.xcs schemaRoot=$(XCSROOT)$/registry$/schema
136	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@	139	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
137	.ELSE	140	.ELSE
138	# xsltproc already validates against the dtd. For additional validation,	141	# xsltproc already validates against the dtd. For additional validation,
139	# org.openoffice.configuration.Inspector should be replaced and the	142	# org.openoffice.configuration.Inspector should be replaced and the
Lines 170-177 Link Here
170	@+echo -------------+ creating locale dependent entries	173	@+echo -------------+ creating locale dependent entries
171	-$(MKDIRHIER) $(@:d)	174	-$(MKDIRHIER) $(@:d)
172	.IF "$(XSLTPROC)"=="NO_XSLTPROC"	175	.IF "$(XSLTPROC)"=="NO_XSLTPROC"
173	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	176	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
174	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@	177	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
175	.ELSE	178	.ELSE
176	$(XSLTPROC) -o $(@:d)$*.tmp \	179	$(XSLTPROC) -o $(@:d)$*.tmp \
177	--stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \	180	--stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \
Lines 206-213 Link Here
206	@+echo -------------+ creating a module file	209	@+echo -------------+ creating a module file
207	-$(MKDIRHIER) $(@:d)	210	-$(MKDIRHIER) $(@:d)
208	.IF "$(XSLTPROC)"=="NO_XSLTPROC"	211	.IF "$(XSLTPROC)"=="NO_XSLTPROC"
209	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}	212	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
210	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@	213	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
211	.ELSE	214	.ELSE
212	$(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \	215	$(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \
213	--stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \	216	--stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \

Lines 51-60 Link Here

(-)openoffice.org.orig/solenv/inc/tg_jar.mk (-2 / +20 lines)
51		51
52	CUSTOMMANIFESTFILEDEP:=$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f)	52	CUSTOMMANIFESTFILEDEP:=$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f)
53		53
		54	.IF "$(SYSTEM_XML_APIS)" == "YES"
		55	XML_APIS_SUBST=$(XML_APIS_JAR)
		56	.ELSE
		57	XML_APIS_SUBST=xml-apis.jar
		58	.ENDIF
		59
		60	.IF "$(SYSTEM_XERCES)" == "YES"
		61	XERCES_SUBST=$(XERCES_JAR)
		62	.ELSE
		63	XERCES_SUBST=xercesImpl.jar
		64	.ENDIF
		65
		66	.IF "$(SYSTEM_XALAN)" == "YES"
		67	XALAN_SUBST=$(XALAN_JAR)
		68	.ELSE
		69	XALAN_SUBST=xalan.jar
		70	.ENDIF
		71
		72
54	$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,$/ $(DMAKE_WORK_DIR))$/$(CUSTOMMANIFESTFILE)	73	$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,$/ $(DMAKE_WORK_DIR))$/$(CUSTOMMANIFESTFILE)
55	+-$(RM) $@	74	+-$(RM) $@
56	#>& $(NULLDEV)	75	+$(TYPE) $< \| $(SED) s/xml-apis.jar/$(XML_APIS_SUBST)/g \| $(SED) s/xercesImpl.jar/$(XERCES_SUBST)/g \| $(SED) s/xalan.jar/$(XALAN_SUBST)/g > $@
57	+$(COPY) $< $@
58	.ENDIF # "$(CUSTOMMANIFESTFILE)"!=""	76	.ENDIF # "$(CUSTOMMANIFESTFILE)"!=""
59		77
60	$(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)	78	$(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)

Lines 42-58 Link Here

(-)openoffice.org.orig/xmlhelp/source/com/sun/star/help/makefile.mk (-3 / +15 lines)
42		42
43	.INCLUDE : settings.mk	43	.INCLUDE : settings.mk
44		44
45	JARFILES = xml-apis.jar xercesImpl.jar xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar	45	JARFILES = xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar
46	EXTRAJARFILES =	46	EXTRAJARFILES =
47		47
		48	.IF "$(SYSTEM_XML_APIS)" == "YES"
		49	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
		50	.ELSE
		51	JARFILES += xml-apis.jar
		52	.ENDIF
		53
		54	.IF "$(SYSTEM_XERCES)" == "YES"
		55	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
		56	.ELSE
		57	JARFILES += xercesImpl.jar
		58	.ENDIF
		59
48	.IF "$(SYSTEM_DB)" == "YES"	60	.IF "$(SYSTEM_DB)" == "YES"
49	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(DB_JAR)	61	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(DB_JAR)
50	.ELSE	62	.ELSE
51	JARFILES+= db.jar	63	JARFILES += db.jar
52	.ENDIF	64	.ENDIF
53		65
54	CLASSGENDIR = $(OUT)$/classgen	66	CLASSGENDIR = $(OUT)$/classgen
55	RDB = $(SOLARBINDIR)$/types.rdb	67	RDB = $(SOLARBINDIR)$/types.rdb
56	JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))	68	JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
57		69
58	# --- Files --------------------------------------------------------	70	# --- Files --------------------------------------------------------

Lines 21-27 Link Here

(-)openoffice.org.orig/XmlSearch/src/com/sun/xmlsearch/makefile.mk (-1 / +13 lines)
21		21
22	.INCLUDE : settings.mk	22	.INCLUDE : settings.mk
23		23
24	JARFILES = xpi-apis.jar xercesImpl.jar xt.jar	24	JARFILES = xt.jar
		25
		26	.IF "$(SYSTEM_XML_APIS)" == "YES"
		27	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
		28	.ELSE
		29	JARFILES += xml-apis.jar
		30	.ENDIF
		31
		32	.IF "$(SYSTEM_XERCES)" == "YES"
		33	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
		34	.ELSE
		35	JARFILES += xercesImpl.jar
		36	.ENDIF
25		37
26	JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))	38	JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
27		39

Lines 64-71 Link Here

(-)openoffice.org.orig/odk/pack/gendocu/makefile.mk (-1 / +4 lines)
64	$(JAVA_SRC_DIR)$/jut_src.zip \	64	$(JAVA_SRC_DIR)$/jut_src.zip \
65	$(JAVA_SRC_DIR)$/juh_src.zip \	65	$(JAVA_SRC_DIR)$/juh_src.zip \
66	$(JAVA_SRC_DIR)$/ridl_src.zip \	66	$(JAVA_SRC_DIR)$/ridl_src.zip \
67	$(JAVA_SRC_DIR)$/sandbox_src.zip \
68	$(JAVA_SRC_DIR)$/unoloader_src.zip	67	$(JAVA_SRC_DIR)$/unoloader_src.zip
		68
		69	.IF "$(JDK)" != "gcj"
		70	JAVA_SRC_FILES+=$(JAVA_SRC_DIR)$/sandbox_src.zip
		71	.ENDIF
69		72
70	JAVA_BEAN_SRC_FILES=\	73	JAVA_BEAN_SRC_FILES=\
71	$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/ContainerFactory.java \	74	$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/ContainerFactory.java \