Added version filtering to build. Version should now be in only build.xml,

and config.xml picks it up from there during the build process.
PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/build.xml b/build.xml
index 9ec5a6597b72baef080c585e40b648401e5a88e9..b0797b3561368f2248684f8b80ac7a972168acc9 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -160,6 +160,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <property name="Name" value="Fop"/>
     <property name="name" value="fop"/>
     <property name="version" value="0.18.0-DEV"/>
+    <filter  token="version" value="${version}"/>
     <property name="year" value="1999-2001"/>
 
     <echo message="------------------- ${Name} ${version} [${year}] ----------------"/>
@@ -323,7 +324,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <mkdir dir="${build.src}/${fonts.dir}"/>
     <mkdir dir="${build.dest}/conf"/>
     <mkdir dir="${build.dest}/hyph"/>
-    <copy todir="${build.dest}/conf">
+    <copy todir="${build.dest}/conf" filtering="yes">
        <fileset dir="./conf"/>
     </copy>
   </target>

diff --git a/conf/config.xml b/conf/config.xml
index 138cb32d53f22a34daa652d084c32b55c1ad66a8..6d75a585939569395a44aa30205ce8207351079c 100644 (file)
--- a/conf/config.xml
+++ b/conf/config.xml
@@ -5,7 +5,7 @@
 <configuration>
   <entry>
     <key>version</key>
-    <value>FOP 0.17.0 DEV</value>
+    <value>FOP @version@</value>
   </entry>
 
   <!-- default values for commandline options -->