incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1179267 - in /incubator/ooo/trunk/main/writerfilter/source/ooxml: makefile.mk rngtocxx
Date Wed, 05 Oct 2011 15:38:04 GMT
Author: pfg
Date: Wed Oct  5 15:38:03 2011
New Revision: 1179267

URL: http://svn.apache.org/viewvc?rev=1179267&view=rev
Log:
i85469: generalize a couple of gperf references that were left in writerfilter

Modified:
    incubator/ooo/trunk/main/writerfilter/source/ooxml/makefile.mk
    incubator/ooo/trunk/main/writerfilter/source/ooxml/rngtocxx

Modified: incubator/ooo/trunk/main/writerfilter/source/ooxml/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/writerfilter/source/ooxml/makefile.mk?rev=1179267&r1=1179266&r2=1179267&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerfilter/source/ooxml/makefile.mk (original)
+++ incubator/ooo/trunk/main/writerfilter/source/ooxml/makefile.mk Wed Oct  5 15:38:03 2011
@@ -234,7 +234,7 @@ $(OOXMLNAMESPACEIDSHXX):  $(OOXMLHXXOUTD
 
 $(GPERFFASTTOKENHXX): $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED)
     @echo "Making:   " $(@:f)   
-	$(COMMAND_ECHO)$(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | gperf
-I -t -E -S1 -c -G -LC++ > $@
+	$(COMMAND_ECHO)$(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | $(GPERF)
-I -t -E -S1 -c -G -LC++ > $@
 
 $(SLOFACTORIESNAMESPACES): $(OOXMLFACTORYSCXXS) $(OOXMLGENHEADERS)
 

Modified: incubator/ooo/trunk/main/writerfilter/source/ooxml/rngtocxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/writerfilter/source/ooxml/rngtocxx?rev=1179267&r1=1179266&r2=1179267&view=diff
==============================================================================
--- incubator/ooo/trunk/main/writerfilter/source/ooxml/rngtocxx (original)
+++ incubator/ooo/trunk/main/writerfilter/source/ooxml/rngtocxx Wed Oct  5 15:38:03 2011
@@ -28,5 +28,5 @@ xalan -xsl tokenmapinit.xsl -in model_pr
 xalan -xsl valuesimpl.xsl -in model_processed.xml > OOXMLvalues.cxx
 xalan -xsl qnametostr.xsl -in model_processed.xml > qnametostr.tmp
 xalan -xsl resourceids.xsl -in model_processed.xml > ../../inc/ooxml/resourceids.hxx
-xalan -xsl gperfattributes.xsl -in model_processed.xml | gperf -t -E -S1 -LC++ > gperfattributes.hxx
-xalan -xsl gperfelements.xsl -in model_processed.xml | gperf -t -E -S1 -LC++ > gperfelements.hxx
+xalan -xsl gperfattributes.xsl -in model_processed.xml | $GPERF -t -E -S1 -LC++ > gperfattributes.hxx
+xalan -xsl gperfelements.xsl -in model_processed.xml | $GPERF -t -E -S1 -LC++ > gperfelements.hxx



Mime
View raw message