]>
Commit | Line | Data |
---|---|---|
b94623ae AM |
1 | diff -urN ooo-build-1.1.55.org/patches/OOO_1_1/build-parallel-ooficecfg.patch ooo-build-1.1.55/patches/OOO_1_1/build-parallel-ooficecfg.patch |
2 | --- ooo-build-1.1.55.org/patches/OOO_1_1/build-parallel-ooficecfg.patch 1970-01-01 01:00:00.000000000 +0100 | |
b94cad81 | 3 | +++ ooo-build-1.1.55/patches/OOO_1_1/build-parallel-ooficecfg.patch 2004-05-07 03:46:21.634682552 +0200 |
b94623ae AM |
4 | @@ -0,0 +1,50 @@ |
5 | +diff -urN officecfg.org/util/makefile.pmk officecfg/util/makefile.pmk | |
6 | +--- officecfg.org/util/makefile.pmk 2004-05-07 02:09:08.906392032 +0200 | |
b94cad81 | 7 | ++++ officecfg/util/makefile.pmk 2004-05-07 03:46:13.524915424 +0200 |
b94623ae AM |
8 | +@@ -119,21 +119,21 @@ |
9 | + # xsltproc already validates against the dtd. For additional validation, | |
10 | + # org.openoffice.configuration.Inspector should be replaced and the | |
11 | + # replacement should be invoked here. | |
12 | +- $(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 | |
13 | +- $(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 | |
d3fb74e5 AM |
14 | ++ $(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$/$(<:b)-dataval2.xsl |
15 | ++ $(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$/$(<:b)-alllang2.xsl | |
b94623ae AM |
16 | + $(XSLTPROC) -o $(@:d)$(<:b).val \ |
17 | + --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \ | |
18 | + --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \ | |
19 | +- $(PRJ)$/util$/dataval2.xsl $< | |
d3fb74e5 | 20 | ++ $(PRJ)$/util$/$(<:b)-dataval2.xsl $< |
b94623ae AM |
21 | + $(XSLTPROC) -o $(@:d)$(<:b).tmp \ |
22 | + --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \ | |
23 | + --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \ | |
24 | +- $(PRJ)$/util$/alllang2.xsl $< | |
d3fb74e5 | 25 | ++ $(PRJ)$/util$/$(<:b)-alllang2.xsl $< |
b94623ae AM |
26 | + # xsltproc already seems to pretty-print the xml, so |
27 | + # org.openoffice.helper.PrettyPrinter seems to be unnecessary. | |
28 | + cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu | |
29 | +- +$(RM) $(PRJ)$/util$/dataval2.xsl > $(NULLDEV) | |
30 | +- +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV) | |
d3fb74e5 AM |
31 | ++ +$(RM) $(PRJ)$/util$/$(<:b)-dataval2.xsl > $(NULLDEV) |
32 | ++ +$(RM) $(PRJ)$/util$/$(<:b)-alllang2.xsl > $(NULLDEV) | |
b94623ae AM |
33 | + .ENDIF |
34 | + +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV) | |
35 | + +$(RM) $(@:d)$(<:b).val > $(NULLDEV) | |
36 | +@@ -145,15 +145,15 @@ | |
37 | + $(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$/, $@))} | |
38 | + $(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 | |
39 | + .ELSE | |
40 | +- $(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 | |
b94cad81 | 41 | ++ $(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$/$(<:b)-{$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))}-alllang2.xsl |
b94623ae AM |
42 | + $(XSLTPROC) -o $(@:d)$(<:b).tmp \ |
43 | + --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \ | |
44 | + --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \ | |
45 | + --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))} \ | |
46 | +- $(PRJ)$/util$/alllang2.xsl $< | |
b94cad81 | 47 | ++ $(PRJ)$/util$/$(<:b)-{$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))}-alllang2.xsl $< |
b94623ae AM |
48 | + # xsltproc already seems to pretty-print the xml, so |
49 | + # org.openoffice.helper.PrettyPrinter seems to be unnecessary. | |
50 | + cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu | |
51 | +- +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV) | |
b94cad81 | 52 | ++ +$(RM) $(PRJ)$/util$/$(<:b)-{$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))}-alllang2.xsl > $(NULLDEV) |
b94623ae AM |
53 | + .ENDIF |
54 | + +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV) | |
589e71cb AM |
55 | diff -urN ooo-build-1.1.55.org/patches/OOO_1_1_1/apply ooo-build-1.1.55/patches/OOO_1_1_1/apply |
56 | --- ooo-build-1.1.55.org/patches/OOO_1_1_1/apply 2004-05-06 23:22:36.236508760 +0200 | |
b94623ae | 57 | +++ ooo-build-1.1.55/patches/OOO_1_1_1/apply 2004-05-07 02:13:39.606239400 +0200 |
589e71cb AM |
58 | @@ -666,6 +666,9 @@ |
59 | # splash | |
60 | pld-splash.diff | |
05335a0c | 61 | |
b94623ae AM |
62 | +# parallel build |
63 | +build-parallel-ooficecfg.patch | |
589e71cb AM |
64 | + |
65 | ####################################################### | |
66 | [ ArkOnly ] | |
05335a0c | 67 |