Ignore:
Timestamp:
2008-08-08T13:07:16+12:00 (16 years ago)
Author:
oranfry
Message:

getting rid of unneeded if wrappers to each target as hacked ant now takes care of that, and replacing calls to custom task addressed calls to builtin antcall, which has been hacked in ant

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release-kits/lirk3/ant-scripts/wrap.xml

    r16243 r16684  
    33
    44    <target name="wrap">
    5         <addressedcall target="setup-for-wrapping"/>
    6         <addressedcall target="compile-wrapper"/>
     5        <antcall target="setup-for-wrapping"/>
     6        <antcall target="compile-wrapper"/>
    77    </target>
    88
    99    <target name="setup-for-wrapping">
    10         <if><bool><istrue value="${execute}"/></bool>
    1110
    12             <!-- create and setup the build directory -->
    13             <mkdir dir="${basedir}/wrapped-installer/build"/>
    14             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/wrapper.cpp" overwrite="true" />
    15             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.cpp" overwrite="true" />
    16             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.h" overwrite="true" />
     11        <!-- create and setup the build directory -->
     12        <mkdir dir="${basedir}/wrapped-installer/build"/>
     13        <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/wrapper.cpp" overwrite="true" />
     14        <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.cpp" overwrite="true" />
     15        <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/libsearch4j.h" overwrite="true" />
    1716
    18             <!-- copy bundled files -->
    19             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/>
    20             <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
    21             <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3-with-java.jar"/>
     17        <!-- copy bundled files -->
     18        <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/>
     19        <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
     20        <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3-with-java.jar"/>
    2221
    23             <!-- substitute the real java installer filename and min version into various files -->
    24             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/>
    25             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone3"/>
    26             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
    27             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
     22        <!-- substitute the real java installer filename and min version into various files -->
     23        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/>
     24        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone3"/>
     25        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
     26        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
    2827
    29         </if>
    3028    </target>
    3129
    3230    <target name="compile-wrapper">
    33         <if><bool><istrue value="${execute}"/></bool>
    34 
    35             <echo level="info">create an object file (extension .o) for each file to bundle</echo>
    36             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    37                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_jar_start=greenstone3jar --readonly-text greenstone3.jar greenstone3.jar.o"/>
    38             </exec>
    39             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    40                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_with_java_jar_start=greenstone3jar --readonly-text greenstone3-with-java.jar greenstone3-with-java.jar.o"/>
    41             </exec>
    42             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    43                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
    44             </exec>
     31        <echo level="info">create an object file (extension .o) for each file to bundle</echo>
     32        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
     33            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_jar_start=greenstone3jar --readonly-text greenstone3.jar greenstone3.jar.o"/>
     34        </exec>
     35        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
     36            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_with_java_jar_start=greenstone3jar --readonly-text greenstone3-with-java.jar greenstone3-with-java.jar.o"/>
     37        </exec>
     38        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
     39            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
     40        </exec>
    4541
    4642
    47             <!-- get size of greenstone.jar -->
    48             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls"><arg line="-l greenstone3.jar"/></exec>
    49             <exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
     43        <!-- get size of greenstone.jar -->
     44        <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls"><arg line="-l greenstone3.jar"/></exec>
     45        <exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    5046
    51             <!-- get size of greenstone-with-java.jar -->
    52             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3-with-java.jar.ls"><arg line="-l greenstone3-with-java.jar"/></exec>
    53             <exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
     47        <!-- get size of greenstone-with-java.jar -->
     48        <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3-with-java.jar.ls"><arg line="-l greenstone3-with-java.jar"/></exec>
     49        <exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    5450
    55             <!-- get size of java -->
    56             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
    57             <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
     51        <!-- get size of java -->
     52        <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
     53        <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    5854
    5955
    60             <echo level="info">creating the header file for no java version</echo>
    61             <delete file="wrapper.h"/>
    62             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
     56        <echo level="info">creating the header file for no java version</echo>
     57        <delete file="wrapper.h"/>
     58        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
    6359
    64             <echo level="info">compile the wrapper program</echo>
    65             <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    66                 <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
    67             </exec>
     60        <echo level="info">compile the wrapper program</echo>
     61        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
     62            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
     63        </exec>
    6864
    69             <echo level="info">compile libsearch4j</echo>
    70             <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    71                 <arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/>
    72             </exec>
     65        <echo level="info">compile libsearch4j</echo>
     66        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
     67            <arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/>
     68        </exec>
    7369
    74             <echo level="info">link, bundling the files to be bundled</echo>
    75             <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    76                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o"/>
    77             </exec>
     70        <echo level="info">link, bundling the files to be bundled</echo>
     71        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
     72            <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o"/>
     73        </exec>
    7874
    7975
    80             <echo level="info">creating the header file for bundled java version</echo>
    81             <delete file="wrapper.h"/>
    82             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
    83             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
    84             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
     76        <echo level="info">creating the header file for bundled java version</echo>
     77        <delete file="wrapper.h"/>
     78        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
     79        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
     80        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
    8581
    86             <echo level="info">recompile the wrapper program</echo>
    87             <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    88                 <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
    89             </exec>
     82        <echo level="info">recompile the wrapper program</echo>
     83        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
     84            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
     85        </exec>
    9086
    91             <echo level="info">relink, bundling the files to be bundled</echo>
    92             <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    93                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone3-with-java.jar.o java.o"/>
    94             </exec>
     87        <echo level="info">relink, bundling the files to be bundled</echo>
     88        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
     89            <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone3-with-java.jar.o java.o"/>
     90        </exec>
    9591
    96         </if>
    9792    </target>
    9893
Note: See TracChangeset for help on using the changeset viewer.