Changeset 29242 for main/trunk/release-kits/kits

Timestamp:

2014-08-27T15:42:11+12:00 (10 years ago)

Author:

ak19

Message:

Some recently added Nix-specific lines are now in an if block for non-windows systems.

File:

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

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

@@ -136 +136 @@
         <!-- insert an xml parser (matched to the version of Perl being used by the release kit). 
              For Linux 64 bit, use the 64 bit versions. 
-             For other cases, including Macs, we stick to the 32 bit 
+             For other *nix cases, including Macs, we stick to the 32 bit 
              versions since there have been no problems yet, probably
              because our Mac has 5.12 which is not included in 
              XML-Parser so that our mac then tries to find the xml 
              parser on the system.-->
-        <copy todir="compiled/gs2build/perllib/cpan">
-            <fileset dir="${rk.home}/shared/linux/XML-Parser" includes="${bitness}-bit/**/*"/>
-        </copy>
-        <move file="compiled/gs2build/perllib/cpan/${bitness}-bit" tofile="compiled/gs2build/perllib/cpan/XML-Parser"/>
-
+        <if><bool><not><equals arg1="${rk.os}" arg2="windows"/></not></bool>     
+            <copy todir="compiled/gs2build/perllib/cpan">
+                <fileset dir="${rk.home}/shared/linux/XML-Parser" includes="${bitness}-bit/**/*"/>
+            </copy>
+            <move file="compiled/gs2build/perllib/cpan/${bitness}-bit" tofile="compiled/gs2build/perllib/cpan/XML-Parser"/>
+        </if>
+            
         <!-- insert ant -->
         <property name="insert.ant.version" value="1.8.2"/>