Changeset 14580

Timestamp:

2007-09-26T09:13:34+12:00 (16 years ago)

Author:

oranfry

Message:

have the script change the gli version number just before comiling

Location:

greenstone3/branches/3.03

Files:

• build.xml (modified) (2 diffs)
• lib/java/anttasks.jar (modified) ( previous)
• src/java/org/greenstone/anttasks/RegexSearchReplace.java (modified) (1 diff)

greenstone3/branches/3.03/build.xml

@@ -1059 +1059 @@
 
   <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode">
-<!--  <target name="checkout-gs2build" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> -->
     <echo>checking out gs2build</echo>
         <!-- svn checkouts -->
@@ -1308 +1307 @@
     <!-- gli -->
     <property name="gli.home" value="${basedir}/gli"/>
+
+        <!-- change the version number -->
+        <rsr file="${gli.home}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*&quot;(.*)&quot;" replacement="$1String PROGRAM_VERSION = &quot;${app.version}&quot;"/>
     <!-- linux -->
-    <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}"
-      resolveExecutable="true"/>
+    <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/>
     <!-- windows -->
-    <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}"
-      resolveExecutable="true"/>
+    <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/>
   </target>
   

greenstone3/branches/3.03/src/java/org/greenstone/anttasks/RegexSearchReplace.java

@@ -70 +70 @@
                 line = line.replaceAll( pattern, replacement);
                 out.write(line);
+                out.newLine();
             }
             //close them both up