Show
Ignore:
Timestamp:
27.06.2008 17:20:22 (12 years ago)
Author:
oranfry
Message:

have lirk3 change the GLI version numbers

Files:
1 modified

Legend:

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

    r16187 r16243  
    1313            <mkdir dir="${basedir}/wrapped-installer/build"/> 
    1414            <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" /> 
    1517 
    1618            <!-- copy bundled files --> 
    17             <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/packages/search4j/search4j" /> 
    1819            <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/> 
    1920            <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/> 
     
    4041            </exec> 
    4142            <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 
    42                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_search4j_start=search4j --readonly-text search4j search4j.o"/> 
    43             </exec> 
    44             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 
    4543                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/> 
    4644            </exec> 
     
    5553            <exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
    5654 
    57             <!-- get size of search4j --> 
    58             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="search4j.ls"><arg line="-l search4j"/></exec> 
    59             <exec executable="sed" inputstring="${search4j.ls}" outputproperty="search4j.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
    60  
    6155            <!-- get size of java --> 
    6256            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec> 
     
    6761            <delete file="wrapper.h"/> 
    6862            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec> 
    69             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec> 
    7063 
    7164            <echo level="info">compile the wrapper program</echo> 
     
    7467            </exec> 
    7568 
     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> 
     73 
    7674            <echo level="info">link, bundling the files to be bundled</echo> 
    7775            <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
    78                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o greenstone3.jar.o search4j.o"/> 
     76                <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o"/> 
    7977            </exec> 
    8078 
     
    8381            <delete file="wrapper.h"/> 
    8482            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec> 
    85             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec> 
    8683            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec> 
    8784            <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec> 
     
    9491            <echo level="info">relink, bundling the files to be bundled</echo> 
    9592            <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
    96                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o greenstone3-with-java.jar.o search4j.o java.o"/> 
     93                <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone3-with-java.jar.o java.o"/> 
    9794            </exec> 
    9895