Changeset 17596 for release-kits/lirk3


Ignore:
Timestamp:
2008-10-24T10:59:47+13:00 (14 years ago)
Author:
oranfry
Message:

changes to exclude sourcecode from the binary release, use nicer target names and icons

Location:
release-kits/lirk3
Files:
5 edited

Legend:

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

    r17466 r17596  
    1515    <property name="rk.home" value="${lirk3.home}" />
    1616    <property name="rk.os" value="linux" />
    17 
     17    <property name="os.suffix" value="linux"/>
    1818
    1919    <!-- IMPORT OTHER ANT SCRIPTS -->
  • release-kits/lirk3/ant-scripts/create-installer.xml

    r17538 r17596  
    55        <antcall target="copy-installer-files"/>
    66        <antcall target="make-installer-files-concrete"><param name="java.os" value="linux"/></antcall> <!-- from rk3-targets -->
    7         <antcall target="compile-installer"/>
     7        <antcall target="compile-binary-installer"/> <!-- from init -->
     8        <antcall target="compile-minimal-installer"/> <!-- from init -->
     9        <antcall target="compile-source-installer"/> <!-- from init -->
     10
    811    </target>
    912
    1013    <target name="copy-installer-files">
    11         <echo>Getting things ready to compile the installer</echo>
     14
    1215        <mkdir dir="${basedir}/installer/resources"/>
    1316        <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml" overwrite="true" />
     
    2629    </target>
    2730
    28     <target name="compile-installer">
    29 
    30         <installer file="${basedir}/installer/greenstone3.jar"
    31                 compress="true"
    32                 extractType="NonExtractor"
    33                 installConfig="${basedir}/installer/antinstall-config.xml"
    34                 buildFile="${basedir}/installer/build.xml"
    35                 antInstallLib="${lirk3.home}/packages/ant-installer/lib"
    36                 antLib="${lirk3.home}/packages/ant/lib"
    37                 validateConfig="true"
    38                 icons="bluecurve">
    39 
    40             <zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
    41             <zipfileset dir="${basedir}/components" includes="*.lzma"/>
    42         </installer>
    43 
    44         <dcff
    45             file="${basedir}/installer/antinstall-config.xml"
    46             startTag=".*&lt;!-- start full --&gt;"
    47             endTag=".*&lt;!-- end full --&gt;"/>
    48 
    49         <installer file="${basedir}/installer/Greenstone-${version}-linux-minimal.jar"
    50                 compress="true"
    51                 extractType="NonExtractor"
    52                 installConfig="${basedir}/installer/antinstall-config.xml"
    53                 buildFile="${basedir}/installer/build.xml"
    54                 antInstallLib="${lirk3.home}/packages/ant-installer/lib"
    55                 antLib="${lirk3.home}/packages/ant/lib"
    56                 validateConfig="true"
    57                 icons="bluecurve">
    58 
    59             <zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
    60             <zipfileset dir="${basedir}/components" includes="core.lzma"/>
    61         </installer>
    62 
    63 
    64     </target>
    65 
    6631</project>
  • release-kits/lirk3/ant-scripts/wrap.xml

    r17446 r17596  
    1717        <!-- copy bundled files -->
    1818        <copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/linux/${linux-java.installer}"/>
    19         <copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
     19        <copy tofile="${basedir}/wrapped-installer/build/greenstone3.jar" file="${basedir}/installer/Greenstone-${version}-${os.suffix}.jar"/>
    2020
    2121        <!-- substitute the real java installer filename and min version into various files -->
     
    6262        <echo level="info">relink, bundling the files to be bundled</echo>
    6363        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
    64             <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone3.jar.o java.o"/>
     64            <arg line="-static -static-libgcc -o  ../Greenstone-${version}-${os.suffix}.bin wrapper.o libsearch4j.o greenstone3.jar.o java.o"/>
    6565        </exec>
    6666
  • release-kits/lirk3/installer/antinstall-config.xml

    r17538 r17596  
    4646
    4747        <target
    48             target="install-core-components"
     48            target="Installing Core System"
    4949            diskRequirement="@component.size.core@"
    5050            defaultValue="true"
     
    5252            force="true"/>
    5353
    54         <!-- start full -->
     54        <!-- start bundled components -->
    5555        <target
    56             target="install-tomcat"
     56            target="Installing Tomcat"
    5757            diskRequirement="@component.size.tomcat@"
    5858            defaultValue="true"
     
    6060
    6161        <target
    62             target="install-ant"
     62            target="Installing Ant"
    6363            diskRequirement="@component.size.ant@"
    6464            defaultValue="true"
    6565            displayText=""/>
    66         <!-- end full -->
     66        <!-- end bundled components -->
    6767
     68        <!-- start sourcecode -->
    6869        <target
    69             target="install-source-code"
     70            target="Installing Source Code"
    7071            diskRequirement="@component.size.sourcecode@"
    7172            defaultValue="false"
    7273            displayText=""/>
     74        <!-- end sourcecode -->
    7375
    7476    </page>
    7577
    76     <page type="input" name="tomcat-config" ifProperty="(${install-tomcat}==true)" displayText="">
     78    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
    7779
    7880        <text property="tomcat.server" defaultValue="localhost" displayText=""/>
     
    8284    </page>
    8385
    84     <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText="">
    85     </page>
     86    <page type="progress" name="progress" showTargets="true" displayText=""/>
    8687
    8788</installer>
  • release-kits/lirk3/installer/build.xml

    r17470 r17596  
    1717    <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
    1818
    19     <target name="install-core-components" depends="">
     19    <target name="Installing Core System" depends="">
    2020
    2121        <!-- create the installation directory -->
     
    8181
    8282    <!-- Source -->
    83     <target name="install-source-code" depends="">
     83    <target name="Installing Source Code" depends="">
    8484
    8585        <echo>Installing Source Code</echo>
     
    9393    </target>
    9494
    95     <target name="install-tomcat">
     95    <target name="Installing Tomcat">
    9696        <echo>Installing Tomcat (packages/tomcat)</echo>
    9797        <mkdir dir="packages"/>
     
    116116    </target>
    117117
    118     <target name="install-ant">
     118    <target name="Installing Ant">
    119119        <echo>Installing Ant (packages/ant)</echo>
    120120        <mkdir dir="packages"/>
     
    130130    </target>
    131131
    132     <target name="cleanuptarget"></target>
    133    
    134132</project>
Note: See TracChangeset for help on using the changeset viewer.