Changeset 17396

Show
Ignore:
Timestamp:
26.09.2008 17:37:32 (11 years ago)
Author:
oranfry
Message:

componentised releases in wirk2

Location:
release-kits/lirk2
Files:
1 added
5 modified

Legend:

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

    r17316 r17396  
    1616    <property name="rk.os" value="linux" /> 
    1717 
     18    <property name="bundled.version.ghostscript" value=""/> 
     19    <property name="bundled.version.imagemagick" value=""/> 
     20     
    1821    <!-- IMPORT OTHER ANT SCRIPTS --> 
    1922    <import file="shared-ant-scripts/init.xml"/> 
     
    2225    <import file="compile.xml"/> 
    2326    <import file="create-distribution.xml"/> 
     27    <import file="create-components.xml"/> 
    2428    <import file="create-installer.xml"/> 
    2529    <import file="wrap.xml"/> 
     
    2933        <antcall target="compile"/> 
    3034        <antcall target="create-distribution"/> 
     35        <antcall target="create-components"/> 
    3136        <antcall target="create-installer"/> 
    3237        <antcall target="wrap"/> 
  • release-kits/lirk2/ant-scripts/create-installer.xml

    r17352 r17396  
    1515        <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1616            <fileset dir="${lirk2.home}/greenstone2/installer-classes"/> 
     17            <fileset file="${basedir}/distributions/web/LICENSE.txt"/> 
    1718        </copy> 
     19 
    1820        <unjar src="${lirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/> 
    1921        <delete dir="${basedir}/installer/classes/META-INF"/> 
     22 
     23        <unjar src="${lirk2.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/> 
     24        <delete dir="${basedir}/installer/classes/META-INF"/> 
     25 
    2026        <unjar src="${lirk2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/> 
    2127        <delete dir="${basedir}/installer/classes/META-INF"/> 
     
    2430    <target name="compile-installer"> 
    2531 
    26         <!-- create the installer with java --> 
     32        <!-- create the full installer --> 
    2733        <installer file="${basedir}/installer/Greenstone-${version}-linux.jar" 
    2834                compress="true" 
     
    3743 
    3844            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
    39             <zipfileset dir="${basedir}/distributions/web" includes="**/*"/> 
     45            <zipfileset dir="${basedir}/components" includes="*.lzma"/> 
    4046 
    4147        </installer> 
     48 
     49        <dcff 
     50            file="${basedir}/installer/antinstall-config.xml" 
     51            startTag=".*&lt;!-- start full --&gt;" 
     52            endTag=".*&lt;!-- end full --&gt;"/> 
     53 
     54        <!-- create the minimal installer --> 
     55        <installer file="${basedir}/installer/Greenstone-${version}-linux-minimal.jar" 
     56                compress="true" 
     57                extractType="NonExtractor" 
     58                installConfig="${basedir}/installer/antinstall-config.xml" 
     59                buildFile="${basedir}/installer/build.xml" 
     60                antInstallLib="${lirk2.home}/packages/ant-installer/lib" 
     61                antLib="${lirk2.home}/packages/ant/lib" 
     62                validateConfig="true" 
     63                failOnError="false" 
     64                icons="bluecurve"> 
     65 
     66            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
     67            <zipfileset dir="${basedir}/components" includes="core.lzma"/> 
     68 
     69        </installer> 
     70 
    4271 
    4372    </target> 
  • release-kits/lirk2/ant-scripts/wrap.xml

    r17352 r17396  
    4949        <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
    5050 
    51         <echo level="info">compile the wrapper program</echo> 
    52         <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
    53             <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/> 
    54         </exec> 
    55  
    5651        <echo level="info">compile libsearch4j</echo> 
    5752        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
     
    6560        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec> 
    6661 
     62        <echo level="info">compile the wrapper program</echo> 
     63        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
     64            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/> 
     65        </exec> 
     66 
    6767        <echo level="info">link the compiled code and bundled files</echo> 
    6868        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
  • release-kits/lirk2/installer/antinstall-config.xml

    r17280 r17396  
    4040            force="true"/> 
    4141 
    42         <!-- start bundled java only --> 
     42        <!-- start full --> 
    4343        <target 
    44             target="install-java" 
     44            target="install-linux-jre" 
    4545            diskRequirement="@component.size.linux-java@" 
    4646            displayText="" 
    4747            defaultValue="true"/> 
    48         <!-- end bundled java only --> 
     48        <!-- end full --> 
    4949 
    5050        <target 
  • release-kits/lirk2/installer/build.xml

    r17257 r17396  
    1616    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/> 
    1717    <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/> 
     18    <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/> 
    1819 
    1920    <condition property="bundled.java.exists"> 
    20         <available file="../@java.extracted@/bin/java"/> 
     21        <available file="../@linux-java.extracted@/bin/java"/> 
    2122    </condition> 
    2223 
     
    3233 
    3334        <echo>Installing Core Files</echo> 
    34         <unzip src="${antinstaller.jar}" dest="${installDir}"> 
    35             <patternset> 
    36                 <include name="gli/**/*"/> 
    37                 <include name="bin/**/*"/> 
    38                 <include name="cgi-bin/**/*"/> 
    39                 <include name="etc/**/*"/> 
    40                 <include name="mappings/**/*"/> 
    41                 <include name="images/**/*"/> 
    42                 <include name="perllib/**/*"/> 
    43                 <include name="indexers/**/*"/> 
    44                 <include name="macros/**/*"/> 
    45                 <include name="collect/**/*"/> 
    46  
    47                 <include name="Install.sh"/> 
    48                 <include name="setup.bash"/> 
    49                 <include name="setup.csh"/> 
    50                 <include name="LICENSE.txt"/> 
    51                 <include name="READMEar.txt"/> 
    52                 <include name="READMEen.txt"/> 
    53                 <include name="READMEes.txt"/> 
    54                 <include name="READMEfr.txt"/> 
    55                 <include name="READMEes.txt"/> 
    56                 <include name="Support.htm"/> 
    57                 <include name="Uninstall.jar"/> 
    58             </patternset> 
    59         </unzip> 
    60         <echo/> 
     35        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip> 
     36        <sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/> 
     37        <delete file="core.lzma"/> 
     38        <unzip src="${basedir}/core.comp" dest="${installDir}"/> 
     39        <delete file="core.comp"/> 
    6140 
    6241        <echo>Setting Binaries to Executable</echo> 
     
    11998    <target name="install-source-code" depends=""> 
    12099        <echo>Installing Source Code</echo> 
    121         <unzip src="${antinstaller.jar}" dest="${installDir}"> 
    122             <patternset> 
    123                 <include name="common-src/**/*"/> 
    124                 <include name="runtime-src/**/*"/> 
    125                 <include name="build-src/**/*"/> 
    126                 <include name="packages/**/*"/> 
    127             </patternset> 
    128         </unzip> 
     100        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip> 
     101        <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/> 
     102        <delete file="sourcecode.lzma"/> 
     103        <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/> 
     104        <delete file="sourcecode.comp"/> 
    129105    </target> 
    130106 
    131     <target name="install-java"> 
     107    <target name="install-linux-jre"> 
    132108        <echo>Installing bundled java</echo> 
    133109        <copy todir="${installDir}/packages/jre"> 
    134             <fileset dir="../@java.extracted@"/> 
     110            <fileset dir="../@linux-java.extracted@"/> 
    135111        </copy> 
    136112        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>