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

(-)officecfg/util/makefile.pmk.orig (+59 lines)
Lines 67-100 Link Here
67
$(MISC)$/registry$/schema$/%.xcs : %.xcs
67
$(MISC)$/registry$/schema$/%.xcs : %.xcs
68
    @+echo -------------+ validating and stripping schema files
68
    @+echo -------------+ validating and stripping schema files
69
	-$(MKDIR) -p $(@:d)
69
	-$(MKDIR) -p $(@:d)
70
.IF "$(SOLAR_JAVA)"!=""
70
	$(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 $<
71
	$(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 $<
71
	$(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=$/	
72
	$(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=$/	
72
	$(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=$/
73
	$(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=$/
73
	$(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
74
	$(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
74
	$(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
75
	$(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
76
.ELSE
77
# xsltproc already validates against the dtd.  For additional validation,
78
# org.openoffice.configuration.Inspector should be replaced and the
79
# replacement should be invoked here.
80
	$(XSLTPROC) -o $(@:d)$(<:b).val \
81
	            --stringparam file $(<:d)$(<:b) \
82
	            --stringparam pathSeparator $/ \
83
	            $(PRJ)$/util$/schema_val.xsl $<
84
	$(XSLTPROC) -o $(@:d)$(<:b).san \
85
	            --stringparam file $(<:d)$(<:b) \
86
	            --stringparam pathSeparator $/ \
87
	            $(PRJ)$/util$/sanity.xsl $<
88
	$(XSLTPROC) -o $(@:d)$(<:b).tmp \
89
	            $(PRJ)$/util$/schema_trim.xsl $<
90
# xsltproc already seems to pretty-print the xml, so
91
# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
92
	cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs
93
.ENDIF
75
	+$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
94
	+$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
76
	+$(RM) $(@:d)$(<:b).val > $(NULLDEV)
95
	+$(RM) $(@:d)$(<:b).val > $(NULLDEV)
77
	
96
	
78
$(MISC)$/registry$/res$/{$(alliso)}$/%.properties :| %.xcs
97
$(MISC)$/registry$/res$/{$(alliso)}$/%.properties :| %.xcs
79
    @+echo -------------+ creating locale dependent resource bundles
98
    @+echo -------------+ creating locale dependent resource bundles
80
	-$(MKDIR) -p $(@:d)
99
	-$(MKDIR) -p $(@:d)
100
.IF "$(SOLAR_JAVA)"!=""
81
	$(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 $@)))}
101
	$(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 $@)))}
102
.ELSE
103
	$(XSLTPROC) -o $(@:d)$(<:b).properties \
104
	            --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))} \
105
	            $(PRJ)$/util$/resource.xsl $<
106
.ENDIF
82
107
83
# --- XCU ---
108
# --- XCU ---
84
109
85
$(MISC)$/registry$/data$/%.xcu : %.xcu
110
$(MISC)$/registry$/data$/%.xcu : %.xcu
86
    @+echo -------------+ validating and creating a locale independent file
111
    @+echo -------------+ validating and creating a locale independent file
87
	-$(MKDIR) -p $(@:d) 
112
	-$(MKDIR) -p $(@:d) 
113
.IF "$(SOLAR_JAVA)"!=""
88
	$(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 $<
114
	$(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 $<
89
	$(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
115
	$(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
90
	$(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
116
	$(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
91
	$(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
117
	$(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
118
.ELSE
119
# xsltproc already validates against the dtd.  For additional validation,
120
# org.openoffice.configuration.Inspector should be replaced and the
121
# replacement should be invoked here.
122
	$(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
123
	$(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
124
	$(XSLTPROC) -o $(@:d)$(<:b).val \
125
	            --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
126
	            --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
127
	            $(PRJ)$/util$/dataval2.xsl $<
128
	$(XSLTPROC) -o $(@:d)$(<:b).tmp \
129
	            --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
130
	            --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
131
	            $(PRJ)$/util$/alllang2.xsl $<
132
# xsltproc already seems to pretty-print the xml, so
133
# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
134
	cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
135
	+$(RM) $(PRJ)$/util$/dataval2.xsl > $(NULLDEV)
136
	+$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
137
.ENDIF
92
	+$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
138
	+$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
93
	+$(RM) $(@:d)$(<:b).val > $(NULLDEV)
139
	+$(RM) $(@:d)$(<:b).val > $(NULLDEV)
94
140
95
$(MISC)$/registry$/res$/{$(alliso)}$/%.xcu :| %.xcu
141
$(MISC)$/registry$/res$/{$(alliso)}$/%.xcu :| %.xcu
96
    @+echo -------------+ creating locale dependent entries
142
    @+echo -------------+ creating locale dependent entries
97
	-$(MKDIR) -p $(@:d)
143
	-$(MKDIR) -p $(@:d)
144
.IF "$(SOLAR_JAVA)"!=""
98
	$(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$/, $@))}	
145
	$(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$/, $@))}	
99
	$(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
146
	$(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
147
.ELSE
148
	$(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
149
	$(XSLTPROC) -o $(@:d)$(<:b).tmp \
150
	            --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
151
	            --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
152
	            --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))} \
153
	            $(PRJ)$/util$/alllang2.xsl $<
154
# xsltproc already seems to pretty-print the xml, so
155
# org.openoffice.helper.PrettyPrinter seems to be unnecessary.
156
	cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
157
	+$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
158
.ENDIF
100
	+$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
159
	+$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)

Return to issue 21935