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

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

Legend:

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

    r14982 r15142  
    199199    <target name="rtftohtml-add-static">
    200200        <if><bool><istrue value="${execute}"/></bool>
    201             <rsr file="greenstone3/gs2build/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml.{2}EXEEXT.{1}" replacement="-o rtftohtml\$(EXEEXT) -static" />
     201            <rsr file="greenstone3/gs2build/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
    202202        </if>
    203203    </target>
  • release-kits/lirk3/ant-scripts/create-installer.xml

    r14982 r15142  
    1212
    1313    <target name="create-installer">
     14        <addressedcall target="setup-for-installer-creation"/>
     15        <addressedcall target="compile-installer"/>
     16        <addressedcall target="clean-up-after-installer-creation"/>
     17    </target>
     18
     19    <target name="setup-for-installer-creation">
    1420        <if><bool><istrue value="${execute}"/></bool>
    1521
    16             <echo>Project Path: ${project.path}</echo>
     22            <echo>Project Path: ${basedir}/distribution/greenstone3</echo>
    1723            <mkdir dir="${basedir}/installer"/>
     24            <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml"/>
     25            <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml"/>
     26            <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
     27            <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${java.extracted}"/>
     28           
     29        </if>
     30    </target>
     31
     32    <target name="compile-installer">
     33        <if><bool><istrue value="${execute}"/></bool>
     34
    1835            <installer file="${basedir}/installer/greenstone3.jar"
    1936                    compress="true"
    2037                    extractType="NonExtractor"
    21                     installConfig="${project.installer.path}/antinstall-config.xml"
    22                     buildFile="${project.installer.path}/build.xml"
    23                     antInstallLib="${ant.installer.home}/lib"
    24                     antLib="${ant.installer.home}/antlib"
     38                    installConfig="${basedir}/installer/antinstall-config.xml"
     39                    buildFile="${basedir}/installer/build.xml"
     40                    antInstallLib="${lirk3.home}/bin/ant-installer/lib"
     41                    antLib="${lirk3.home}/bin/ant-installer/antlib"
    2542                    validateConfig="true"
    2643                    icons="bluecurve">
    2744
    2845                <!-- copy all the important files into the archive to be extracted for install -->
    29                 <zipfileset dir="${project.installer.path}/cp" includes="resources/*"/>
     46                <zipfileset dir="${lirk3.home}/installer/cp" includes="resources/*"/>
    3047                <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
    3148
    32                 <zipfileset dir="${project.path}" includes="*"/>
    33                 <zipfileset dir="${project.path}/bin" prefix="bin"><include name="**/*"/></zipfileset>
    34                 <zipfileset dir="${project.path}/docs" prefix="docs"><include name="**/*"/></zipfileset>
    35                 <zipfileset dir="${project.path}/gli" prefix="gli"><include name="**/*"/></zipfileset>
    36                 <zipfileset dir="${project.path}/gs2build" prefix="gs2build"><include name="**/*"/></zipfileset>
    37                 <zipfileset dir="${project.path}/lib" prefix="lib"><include name="**/*"/></zipfileset>
    38                 <zipfileset dir="${project.path}/web" prefix="web"><include name="**/*"/></zipfileset>
    39                 <zipfileset dir="${project.path}/packages" prefix="packages"><include name="**/*"/></zipfileset>
    40                 <zipfileset dir="${project.path}/resources" prefix="resources"><include name="**/*"/></zipfileset>
    41                 <zipfileset dir="${project.path}/src" prefix="src"><include name="**/*"/></zipfileset>
     49                <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/>
     50                <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset>
     51                <zipfileset dir="${basedir}/distribution/greenstone3/docs" prefix="docs"><include name="**/*"/></zipfileset>
     52                <zipfileset dir="${basedir}/distribution/greenstone3/gli" prefix="gli"><include name="**/*"/></zipfileset>
     53                <zipfileset dir="${basedir}/distribution/greenstone3/gs2build" prefix="gs2build"><include name="**/*"/></zipfileset>
     54                <zipfileset dir="${basedir}/distribution/greenstone3/lib" prefix="lib"><include name="**/*"/></zipfileset>
     55                <zipfileset dir="${basedir}/distribution/greenstone3/web" prefix="web"><include name="**/*"/></zipfileset>
     56                <zipfileset dir="${basedir}/distribution/greenstone3/packages" prefix="packages"><include name="**/*"/></zipfileset>
     57                <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset>
     58                <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
    4259            </installer>
    4360
     
    4562    </target>
    4663
     64    <target name="clean-up-after-installer-creation">
     65        <if><bool><istrue value="${execute}"/></bool>
     66            <delete file="${basedir}/installer/antinstall-config.xml"/>
     67            <delete file="${basedir}/installer/build.xml"/>
     68        </if>
     69    </target>
     70
     71
    4772</project>
  • release-kits/lirk3/ant-scripts/init.xml

    r14982 r15142  
    3838    <property file="build.properties" />
    3939
    40     <!-- project details (for ant-installer) -->
    41     <property name="project.name"                   value="Greenstone3"/>
    42     <property name="project.short.name"         value="greenstone3"/>
    43     <property name="project.path"                   value="${basedir}/distribution/greenstone3"/>
    44     <property name="project.installer.path" value="${lirk3.home}/installer"/>
    45     <property name="project.version"                value="${version}"/>
    46     <property name="ant.installer.home"         value="${lirk3.home}/bin/ant-installer"/>
    47 
    4840    <!-- somewhere to store temporary text -->
    4941    <tempfile property="temp.file" destdir="${java.io.tmpdir}" prefix="delete" suffix=".tmp"/>
     42
     43    <!-- bundled java strings -->
     44    <!-- java.installer: use a filename which has only letters numbers and underscores -->
     45    <property name="java.installer" value="jre_6u5_linux_i586"/>
     46    <property name="java.extracted" value="jre1.6.0_05"/>
     47    <property name="java.min.version" value="1.5.0_00"/>
     48
    5049
    5150    <!-- stuff to do before all tasks -->
  • 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.