Author: curtisr7
Date: Wed Aug 11 18:33:29 2010
New Revision: 984522

URL: http://svn.apache.org/viewvc?rev=984522&view=rev
Log:
OPENJPA-1707: Update pom.xml to write the revision of PCEnhancer to 
org.apache.openjpa.revision.properties.

Modified:
    openjpa/trunk/openjpa-lib/pom.xml

Modified: openjpa/trunk/openjpa-lib/pom.xml
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/pom.xml?rev=984522&r1=984521&r2=984522&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/pom.xml (original)
+++ openjpa/trunk/openjpa-lib/pom.xml Wed Aug 11 18:33:29 2010
@@ -109,17 +109,27 @@
                                 <exec outputproperty="subversion.revision" 
failonerror="false" failifexecutionfails="false" 
executable="${svnversion.executable}">
                                     <arg line="-c ${basedir}/.." />
                                 </exec>
-                                <exec outputproperty="pcenhancer.revision" 
failonerror="false" failifexecutionfails="false" 
executable="${svnversion.executable}">
-                                    <arg line=". 
../openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java" />
-                                </exec>                                
+                                # Write the svn info to a temp file 
+                                <echo file="pcenhancer.revision.file"/> 
+                                <exec output="pcenhancer.revision.file" 
failonerror="false" failifexecutionfails="false" executable="svn" 
append="false">
+                                    <arg line="info 
../openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java" />
+                                </exec>
+
+                                # Remove all spaces so we can have a proper key
+                                <replace file="pcenhancer.revision.file" 
token=" " value=""/>
+                                # Load the property file
+                                <property prefix="pcenhancer" 
file="pcenhancer.revision.file"/>
+                                <delete file="pcenhancer.revision.file"/>
+                                                               
                                 <property name="subversion.revision" 
value="unknown" />
+                                <property name="pcenhancer.LastChangedRev" 
value="-1" />
                                 <echo>Revision: ${subversion.revision}</echo>
                                 <echo>OpenJPA version: 
${project.version}</echo>
                                     
                                 <mkdir dir="${outdir}/META-INF" />
                                 <echo 
file="${outdir}/META-INF/org.apache.openjpa.revision.properties">revision.number=${subversion.revision}
 openjpa.version=${project.version}
-openjpa.enhancer.revision=${pcenhancer.revision}
+openjpa.enhancer.revision=${pcenhancer.LastChangedRev}
 </echo>
                                 <delete dir="${tmpdir}" />
                             </tasks>


Reply via email to