greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16233

Show
Ignore:
Timestamp:
2008-06-27 15:49:09 (5 months ago)
Author:
oranfry
Message:

don't bundle the search4j executable, instead include libsearch4j in the wrapper executable

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r16175 r16233  
    1414                        <mkdir dir="${basedir}/wrapped-installer/build"/> 
    1515                        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/wrapper.cpp"/> 
     16                        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/libsearch4j.cpp"/> 
     17                        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/libsearch4j.h"/> 
    1618 
    1719                        <!-- copy bundled files --> 
    18                         <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/search4j"/> 
    1920                        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${linux-java.installer}"/> 
    2021                        <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/greenstone-${version}-linux.jar"/> 
    …… 
    4142                        </exec> 
    4243                        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 
    43                                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_search4j_start=search4j --readonly-text search4j search4j.o"/> 
    44                         </exec> 
    45                         <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 
    4644                                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/> 
    4745                        </exec> 
    …… 
    5553                        <exec executable="sed" inputstring="${greenstone2-with-java.jar.ls}" outputproperty="greenstone2-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> 
    …… 
    6660                        <delete file="wrapper.h"/> 
    6761                        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.jar.size}];"/></exec> 
    68                         <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec> 
    6962 
    7063                        <echo level="info">compile the wrapper program</echo> 
    …… 
    7366                        </exec> 
    7467 
     68                        <echo level="info">compile libsearch4j</echo> 
     69                        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
     70                                <arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/> 
     71                        </exec> 
     72 
    7573                        <echo level="info">link, bundling the files to be bundled</echo> 
    7674                        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
    77                                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o greenstone2.jar.o search4j.o"/> 
     75                                <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o"/> 
    7876                        </exec> 
    7977 
    …… 
    8179                        <delete file="wrapper.h"/> 
    8280                        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2-with-java.jar.size}];"/></exec> 
    83                         <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec> 
    8481                        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec> 
    8582                        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec> 
    …… 
    9289                        <echo level="info">relink, bundling the files to be bundled</echo> 
    9390                        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
    94                                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o greenstone2-with-java.jar.o search4j.o java.o"/> 
     91                                <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone2-with-java.jar.o java.o"/> 
    9592                        </exec> 
    9693