Ignore:
Timestamp:
2008-06-13T12:38:22+12:00 (16 years ago)
Author:
oranfry
Message:

have lirk2 get the linux general stuff

Location:
release-kits/lirk2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • release-kits/lirk2

    • Property svn:externals

      •  

        old new  
        11lib http://svn.greenstone.org/release-kits/shared/lib
        22search4j http://svn.greenstone.org/release-kits/shared/search4j
         3linux http://svn.greenstone.org/release-kits/shared/linux
        34

  • release-kits/lirk2/ant-scripts/wrap.xml

    r15205 r15980  
    99-->
    1010
    11 <project name="lirk3-wrap" default="wrap">
     11<project name="lirk2-wrap" default="wrap">
    1212
    1313    <target name="wrap">
    1414        <addressedcall target="setup-for-wrapping"/>
    1515        <addressedcall target="compile-wrapper"/>
    16         <addressedcall target="clean-up-after-wrapping"/>
    1716    </target>
    1817
    … …  
    2322            <!-- create and setup the build directory -->
    2423            <mkdir dir="${basedir}/wrapped-installer/build"/>
    25             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/wrapper/mywrapper.c"/>
     24            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/wrapper.cpp"/>
    2625
    2726            <!-- 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}"/>
    30             <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
    31             <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3-with-java.jar"/>
     27            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/search4j/search4j"/>
     28            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/wrapper/${java.installer}"/>
     29            <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/gsdl-${version}-linux.jar"/>
     30            <copy tofile="${basedir}/wrapped-installer/build/greenstone2-with-java.jar" file="${basedir}/installer/gsdl-${version}-linux-with-java.jar"/>
    3231
    33             <!-- substitute the real java installer filename and min version into various files -->
    34             <rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.installer@" replacement="${java.installer}"/>
    35             <rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.extracted@" replacement="${java.extracted}"/>
    36             <rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.min.version@" replacement="${java.min.version}"/>
     32            <!-- substitute in real values -->
     33            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
     34            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${java.extracted}"/>
     35            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
    3736
    3837        </if>
    … …  
    4443            <echo level="info">create an object file (extension .o) for each file to bundle</echo>
    4544            <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    46                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_jar_start=greenstone3jar --readonly-text greenstone3.jar greenstone3.jar.o"/>
     45                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_jar_start=greenstone2jar --readonly-text greenstone2.jar greenstone2.jar.o"/>
    4746            </exec>
    4847            <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    49                 <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"/>
     48                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_with_java_jar_start=greenstone2jar --readonly-text greenstone2-with-java.jar greenstone2-with-java.jar.o"/>
    5049            </exec>
    5150            <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
    … …  
    5655            </exec>
    5756
    58 
    5957            <!-- get size of greenstone.jar -->
    60             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls"><arg line="-l greenstone3.jar"/></exec>
    61             <exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
     58            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec>
     59            <exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    6260
    6361            <!-- get size of greenstone-with-java.jar -->
    64             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3-with-java.jar.ls"><arg line="-l greenstone3-with-java.jar"/></exec>
    65             <exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
     62            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2-with-java.jar.ls"><arg line="-l greenstone2-with-java.jar"/></exec>
     63            <exec executable="sed" inputstring="${greenstone2-with-java.jar.ls}" outputproperty="greenstone2-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    6664
    6765            <!-- get size of search4j -->
    … …  
    7371            <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
    7472
    75 
    7673            <echo level="info">creating the header file for no java version</echo>
    77             <delete file="mywrapper.h"/>
    78             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
    79             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
     74            <delete file="wrapper.h"/>
     75            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.jar.size}];"/></exec>
     76            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
    8077
    8178            <echo level="info">compile the wrapper program</echo>
    8279            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    83                 <arg line="-Wall -static -static-libgcc -c -o mywrapper.o mywrapper.c"/>
     80                <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
    8481            </exec>
    8582
    8683            <echo level="info">link, bundling the files to be bundled</echo>
    8784            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    88                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin mywrapper.o greenstone3.jar.o search4j.o"/>
     85                <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o greenstone2.jar.o search4j.o"/>
    8986            </exec>
    9087
    91 
    9288            <echo level="info">creating the header file for bundled java version</echo>
    93             <delete file="mywrapper.h"/>
    94             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
    95             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
    96             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
    97             <exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
     89            <delete file="wrapper.h"/>
     90            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2-with-java.jar.size}];"/></exec>
     91            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
     92            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
     93            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
    9894
    9995            <echo level="info">recompile the wrapper program</echo>
    10096            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    101                 <arg line="-Wall -static -static-libgcc -c -o mywrapper.o mywrapper.c"/>
     97                <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
    10298            </exec>
    10399
    104100            <echo level="info">relink, bundling the files to be bundled</echo>
    105101            <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    106                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin mywrapper.o greenstone3-with-java.jar.o search4j.o java.o"/>
     102                <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o greenstone2-with-java.jar.o search4j.o java.o"/>
    107103            </exec>
    108 
    109 
    110104
    111105        </if>
    112106    </target>
    113107
    114     <target name="clean-up-after-wrapping">
    115         <if><bool><istrue value="${execute}"/></bool>
    116             <delete dir="${basedir}/wrapped-installer/build"/>
    117         </if>
    118     </target>
    119 
    120 
    121 
    122108</project>
Note: See TracChangeset for help on using the changeset viewer.