Changeset 17786 for release-kits/lirk2


Ignore:
Timestamp:
2008-11-07T14:36:58+13:00 (15 years ago)
Author:
oranfry
Message:

shifted the responsibility for the source release to the linux release kit. Made the source release contain a single component with the core and sourcecode mixed together

Location:
release-kits/lirk2
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r17721 r17786  
    1313    <target name="prepare-components">
    1414        <antcall target="prepare-core-component" />
     15        <antcall target="prepare-imagemagick-component" />
     16
    1517        <antcall target="prepare-sourcecode-component" />
    16         <antcall target="prepare-imagemagick-component" />
    17         <antcall target="prepare-sourcecode-core-component" />
     18
     19        <antcall target="prepare-source-release" />
    1820    </target>
    1921
    2022    <target name="compress-components">
    2123        <antcall target="compress-core-component" />
    22         <antcall target="compress-sourcecode-component" /> 
    2324        <antcall target="compress-imagemagick-component" />
    24         <antcall target="compress-sourcecode-core-component" />
     25
     26        <!--<antcall target="compress-sourcecode-component" />-->
     27
     28        <antcall target="compress-source-release" />
    2529    </target>
    2630
    … …  
    5660    </target>
    5761
    58     <!-- sourcecode core -->
    59     <target name="prepare-sourcecode-core-component">
    60         <delete dir="components/tmp/sourcecode-core"/>
    61         <mkdir dir="components/tmp/sourcecode-core"/>
    62 
    63         <copy todir="components/tmp/sourcecode-core" overwrite="true">
    64             <fileset dir="distributions/source">
    65                 <include name="macros/**/*"/>
    66                 <include name="images/**/*"/>
    67                 <include name="etc/**/*"/>
    68                 <include name="gli/**/*"/>
    69                 <include name="collect/**/*"/>
    70                 <include name="doc/**/*"/>
    71                 <include name="setup.bash"/>
    72             </fileset>
    73         </copy>
    74         <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false" includes="**/*"/>
    75     </target>
    76    
    77     <target name="compress-sourcecode-core-component">
    78         <sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
    79     </target>
    80 
    8162    <!-- sourcecode -->
    8263    <target name="prepare-sourcecode-component">
    … …  
    9374        </copy>
    9475               
    95         <zip destfile="components/sourcecode.comp" basedir="components/tmp/sourcecode" compress="false"/>
    9676        <zip destfile="components/Greenstone-${version}-linux-sourcecode.zip"  basedir="components/tmp/sourcecode" compress="true"/>
    9777    </target>
    … …  
    120100    </target>
    121101
     102    <!-- source-release -->
     103    <target name="prepare-source-release">
     104        <delete dir="components/tmp/source-release"/>
     105        <mkdir dir="components/tmp/source-release"/>
     106
     107        <copy todir="components/tmp/source-release" overwrite="true">
     108            <fileset dir="distributions/source"/>
     109        </copy>
     110        <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false" includes="**/*"/>
     111    </target>
     112   
     113    <target name="compress-source-release">
     114        <sevenzip task="encode" input="components/source-release.comp" output="components/source-release.lzma" dictionnary="26"/>
     115    </target>
     116
     117
    122118</project>

  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r17652 r17786  
    99        <antcall target="drop-in-docs" />
    1010        <antcall target="tweak-files" />
     11        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
     12        <antcall target="drop-in-demo-collection" />
     13        <antcall target="insert-export-to-cd-package"/> <!-- from rk2-targets -->
    1114        <antcall target="remove-unneeded-files-1" />
    1215
    … …  
    1417
    1518        <antcall target="drop-in-binaries" />
    16         <antcall target="drop-in-demo-collection" />
    17         <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
    18         <antcall target="insert-export-to-cd-package"/>     <!-- from rk2-targets -->
    1919        <antcall target="export-imagemagick-linux-binaries" />
    2020        <antcall target="compile-gli" />
    … …  
    8181    <target name="remove-unneeded-files-1">
    8282        <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
    83         <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
    84         <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
    85         <delete dir="${basedir}/distributions/web/common-src/packages/windows"/>
    8683    </target>
    8784
    … …  
    126123    <target name="remove-unneeded-files-2">
    127124        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
     125        <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
     126        <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
     127        <delete dir="${basedir}/distributions/web/common-src/packages/windows"/>
    128128    </target>
    129129
    130 
    131130</project>

  • release-kits/lirk2/installer/antinstall-config.xml

    r17765 r17786  
    2525
    2626    <!--  simple intro page -->
    27     <page type="input" name="intro" displayText="">
     27    <page
     28        type="input"
     29        name="intro"
     30        displayText=""
     31        <!-- start source release -->
     32        target="Source Release"
     33        <!-- end source release -->
     34        >
     35
    2836        <comment name="welcome-message"/>
    2937    </page>
    … …  
    4250    </page>
    4351
     52    <!-- start binary release -->
    4453    <page type="input" name="selector" displayText="">
    4554        <comment name="choose-components"/>
    … …  
    5362            hidden="true"/>
    5463
    55         <!-- start binary release core -->
    5664        <target
    5765            target="Installing Core System"
    … …  
    6068            defaultValue="true"
    6169            force="true"/>
    62         <!-- end binary release core -->
    63 
    64         <!-- start source release core -->
    65         <target
    66             target="Installing Source Code Core"
    67             diskRequirement="@component.size.sourcecode-core@"
    68             displayText=""
    69             defaultValue="true"
    70             />
    71         <!-- end source release core -->
    7270
    7371        <!-- start bundled components -->
    … …  
    7977        <!-- end bundled components -->
    8078
    81         <!-- start sourcecode -->
    82         <target
    83             target="Installing Source Code"
    84             diskRequirement="@component.size.sourcecode@"
    85             defaultValue="true"
    86             displayText=""/>
    87         <!-- end sourcecode -->
    88 
    8979    </page>
    9080
    91     <!-- start binary release core -->
    9281    <page type="input" name="admin-password" displayText="">
    9382        <comment name="admin-password-expl"/>
    9483        <text property="admin.password" defaultValue="" displayText=""/>
    9584    </page>
    96     <!-- end binary release core -->
     85    <!-- end binary release -->
    9786
    9887    <page type="progress" name="progress" showTargets="true" displayText=""/>

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

    r17765 r17786  
    9898    </target>
    9999
    100     <!-- sourcecode core system -->
    101     <target name="Installing Source Code Core">
     100    <!-- imagemagick -->
     101    <target name="Installing ImageMagick">
     102        <echo>Installing ImageMagick</echo>
     103        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
     104        <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
     105        <delete file="imagemagick.lzma"/>
     106        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/linux"/>
     107        <delete file="imagemagick.comp"/>
     108       
     109        <echo>Setting ImageMagick Binaries to Executable</echo>
     110        <chmod dir="${installDir}/bin/linux/imagemagick/bin" includes="*" perm="775"/>
     111       
     112    </target>
    102113
    103         <echo>Installing Source Code Core</echo>
    104         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
    105         <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
    106         <delete file="sourcecode-core.lzma"/>
    107         <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
    108         <delete file="sourcecode-core.comp"/>
     114    <!-- source release -->
     115    <target name="Source Release">
     116
     117        <echo>Installing Source Release</echo>
     118        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
     119        <sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
     120        <delete file="source-release.lzma"/>
     121        <unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
     122        <delete file="source-release.comp"/>
    109123
    110124        <echo>Set the installation locale in config files</echo>
    … …  
    129143
    130144
    131     <!-- source code -->
    132     <target name="Installing Source Code">
    133         <echo>Installing Source Code</echo>
    134         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
    135         <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
    136         <delete file="sourcecode.lzma"/>
    137         <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
    138         <delete file="sourcecode.comp"/>
    139     </target>
    140 
    141     <!-- imagemagick -->
    142     <target name="Installing ImageMagick">
    143         <echo>Installing ImageMagick</echo>
    144         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
    145         <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>
    146         <delete file="imagemagick.lzma"/>
    147         <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/linux"/>
    148         <delete file="imagemagick.comp"/>
    149        
    150         <echo>Setting ImageMagick Binaries to Executable</echo>
    151         <chmod dir="${installDir}/bin/linux/imagemagick/bin" includes="*" perm="775"/>
    152        
    153     </target>
    154 
    155145</project>
Note: See TracChangeset for help on using the changeset viewer.