Changeset 29236

Timestamp:

2014-08-26T15:32:52+12:00 (10 years ago)

Author:

ak19

Message:

1. Delete windows formatconverter.exe binary in linux and mac GS3 binaries and delete the linux/mac formatconverter binary in a Windows GS3 binary. 2. Delete the Lucene 3 ext/solr subfolders for a release binary, since we've moved to Lucene 4.

File:

• main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml (modified) (2 diffs)

main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

@@ -117 +117 @@
             <move file="${basedir}/compiled/ext/gnome-lib-minimal" todir="compiled/gs2build/ext"/>
         </if>
+        
+        <!-- Delete Lucene 3.3 specific ext/solr folders, since we've switched over to Lucene 4.7.2 -->
+        <delete dir="${basedir}/compiled/ext/solr/lib3" />
+        <delete dir="${basedir}/compiled/ext/solr/conf3" />
+        <delete dir="${basedir}/compiled/ext/solr/etc3" />
 
           
@@ -168 +173 @@
         <antcall target="strip-svn-dirs"><param name="dir" value="compiled"/></antcall>
 
+        <!-- get rid of bin/formatconverter on windows and get rid of bin/formatconverter.exe on linux/mac -->
+        <if>
+            <bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+                <delete file="compiled/bin/formatconverter"/>
+            <else>
+                <delete file="compiled/bin/formatconverter.exe"/>
+            </else>
+        </if>       
+        
         <!-- (linux only) -->
         <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>