Changeset 29205 for main/trunk/release-kits

Timestamp:

2014-08-14T19:54:44+12:00 (10 years ago)

Author:

sjm84

Message:

64 bit linux requires the 64 bit XML-Parser perl folders. Note that Macs, despite being 64 bit, still get the original 32 bit XML-Parser perl folders from svn, since there have been no problems on the Mac (but only because our test mac machines ultimately find the perl XML Parser on the system. So we may need to create .bundle files for XML-Parser versions 5.6, .8, .8-mt, .10 and .14 in future).

File:

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

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

@@ -118 +118 @@
         </if>
 
-        <!-- insert an xml parser (matched to the version of Perl being used by the release kit) -->
+          
+        <if><bool><and>
+              <equals arg1="${rk.os}" arg2="linux"/>
+              <equals arg1="${extension-x64}" arg2="-x64"/>
+          </and></bool>
+          <property name="bitness" value="64"/>
+          <else>
+            <property name="bitness" value="32"/>
+          </else>
+        </if>
+
+        <!-- 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 
+             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" includes="XML-Parser/**/*"/>
+            <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"/>
 
         <!-- insert ant -->