Ignore:
Timestamp:
2008-03-28T12:43:46+13:00 (16 years ago)
Author:
oranfry
Message:

changes to the wrapper and installer logic, and a few changes to init and compile stuff

File:
1 edited

Legend:

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

    r15104 r15142  
    33<!--
    44        ..........................................................
    5         September 2007
    6         Greenstone3 'release maker' script
    7         Oran Fry
     5         September 2007
     6         Greenstone3 'release maker' script
     7         Oran Fry
    88        ..........................................................
    99-->
    1010
    1111<project name="lirk3-wrap" default="wrap">
    12 
    1312
    1413    <target name="wrap">
     
    2524            <mkdir dir="${basedir}/wrapped-installer/build"/>
    2625            <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/wrapper/mywrapper.c"/>
     26
     27            <!-- copy bundled files -->
     28            <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/search4j/search4j"/>
     29            <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/wrapper/${java.installer}"/>
    2730            <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
     31
     32            <!-- substitute the real java installer filename and min version into various files -->
     33            <rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.installer@" replacement="${java.installer}"/>
     34            <rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.extracted@" replacement="${java.extracted}"/>
     35            <rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.min.version@" replacement="${java.min.version}"/>
    2836
    2937        </if>
     
    3745                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_jar_start=greenstone3jar --readonly-text greenstone3.jar greenstone3.jar.o"/>
    3846            </exec>
     47            <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
     48                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_search4j_start=search4j --readonly-text search4j search4j.o"/>
     49            </exec>
     50            <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
     51                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${java.installer}_start=java --readonly-text ${java.installer} java.o"/>
     52            </exec>
    3953
    40             <echo level="info">create a header file declaring the bundled files and their sizes</echo>
     54
     55            <echo level="info">create a header file declaring bundled greenstone.jar and search4j</echo>
    4156            <delete file="mywrapper.h"/>
    4257
    4358            <!-- greenstone.jar -->
    44             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls">
    45                 <arg line="-l greenstone3.jar"/>
    46             </exec>
    47             <!--<echo level="info">ls: ${greenstone3.jar.ls}</echo>-->
    48             <exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size">
    49                 <arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/>
    50             </exec>
    51             <!--<echo level="info">size: ${greenstone3.jar.size}</echo>-->
    52             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h">
    53                 <arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/>
    54             </exec>
     59            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls"><arg line="-l greenstone3.jar"/></exec>
     60            <exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
     61            <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
     62
     63            <!-- search4j -->
     64            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="search4j.ls"><arg line="-l search4j"/></exec>
     65            <exec executable="sed" inputstring="${search4j.ls}" outputproperty="search4j.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
     66            <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
     67
    5568
    5669            <echo level="info">compile the wrapper program</echo>
     
    6174            <echo level="info">link, bundling the files to be bundled</echo>
    6275            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    63                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin mywrapper.o greenstone3.jar.o"/>
     76                <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin mywrapper.o greenstone3.jar.o search4j.o"/>
    6477            </exec>
     78
     79
     80            <echo level="info">add java to the header file</echo>
     81            <!-- java -->
     82            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${java.installer}"/></exec>
     83            <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
     84            <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
     85            <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
     86
     87            <echo level="info">recompile the wrapper program</echo>
     88            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
     89                <arg line="-Wall -static -static-libgcc -c -o mywrapper.o mywrapper.c"/>
     90            </exec>
     91
     92            <echo level="info">relink, bundling the files to be bundled</echo>
     93            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
     94                <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-jre.bin mywrapper.o greenstone3.jar.o search4j.o java.o"/>
     95            </exec>
     96
     97
    6598
    6699        </if>
Note: See TracChangeset for help on using the changeset viewer.