Changeset 17453 for release-kits


Ignore:
Timestamp:
2008-10-02T12:38:47+13:00 (16 years ago)
Author:
oranfry
Message:

making mac release kits use components

Location:
release-kits
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • release-kits/mark2/ant-scripts/build.xml

    r17317 r17453  
    2626    <import file="compile.xml"/>
    2727    <import file="create-distribution.xml"/>
     28    <import file="create-components.xml"/>
    2829    <import file="create-installer.xml"/>
    2930    <import file="wrap.xml"/>
    … …  
    4849        <antcall target="compile"/>
    4950        <antcall target="create-distribution"/>
     51        <antcall target="create-components"/>
    5052        <antcall target="create-installer"/>
    5153        <antcall target="wrap"/>

  • release-kits/mark2/ant-scripts/create-components.xml

    r17423 r17453  
    44    <!-- create components from the distribution folder -->
    55    <target name="create-components">
    6         <antcall target="prepare-to-create-components" />
    76        <antcall target="create-core-component" />
    87        <antcall target="create-sourcecode-component" />
    98    </target>
    109   
    11     <target name="prepare-to-create-components">
    12         <delete dir="components"/>
    13         <mkdir dir="components/tmp"/>
    14     </target>
    15 
    1610    <target name="create-core-component">
    1711        <antcall target="prepare-core-component" />
    … …  
    2519   
    2620    <target name="prepare-core-component">
     21
     22        <delete dir="components/tmp/core"/>
    2723        <mkdir dir="components/tmp/core"/>
     24
    2825        <copy todir="components/tmp/core" overwrite="true">
    2926            <fileset dir="distributions/web">
    … …  
    4542   
    4643    <target name="prepare-sourcecode-component">
     44
     45        <delete dir="components/tmp/sourcecode"/>
    4746        <mkdir dir="components/tmp/sourcecode"/>
     47
    4848        <copy todir="components/tmp/sourcecode" overwrite="true">
    4949            <fileset dir="distributions/web">

  • release-kits/mark2/ant-scripts/create-installer.xml

    r17107 r17453  
    1515        <copy todir="${basedir}/installer/classes" overwrite="true">
    1616            <fileset dir="${mark2.home}/greenstone2/installer-classes"/>
     17            <fileset file="${basedir}/distributions/web/LICENCE.txt" />
    1718        </copy>
     19
    1820        <unjar src="${mark2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
    1921        <delete dir="${basedir}/installer/classes/META-INF"/>
     22
    2023        <unjar src="${mark2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
    2124        <delete dir="${basedir}/installer/classes/META-INF"/>
     25
    2226    </target>
    2327
    … …  
    3539
    3640            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
    37             <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>
     41            <zipfileset dir="${basedir}/components" includes="*.lzma"/>
     42        </installer>
    3843
     44        <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}-minimal.jar"
     45                compress="true"
     46                extractType="NonExtractor"
     47                installConfig="${basedir}/installer/antinstall-config.xml"
     48                buildFile="${basedir}/installer/build.xml"
     49                antInstallLib="${mark2.home}/packages/ant-installer/lib"
     50                antLib="${mark2.home}/packages/ant/lib"
     51                validateConfig="true"
     52                failOnError="false"
     53                icons="bluecurve">
     54
     55            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
     56            <zipfileset dir="${basedir}/components" includes="core.lzma"/>
    3957        </installer>
     58
    4059    </target>
    4160

  • release-kits/mark3/ant-scripts/create-components.xml

    r17447 r17453  
    44    <!-- create components from the distribution folder -->
    55    <target name="create-components">
    6         <antcall target="prepare-to-create-components" />
    76        <antcall target="create-core-component" />
    87        <antcall target="create-sourcecode-component" />
    … …  
    1110    </target>
    1211
    13     <target name="prepare-to-create-components">
    14         <delete dir="components"/>
    15         <mkdir dir="components/tmp"/>
    16     </target>
    17        
    1812    <target name="create-core-component">
    1913        <antcall target="prepare-core-component" />
    … …  
    3832    <target name="prepare-core-component">
    3933
     34        <delete dir="components/tmp/core"/>
    4035        <mkdir dir="components/tmp/core"/>
    4136               
    … …  
    7469   
    7570    <target name="prepare-sourcecode-component">
     71
     72        <delete dir="components/tmp/sourcecode"/>
    7673        <mkdir dir="components/tmp/sourcecode"/>
     74
    7775        <copy todir="components/tmp/sourcecode" overwrite="true">
    7876                <fileset dir="distribution/greenstone3">
    … …  
    9290   
    9391    <target name="prepare-ant-component">
    94         <mkdir dir="components/tmp/ant"/>
     92
     93        <delete dir="components/tmp/ant">
     94        <mkdir dir="components/tmp/ant">
     95
    9596        <copy todir="components/tmp/ant" overwrite="true">
    9697            <fileset dir="distribution/greenstone3/packages">
    … …  
    107108   
    108109    <target name="prepare-tomcat-component">
     110
     111        <delete dir="components/tmp/tomcat"/>
    109112        <mkdir dir="components/tmp/tomcat"/>
     113
    110114        <copy todir="components/tmp/tomcat" overwrite="true">
    111115            <fileset dir="distribution/greenstone3/packages">

  • release-kits/mark3/ant-scripts/create-installer.xml

    r17107 r17453  
    1414        <copy todir="${basedir}/installer/classes" overwrite="true">
    1515            <fileset dir="${mark3.home}/greenstone3/installer-classes"/>
     16            <fileset file="${basedir}/distribution/greenstone3/LICENCE.txt" />
    1617        </copy>
    1718        <unjar src="${mark3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
    … …  
    2021
    2122    <target name="compile-installer">
     23
    2224        <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"
    2325                compress="true"
    … …  
    3032                failOnError="false"
    3133                icons="bluecurve">
     34            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
     35            <zipfileset dir="${basedir}/components" includes="*.lzma"/>
     36        </installer>
    3237
    33             <!-- copy all the important files into the archive to be extracted for install -->
    34             <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
    35             <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
     38        <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}-minimal.jar"
     39                compress="true"
     40                extractType="NonExtractor"
     41                installConfig="${basedir}/installer/antinstall-config.xml"
     42                buildFile="${basedir}/installer/build.xml"
     43                antInstallLib="${mark3.home}/packages/ant-installer/lib"
     44                antLib="${mark3.home}/packages/ant/lib"
     45                validateConfig="true"
     46                failOnError="false"
     47                icons="bluecurve">
     48            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
     49            <zipfileset dir="${basedir}/components" includes="core.lzma"/>
     50        </installer>
    3651
    37         </installer>
     52
    3853    </target>
    3954

  • release-kits/mark3/installer/build.xml

    r17257 r17453  
    3030        <!-- install files -->
    3131        <echo message="Installing Files"/>
    32         <unzip src="${antinstaller.jar}" dest="${installDir}">
    33             <patternset>
    34 
    35                 <include name="bin/**/*"/>
    36                 <include name="docs/**/*"/>
    37                 <include name="gli/**/*"/>
    38                 <include name="gs2build/**/*"/>
    39                 <exclude name="gs2build/common-src/**/*"/>
    40                 <exclude name="gs2build/build-src/**/*"/>
    41                 <exclude name="gs2build/runtime-src/**/*"/>
    42                 <include name="lib/**/*"/>
    43                 <include name="web/**/*"/>
    44                 <include name="resources/**/*"/>
    45 
    46                 <include name="greenstone3-build.xml"/>
    47                 <include name="build.properties"/>
    48                 <include name="gs3-server.sh"/>
    49                 <include name="gs3-setup.sh"/>
    50                 <include name="LICENSE.txt"/>
    51                 <include name="README.txt"/>
    52                 <include name="server.jar"/>
    53                 <include name="Uninstall.jar"/>
    54             </patternset>
    55 
    56         </unzip>
    57         <echo/>
     32        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
     33        <sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/>
     34        <delete file="core.lzma"/>
     35        <unzip src="${basedir}/core.comp" dest="${installDir}"/>
     36        <delete file="core.comp"/>
    5837
    5938        <echo message="Setting Binaries to Executable"/>
    … …  
    10483    <!-- Source -->
    10584    <target name="install-source-code" depends="">
    106         <echo message="Installing Source Code (src)"/>
    107         <mkdir dir="${installDir}/src"/>
    108         <unzip src="${antinstaller.jar}" dest="${installDir}">
    109             <patternset>
    110                 <include name="src/**/*"/>
    111                 <include name="gs2build/common-src/**/*"/>
    112                 <include name="gs2build/build-src/**/*"/>
    113                 <include name="gs2build/runtime-src/**/*"/>
    114             </patternset>
    115         </unzip>
    116     </target>
    117 
    118     <target name="install-java">
    119 
    120         <echo message="Installing bundled java"/>
    121 
    122         <copy todir="${installDir}/packages/jre">
    123             <fileset dir="../@java.extracted@"/>
    124         </copy>
    125         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
    126 
    127         <echo/>
    128 
     85        <echo>Installing Source Code</echo>
     86        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
     87        <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
     88        <delete file="sourcecode.lzma"/>
     89        <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
     90        <delete file="sourcecode.comp"/>
    12991    </target>
    13092
    13193    <target name="install-tomcat">
    13294        <echo message="Installing Tomcat (packages/tomcat)"/>
    133         <!-- extract the files -->
    134         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/tomcat/**/*"/></patternset></unzip>
     95        <mkdir dir="packages"/>
     96        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="tomcat.lzma"/></patternset></unzip>
     97        <sevenzip task="decode" input="${basedir}/tomcat.lzma" output="${basedir}/tomcat.comp"/>
     98        <delete file="tomcat.lzma"/>
     99        <unzip src="${basedir}/tomcat.comp" dest="${installDir}/packages"/>
     100        <delete file="tomcat.comp"/>
    135101
    136102        <!-- change the tomcat ports in tomcats server.xml -->
    … …  
    155121        <!-- extract the files -->
    156122        <echo message="Installing Ant (packages/ant)"/>
    157         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/ant/**/*"/></patternset></unzip>
     123        <mkdir dir="packages"/>
     124        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ant.lzma"/></patternset></unzip>
     125        <sevenzip task="decode" input="${basedir}/ant.lzma" output="${basedir}/ant.comp"/>
     126        <delete file="ant.lzma"/>
     127        <unzip src="${basedir}/ant.comp" dest="${installDir}/packages"/>
     128        <delete file="ant.comp"/>
    158129
    159130        <!-- set binaries to executable -->
Note: See TracChangeset for help on using the changeset viewer.