INTEGRATION: CWS geordi2q11 (1.23.162); FILE MERGED

2003/12/16 13:25:02 hr 1.23.162.1: #111934#: join CWS ooo111fix1

1 files changed, 61 insertions, 2 deletions

diff --git a/officecfg/util/makefile.pmk b/officecfg/util/makefile.pmk
index f4c612e99940..2353db25f924 100644
--- a/officecfg/util/makefile.pmk
+++ b/officecfg/util/makefile.pmk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.pmk,v $
 #
-#   $Revision: 1.23 $
+#   $Revision: 1.24 $
 #
-#   last change: $Author: hr $ $Date: 2003-03-26 13:50:30 $
+#   last change: $Author: vg $ $Date: 2003-12-17 18:00:15 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -67,34 +67,93 @@ alliso:=$(foreach,l,$(alllangext) $(iso_$(l)))
 $(MISC)$/registry$/schema$/%.xcs : %.xcs
     @+echo -------------+ validating and stripping schema files
     -$(MKDIR) -p $(@:d)
+.IF "$(SOLAR_JAVA)"!=""
     $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
     $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_val.xsl $(@:d)$(<:b).val file=$(<:d)$(<:b) pathSeparator=$/	
     $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/sanity.xsl $(@:d)$(<:b).san file=$(<:d)$(<:b) pathSeparator=$/
     $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_trim.xsl $(@:d)$(<:b).tmp
     $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
+.ELSE
+# xsltproc already validates against the dtd.  For additional validation,
+# org.openoffice.configuration.Inspector should be replaced and the
+# replacement should be invoked here.
+    $(XSLTPROC) -o $(@:d)$(<:b).val \
+                --stringparam file $(<:d)$(<:b) \
+                --stringparam pathSeparator $/ \
+                $(PRJ)$/util$/schema_val.xsl $<
+    $(XSLTPROC) -o $(@:d)$(<:b).san \
+                --stringparam file $(<:d)$(<:b) \
+                --stringparam pathSeparator $/ \
+                $(PRJ)$/util$/sanity.xsl $<
+    $(XSLTPROC) -o $(@:d)$(<:b).tmp \
+                $(PRJ)$/util$/schema_trim.xsl $<
+# xsltproc already seems to pretty-print the xml, so
+# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
+    cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
+.ENDIF
     +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
     +$(RM) $(@:d)$(<:b).val > $(NULLDEV)
     
 $(MISC)$/registry$/res$/{$(alliso)}$/%.properties :| %.xcs
     @+echo -------------+ creating locale dependent resource bundles
     -$(MKDIR) -p $(@:d)
+.IF "$(SOLAR_JAVA)"!=""
     $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/resource.xsl $(@:d)$(<:b).properties locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))}
+.ELSE
+    $(XSLTPROC) -o $(@:d)$(<:b).properties \
+                --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))} \
+                $(PRJ)$/util$/resource.xsl $<
+.ENDIF
 
 # --- XCU ---
 
 $(MISC)$/registry$/data$/%.xcu : %.xcu
     @+echo -------------+ validating and creating a locale independent file
     -$(MKDIR) -p $(@:d) 
+.IF "$(SOLAR_JAVA)"!=""
     $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
     $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/data_val.xsl $(@:d)$(<:b).val xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema
     $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema
     $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
+.ELSE
+# xsltproc already validates against the dtd.  For additional validation,
+# org.openoffice.configuration.Inspector should be replaced and the
+# replacement should be invoked here.
+    $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/data_val.xsl > $(PRJ)$/util$/dataval2.xsl
+    $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
+    $(XSLTPROC) -o $(@:d)$(<:b).val \
+                --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
+                --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
+                $(PRJ)$/util$/dataval2.xsl $<
+    $(XSLTPROC) -o $(@:d)$(<:b).tmp \
+                --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
+                --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
+                $(PRJ)$/util$/alllang2.xsl $<
+# xsltproc already seems to pretty-print the xml, so
+# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
+    cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
+    +$(RM) $(PRJ)$/util$/dataval2.xsl > $(NULLDEV)
+    +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
+.ENDIF
     +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
     +$(RM) $(@:d)$(<:b).val > $(NULLDEV)
 
 $(MISC)$/registry$/res$/{$(alliso)}$/%.xcu :| %.xcu
     @+echo -------------+ creating locale dependent entries
     -$(MKDIR) -p $(@:d)
+.IF "$(SOLAR_JAVA)"!=""
     $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))}	
     $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
+.ELSE
+    $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
+    $(XSLTPROC) -o $(@:d)$(<:b).tmp \
+                --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
+                --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
+                --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))} \
+                $(PRJ)$/util$/alllang2.xsl $<
+# xsltproc already seems to pretty-print the xml, so
+# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
+    cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
+    +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
+.ENDIF
     +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)