Ignore:
Timestamp:
2008-06-27T17:20:22+12:00 (16 years ago)
Author:
oranfry
Message:

have lirk3 change the GLI version numbers

Location:
release-kits/lirk3/ant-scripts
Files:
3 edited

Legend:

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

    r16187 r16243  
    1616    <property name="bundled.version.tomcat" value="5.5.25"/>
    1717    <property name="bundled.version.ant" value="1.6.5"/>
     18
     19    <!-- set current month and year-->
     20    <exec executable="date" outputproperty="current.month"><arg value="+%b"/></exec>
     21    <exec executable="date" outputproperty="current.year"><arg value="+%Y"/></exec>
    1822
    1923    <!-- for the benefit of the shared scripts, set release-kit home -->
  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r16172 r16243  
    77        <addressedcall target="export-greenstone3" />
    88        <addressedcall target="dist-set-version-number-property" />
     9        <addressedcall target="dist-set-gli-version" />
    910        <addressedcall target="create-distributions-1" />
    1011        <addressedcall target="create-distributions-2" />
     
    3031        </if>
    3132    </target>
     33
     34    <target name="dist-set-gli-version">
     35        <if><bool><istrue value="${execute}"/></bool>
     36            <ant antfile="${lirk3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/>
     37        </if>
     38    </target>
     39
    3240
    3341    <target name="create-distributions-1">
  • 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
Note: See TracChangeset for help on using the changeset viewer.