Ignore:
Timestamp:
2011-01-05T12:56:10+13:00 (13 years ago)
Author:
sjm84
Message:

Several release-kit improvements, including the ability to create x64 bit releases by setting x64:true in the rk2-build.properties file

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/release-kits/shared/core/ant-scripts/wrap.xml

    r23493 r23525  
    8989
    9090            <!-- create an object file (extension .o) for each file to bundle -->
     91            <if><bool><equals arg1="${x64}" arg2="true"/></bool>
    9192            <exec executable="/usr/bin/objcopy" dir="wrapped-installer">
    92                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone_jar_start=greenstonejar --readonly-text greenstone.jar greenstone.jar.o"/>
     93              <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_greenstone_jar_start=greenstonejar --readonly-text greenstone.jar greenstone.jar.o"/>
    9394            </exec>
    9495            <exec executable="/usr/bin/objcopy" dir="wrapped-installer">
    95                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
     96              <arg line="-I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
    9697            </exec>
     98
     99            <else>
     100              <exec executable="/usr/bin/objcopy" dir="wrapped-installer">
     101                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone_jar_start=greenstonejar --readonly-text greenstone.jar greenstone.jar.o"/>
     102              </exec>
     103              <exec executable="/usr/bin/objcopy" dir="wrapped-installer">
     104                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
     105              </exec>
     106             </else>
     107            </if>
    97108
    98109            <!-- compile libsearch4j -->
Note: See TracChangeset for help on using the changeset viewer.