Changeset 10831

Timestamp:

2005-11-02T17:07:09+13:00 (18 years ago)

Author:

kjdon

Message:

untaring the XML-Parser on macs must occur after compilation, otherwise the new expat.bundle (or something) is screwed up

File:

• trunk/gsdl3/build.xml (modified) (3 diffs)

trunk/gsdl3/build.xml

@@ -1295 +1295 @@
    </target>
   
+  <!-- downloads a good XML-Parser -->
   <target name="get-macos-extra" depends="init" if="current.os.ismac">  
       <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
       dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
       usetimestamp="true"/>
+  </target>  
+
+  <!-- untars the XML-Parser. need to do this after compiling in gs2build-->
+  <target name="install-macos-extra" depends="init" if="current.os.ismac">
     <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
       dest="${gs2build.home}/perllib/cpan/"
       compression="gzip"/>
-    <delete file="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"/>
-  </target>  
-  
+  </target>
+
   <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows"/>
 
@@ -1405 +1409 @@
       <arg value="install"/>
     </exec>
+    <antcall target="install-macos-extra"/>
   </target>
     <!-- windows: -->
@@ -1526 +1531 @@
     <antcall target="clean-packages-c++"/>
     <antcall target="clean-gs2build"/>
+    <antcall target="install-macos-extra"/>
     <xslt in="build.xml" out="dist-build.xml" style="dist-resources/convert-build-xml.xsl"/>
     <delete dir="${basedir}/build"/>