Changeset 29205

Show
Ignore:
Timestamp:
14.08.2014 19:54:44 (5 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).

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

    r28512 r29205  
    118118        </if> 
    119119 
    120         <!-- insert an xml parser (matched to the version of Perl being used by the release kit) --> 
     120           
     121        <if><bool><and> 
     122              <equals arg1="${rk.os}" arg2="linux"/> 
     123              <equals arg1="${extension-x64}" arg2="-x64"/> 
     124          </and></bool> 
     125          <property name="bitness" value="64"/> 
     126          <else> 
     127            <property name="bitness" value="32"/> 
     128          </else> 
     129        </if> 
     130 
     131        <!-- insert an xml parser (matched to the version of Perl being used by the release kit).  
     132             For Linux 64 bit, use the 64 bit versions.  
     133             For other cases, including Macs, we stick to the 32 bit  
     134             versions since there have been no problems yet, probably 
     135             because our Mac has 5.12 which is not included in  
     136             XML-Parser so that our mac then tries to find the xml  
     137             parser on the system.--> 
    121138        <copy todir="compiled/gs2build/perllib/cpan"> 
    122             <fileset dir="${rk.home}/shared/linux" includes="XML-Parser/**/*"/> 
     139            <fileset dir="${rk.home}/shared/linux/XML-Parser" includes="${bitness}-bit/**/*"/> 
    123140        </copy> 
     141        <move file="compiled/gs2build/perllib/cpan/${bitness}-bit" tofile="compiled/gs2build/perllib/cpan/XML-Parser"/> 
    124142 
    125143        <!-- insert ant -->