[Geotools-commits] svn - r38838 - in trunk: build docs

[<svn...@os...>]

Author: jdeolive
Date: 2012-06-27 11:38:52 -0700 (Wed, 27 Jun 2012)
New Revision: 38838

Modified:
   trunk/build/rename.xml
   trunk/docs/common.py
Log:
tweaking doc version to avoid @RELEASE@ tag in snapshot builds

Modified: trunk/build/rename.xml
===================================================================
--- trunk/build/rename.xml	2012-06-27 18:19:03 UTC (rev 38837)
+++ trunk/build/rename.xml	2012-06-27 18:38:52 UTC (rev 38838)
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project name="Rename" default="rename">
   
-  <target name="rename" depends="code,doc,readme"
-          description="Update the version references in code, doc and readme"
+  <target name="rename" depends="code, readme"
+          description="Update the version references in code and readme"
    />
   
   <target name="code">
     <replace dir="..">
       <include name="**/pom.xml"/>
       <include name="**/GeoTools.java"/>
+      <include name="**/common.py"/>
       <replacefilter token="8-SNAPSHOT" value="@VERSION@"/>
     </replace>
   </target>
   
-  <target name="doc">
-    <replace file="../docs/common.py">
-      <replacefilter token="@RELEASE@" value="@VERSION@"/>
-    </replace>
-  </target>
-  
   <target name="readme">
     <replace file="../README.html">
       <replacefilter token="@RELEASE@" value="@VERSION@"/>

Modified: trunk/docs/common.py
===================================================================
--- trunk/docs/common.py	2012-06-27 18:19:03 UTC (rev 38837)
+++ trunk/docs/common.py	2012-06-27 18:38:52 UTC (rev 38838)
@@ -49,12 +49,13 @@
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = '@RELEASE@'
+release = '8-SNAPSHOT'
 
 # The short X.Y version.
-version = re.sub('-.*', '', release)
+version = release
+if version.find('SNAPSHOT') == -1:
+  version = re.sub('-.*', '', version)
 
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None