Changeset 18227 for greenstone3/trunk/build.xml

Timestamp:

2008-12-17T14:58:01+13:00 (15 years ago)

Author:

oranfry

Message:

don't version build.properties any more, instead version build.properties.in and use it to create build.properties on the users computer as needed. This makes it harder to accidentally check in a personalised copy of build.properties into the repository and makes 'svn st' easier to read

File:

• greenstone3/trunk/build.xml (modified) (4 diffs)

greenstone3/trunk/build.xml

@@ -48 +48 @@
 
   -->
+
+  <!-- create build.properties if it has not been created yet -->
+  <if>
+    <bool><not><available file="build.properties"/></not></bool>
+    <copy file="build.properties.in" tofile="build.properties"/>
+  </if>
+
   
   <!--the first three properties have to be put on the top to be used by build.properties-->
@@ -1253 +1260 @@
   <target name="compile-search4j">
 
-    <!-- windows -->
+  <!-- windows -->
     <exec executable="${src.packages.home}/search4j/compile.bat" os="${os.windows}" dir="${src.packages.home}/search4j"/>
 
-    <!-- unix -->
+  <!-- unix -->
     <exec executable="${src.packages.home}/search4j/configure" os="${os.unix}" dir="${src.packages.home}/search4j"><arg line="--bindir=${basedir}/bin"/></exec>
     <exec executable="make" os="${os.unix}" dir="${src.packages.home}/search4j"/>
 
-    <!-- install -->
+  <!-- install -->
     <copy todir="bin"><fileset dir="${src.packages.home}/search4j" includes="search4j,search4j.exe"/></copy>
     <if><bool><istrue value="${current.os.isunix}"/></bool>
@@ -1383 +1390 @@
       dest="${gs2build.home}/common-src/indexers/packages/windows/iconv"/>
   </target>
-    
+  
   <!-- downloads a good XML-Parser -->
   <target name="get-macos-extra" depends="init" if="need.macos.extra">
@@ -1529 +1536 @@
     <!-- run the setup script -->
     <!-- <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>-->
-     <!--Above does not work: even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant--> 
-    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}">
+    <!--Above does not work: even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant--> 
+    <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}">
       <arg value="/f"/>
       <arg value="win32.mak"/>