INTEGRATION: CWS c01v005 (1.31.54); FILE MERGED

2005/03/02 12:09:41 hjs 1.31.54.1: #119245# move processing to solenv

1 files changed, 7 insertions, 157 deletions

diff --git a/officecfg/util/makefile.pmk b/officecfg/util/makefile.pmk
index 34fa8b973455..dcd3b6cd3690 100644
--- a/officecfg/util/makefile.pmk
+++ b/officecfg/util/makefile.pmk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.pmk,v $
 #
-#   $Revision: 1.31 $
+#   $Revision: 1.32 $
 #
-#   last change: $Author: obo $ $Date: 2005-01-25 15:07:50 $
+#   last change: $Author: obo $ $Date: 2005-03-15 12:45:15 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -60,159 +60,9 @@
 #
 #*************************************************************************
 
-PACKAGEDIR*:=$(subst,.,$/ $(PACKAGE))
+XSLDIR=$(PRJ)$/util
+XCSROOT=$(PWD)$/$(PRJ)
+DTDDIR=$(PRJ)$/util
+PROCESSOUT=$(MISC)
+PROCESSORDIR=$(CLASSDIR)
 
-# --- XCS ---
-.IF "$(XCS_TRIM)" != ""
-$(XCS_TRIM) :   $(PRJ)$/registry$/component-schema.dtd \
-                $(PRJ)$/util$/schema_val.xsl \
-                $(PRJ)$/util$/sanity.xsl \
-                $(PRJ)$/util$/schema_trim.xsl 
-.ENDIF
-
-$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs
-    @+echo -------------+ validating and stripping schema files
-    -$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
-    $(JAVAI) $(JAVACPS) $(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 $<
-    $(JAVAI) $(JAVACPS) $(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)$*.val componentName=$(PACKAGE).$*
-    $(JAVAI) $(JAVACPS) $(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)$*.san 
-    $(JAVAI) $(JAVACPS) $(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)$*.tmp
-    $(JAVAI) $(JAVACPS) $(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)$*.tmp $@
-.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)$*.val \
-                --stringparam componentName $(PACKAGE).$* \
-                $(PRJ)$/util$/schema_val.xsl $<
-    $(XSLTPROC) -o $(@:d)$*.san \
-                $(PRJ)$/util$/sanity.xsl $<
-    $(XSLTPROC) -o $(@:d)$*.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)$*.tmp $@
-.ENDIF
-    +$(RM) $(@:d)$*.tmp > $(NULLDEV)
-    +$(RM) $(@:d)$*.val > $(NULLDEV)
-    +$(RM) $(@:d)$*.san > $(NULLDEV)
-    
-$(MISC)$/merge$/$(PACKAGEDIR)$/%.xcs : %.xcs
-# just a copy for now - insert "cfgex" commandline when required
-    +$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
-
-# Create properties files for localized <info> contents (Currently not built)
-.IF "$(XCS_RESOURCES)" != ""
-$(XCS_RESOURCES) :   $(PRJ)$/util$/resource.xsl 
-.ENDIF
-
-$(MISC)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(MISC)$/merge$/$(PACKAGEDIR)$/%.xcs
-    @+echo -------------+ creating locale dependent resource bundles
-    -$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
-    $(JAVAI) $(JAVACPS) $(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 $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(MISC)$/registry$/res$/, $@))}
-.ELSE
-    $(XSLTPROC) -o $@ \
-                --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(MISC)$/registry$/res$/, $@))} \
-                $(PRJ)$/util$/resource.xsl $<
-.ENDIF
-
-# --- XCU ---
-.IF "$(XCU_DEFAULT)" != ""
-$(XCU_DEFAULT) : $(PRJ)$/registry$/component-update.dtd \
-                 $(PRJ)$/util$/data_val.xsl \
-                 $(PRJ)$/util$/alllang.xsl 
-.ENDIF
-
-$(MISC)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu
-    @+echo -------------+ validating and creating a locale independent file
-    -$(MKDIRHIER) $(@:d) 
-.IF "$(SOLAR_JAVA)"!=""
-    $(JAVAI) $(JAVACPS) $(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 $<
-    $(JAVAI) $(JAVACPS) $(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)$*.val xcs=$(PRJ)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(PRJ)$/registry$/schema
-    $(JAVAI) $(JAVACPS) $(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)$*.tmp xcs=$(PRJ)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(PRJ)$/registry$/schema
-    $(JAVAI) $(JAVACPS) $(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)$*.tmp $@
-.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)$*.val \
-                --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \
-                --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
-                $(PRJ)$/util$/data_val.xsl $<
-    $(XSLTPROC) -o $(@:d)$*.tmp \
-                --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \
-                --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
-                $(PRJ)$/util$/alllang.xsl $<
-# xsltproc already seems to pretty-print the xml, so
-# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
-    cp $(@:d)$*.tmp $@
-.ENDIF
-    +$(RM) $(@:d)$*.tmp > $(NULLDEV)
-    +$(RM) $(@:d)$*.val > $(NULLDEV)
-
-# --- localizations ---
-
-$(MISC)$/merge$/$(PACKAGEDIR)$/%.xcu : %.xcu
-    +$(MKDIRHIER) $(@:d)
-    $(WRAPCMD) $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m localize.sdf -l all
-
-.IF "$(XCU_LANG)" != ""
-$(XCU_LANG) : $(PRJ)$/util$/alllang.xsl 
-.ENDIF
-
-$(MISC)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| $(MISC)$/merge$/$(PACKAGEDIR)$/%.xcu
-    @+echo -------------+ creating locale dependent entries
-    -$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
-    $(JAVAI) $(JAVACPS) $(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)$*.tmp xcs=$(PRJ)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(PRJ)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(MISC)$/registry$/res$/, $@))}	
-    $(JAVAI) $(JAVACPS) $(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)$*.tmp $@
-.ELSE
-    $(XSLTPROC) -o $(@:d)$*.tmp \
-                --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \
-                --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
-                --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(MISC)$/registry$/res$/, $@))} \
-                $(PRJ)$/util$/alllang.xsl $<
-# xsltproc already seems to pretty-print the xml, so
-# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
-    cp $(@:d)$*.tmp $@
-.ENDIF
-    +$(RM) $(@:d)$*.tmp > $(NULLDEV)
-
-# --- languagepack tag modules ---
-.IF "$(LANGUAGEPACKS)" != ""
-$(LANGUAGEPACKS) : $(PRJ)$/util$/delcomment.sed 
-.ENDIF
-
-
-$(MISC)$/registry$/spool$/Langpack-%.xcu : Langpack.xcu.tmpl
-    @+echo -------------+ creating a Langpack module for locale $*
-    -$(MKDIRHIER) $(@:d) 
-    $(SED) -e "s/__LANGUAGE__/$*/" -f $(PRJ)$/util$/delcomment.sed $< > $@
-    
-
-# --- modules ---
-.IF "$(XCU_MODULES)" != ""
-$(XCU_MODULES) : $(PRJ)$/util$/alllang.xsl 
-.ENDIF
-
-
-$(MISC)$/registry$/spool$/$(PACKAGEDIR)/%.xcu :| $$(@:b:s/-/./:b).xcu
-    @+echo -------------+ creating a module file
-    -$(MKDIRHIER) $(@:d) 
-.IF "$(SOLAR_JAVA)"!=""
-    $(JAVAI) $(JAVACPS) $(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)$(@:f:s/.xcu/.tmp/) xcs=$(PRJ)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
-    $(JAVAI) $(JAVACPS) $(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)$(@:f:s/.xcu/.tmp/) $@
-.ELSE
-    $(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \
-                --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \
-                --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
-                --stringparam module $(subst,$(<:b)-, $(*)) \
-                $(PRJ)$/util$/alllang.xsl $<
-# xsltproc already seems to pretty-print the xml, so
-# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
-    cp $(@:d)$(@:f:s/.xcu/.tmp/) $@
-.ENDIF
-    +$(RM) $(@:d)$(@:f:s/.xcu/.tmp/) > $(NULLDEV)