1. Removed the properties.Constants class from automatic generation, and

added Finn Bock's work on Property and Element Constants (currently unused
within application.)  The CVS version is now the official one.  (The
new constants are not currently being used within the application;
more work is needed.)

2. Build.xml has a new helper XSLTtoJAVA task separate from any of the build
processes to generate the Constants class above (although its output is
expected to fall behind what will be maintained in the CVS version.)

3. Some xml and xsl file renaming to make clearer the purposes of those files.

4. Removed a debug statement from PropertyList.java (forgot to remove from
yesterday's work).


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197038 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 13 insertions, 5 deletions

diff --git a/build.xml b/build.xml
index e0cfd92c0..dfd5c4242 100644
--- a/build.xml
+++ b/build.xml
@@ -207,13 +207,11 @@ list of possible build targets.
     <property name="src.propmaker.xsl" value="${src.codegen}/propmaker.xsl"/>
     <property name="foproperties.xml" value="${build.codegen}/foproperties.xml"/>
     <property name="colorkw.xml" value="${build.codegen}/colorkw.xml"/>
-    <property name="allprops.xml" value="${build.codegen}/allprops.xml"/>
 
     <property name="properties.xsl" value="${build.codegen}/properties.xsl"/>
     <property name="propmap.xsl" value="${build.codegen}/propmap.xsl"/>
     <property name="enumgen.xsl" value="${build.codegen}/enumgen.xsl"/>
     <property name="propinc.xsl" value="${build.codegen}/propinc.xsl"/>
-    <property name="genconst.xsl" value="${build.codegen}/genconst.xsl"/>
     <property name="src.charlist.xsl" value="${src.codegen}/code-point-mapping.xsl"/>
     <property name="encodings.xml" value="${build.codegen}/encodings.xml"/>
     <property name="charlist.xsl" value="${build.codegen}/code-point-mapping.xsl"/>
@@ -330,6 +328,7 @@ list of possible build targets.
     <mkdir dir="${build.dest}/hyph"/>
   </target>
 
+
   <!-- =================================================================== -->
   <!-- Generate the source code                                            -->
   <!-- =================================================================== -->
@@ -353,9 +352,6 @@ list of possible build targets.
       <targetfilelist dir="${basedir}" files="${build.gensrc}/${replacestring}/fo/properties/fo_${ignore_this},${build.gensrc}/${replacestring}/fo/properties/FOPropertyMapping.java,${build.gensrc}/${replacestring}/fo/properties/foenums_${ignore_this}"/>
     </dependset>
 
-    <style in="${allprops.xml}" style="${genconst.xsl}"
-        out="${build.gensrc}/${replacestring}/fo/properties/Constants.java"/>
-
     <style in="${foproperties.xml}" style="${properties.xsl}"
         out="${build.gensrc}/${replacestring}/fo/properties/fo_${ignore_this}"/>
     <style in="${foproperties.xml}" style="${propmap.xsl}"
@@ -918,6 +914,17 @@ list of possible build targets.
   </target>
 
   <!-- =================================================================== -->
+  <!-- Helper task to generate source files that have already been         -->
+  <!-- checked into CVS.  For these files, CVS version is the official one -->
+  <!-- and may have updates that will *not* be generated by below.  This   -->
+  <!-- target should never be part of the normal build process.            -->
+  <!-- =================================================================== -->
+  <target name="xsltToJava" >
+    <style in="src\codegen\constants.xml" style="src\codegen\constants.xsl"
+        out="Constants.java"/>
+  </target>
+
+  <!-- =================================================================== -->
   <!-- Special target for Gump                                             -->
   <!-- =================================================================== -->
   <target name="gump" depends="all, javadocs"/>
@@ -997,4 +1004,5 @@ xdocs. Point schemas.dir to Forrest's 'schemas' directory.">
       </xmlcatalog>
     </xmlvalidate>
   </target>
+  
 </project>