Changeset 17786 for release-kits/lirk3


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/lirk3
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r17721 r17786  
    1313    <target name="prepare-components">
    1414        <antcall target="prepare-core-component" />
    15         <antcall target="prepare-sourcecode-component" />
    1615        <antcall target="prepare-ant-component" />
    1716        <antcall target="prepare-tomcat-component" />
    1817        <antcall target="prepare-imagemagick-component" />
    19         <antcall target="prepare-sourcecode-core-component" />
     18
     19        <antcall target="prepare-sourcecode-component" />
     20
     21        <antcall target="prepare-source-release" />
    2022    </target>
    2123
    2224    <target name="compress-components">
    2325        <antcall target="compress-core-component" />
    24         <antcall target="compress-sourcecode-component" /> 
    2526        <antcall target="compress-ant-component" />
    2627        <antcall target="compress-tomcat-component" />
    2728        <antcall target="compress-imagemagick-component" />
    28         <antcall target="compress-sourcecode-core-component" />
     29
     30        <!--<antcall target="compress-sourcecode-component" />-->
     31
     32        <antcall target="compress-source-release" />
    2933    </target>
    3034
    … …  
    6771    </target>
    6872
    69     <!-- sourcecode-core -->
    70     <target name="prepare-sourcecode-core-component">
    71         <delete dir="components/tmp/sourcecode-core"/>
    72         <mkdir dir="components/tmp/sourcecode-core"/>
    73 
    74         <copy todir="components/tmp/sourcecode-core" overwrite="true">
    75             <fileset dir="distribution/source">
    76                 <include name="gli/**/*"/>
    77                 <include name="docs/**/*"/>
    78                 <include name="resources/**/*"/>
    79                 <include name="web/**/*"/>
    80                 <include name="gs2build/etc/**/*"/>
    81                 <include name="gs2build/setup.bash"/>
    82                 <include name="build.xml"/>
    83                 <include name="build.properties"/>
    84                 <include name="*.sh"/>
    85                 <include name="*.txt"/>
    86             </fileset>
    87         </copy>
    88         <zip destfile="components/sourcecode-core.comp" basedir="components/tmp/sourcecode-core" compress="false"/>
    89     </target>
    90    
    91     <target name="compress-sourcecode-core-component">
    92         <sevenzip task="encode" input="components/sourcecode-core.comp" output="components/sourcecode-core.lzma" dictionnary="26"/>
    93     </target>
    94    
    9573    <!-- sourcecode -->
    9674    <target name="prepare-sourcecode-component">
    … …  
    10886        </copy>
    10987               
    110         <zip destfile="components/sourcecode.comp" basedir="components/tmp/sourcecode" compress="false" />
    11188        <zip destfile="components/Greenstone-${version}-linux-sourcecode.zip"  basedir="components/tmp/sourcecode" compress="true"/>
    11289    </target>
    … …  
    173150    </target>
    174151
     152
     153    <!-- sourcecode-release -->
     154    <target name="prepare-source-release">
     155        <delete dir="components/tmp/source-release"/>
     156        <mkdir dir="components/tmp/source-release"/>
     157
     158        <copy todir="components/tmp/source-release" overwrite="true">
     159            <fileset dir="distribution/source"/>
     160        </copy>
     161        <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/>
     162    </target>
     163   
     164    <target name="compress-source-release">
     165        <sevenzip task="encode" input="components/source-release.comp" output="components/source-release.lzma" dictionnary="26"/>
     166    </target>
     167
     168
    175169</project>

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

    r17652 r17786  
    99        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
    1010        <antcall target="insert-user-manual"/>
     11        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
    1112
    1213        <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
    … …  
    1617            <property name="branch.path" value="${branch.path}"/>
    1718        </ant>
    18 
    1919        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false">
    2020            <property name="app.version" value="${version}"/>
    2121            <property name="branch.path" value="${branch.path}"/>
    2222        </ant>
    23 
    2423        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritAll="false">
    2524            <property name="app.version" value="${version}"/>
    2625            <property name="branch.path" value="${branch.path}"/>
    2726        </ant>
    28 
    2927        <antcall target="copy-over-build-xml" />
    3028        <antcall target="insert-compiled-binaries"/>
    3129        <antcall target="export-imagemagick-linux-binaries" />
    32         <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets -->
    3330   
    3431        <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->

  • release-kits/lirk3/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"/>
     37
    2938    </page>
    3039
    … …  
    5362        <comment name="choose-components"/>
    5463
     64        <!-- start binary release -->
    5565        <target
    5666            target="Initialising"
    … …  
    6171            hidden="true"/>
    6272
    63         <!-- start binary release core -->
    6473        <target
    6574            target="Installing Core System"
    … …  
    6877            defaultValue="true"
    6978            force="true"/>
    70         <!-- end binary release core -->
    71 
    72         <!-- start source release core -->
    73         <target
    74             target="Installing Source Code Core"
    75             diskRequirement="@component.size.sourcecode-core@"
    76             displayText=""
    77             defaultValue="true"
    78             />
    79         <!-- end source release core -->
    8079
    8180        <!-- start bundled components -->
    … …  
    9998        <!-- end bundled components -->
    10099
    101         <!-- start sourcecode -->
    102         <target
    103             target="Installing Source Code"
    104             diskRequirement="@component.size.sourcecode@"
    105             defaultValue="false"
    106             displayText=""/>
    107         <!-- end sourcecode -->
    108 
    109100    </page>
     101    <!-- end binary release -->
    110102
    111103    <!-- start bundled components -->

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

    r17765 r17786  
    7272    </target>
    7373
    74     <!-- sourcecode core system -->
    75     <target name="Installing Source Code Core">
    76 
    77         <echo>Installing Source Code Core</echo>
    78         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode-core.lzma"/></patternset></unzip>
    79         <sevenzip task="decode" input="${basedir}/sourcecode-core.lzma" output="${basedir}/sourcecode-core.comp"/>
    80         <delete file="sourcecode-core.lzma"/>
    81         <unzip src="${basedir}/sourcecode-core.comp" dest="${installDir}"/>
    82         <delete file="sourcecode-core.comp"/>
    83 
    84         <echo>Setting up global properties</echo>
    85         <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
    86         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    87         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
    88         <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
    89 
    90         <echo>Setting up log4j properties</echo>
    91         <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
    92         <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
    93 
    94         <echo>Creating installation properties file</echo>
    95         <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
    96 
    97     </target>
    98 
    99 
    100     <!-- Source -->
    101     <target name="Installing Source Code" depends="">
    102 
    103         <echo>Installing Source Code</echo>
    104         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
    105         <sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>
    106         <delete file="sourcecode.lzma"/>
    107         <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
    108         <delete file="sourcecode.comp"/>
    109 
    110     </target>
    111 
    11274    <!-- imagemagick -->
    11375    <target name="Installing ImageMagick">
    … …  
    160122    </target>
    161123
     124    <!-- source release -->
     125    <target name="Source Release">
     126
     127        <echo>Installing Source Release</echo>
     128        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="source-release.lzma"/></patternset></unzip>
     129        <sevenzip task="decode" input="${basedir}/source-release.lzma" output="${basedir}/source-release.comp"/>
     130        <delete file="source-release.lzma"/>
     131        <unzip src="${basedir}/source-release.comp" dest="${installDir}"/>
     132        <delete file="source-release.comp"/>
     133
     134        <echo>Setting up global properties</echo>
     135        <copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
     136        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
     137        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
     138        <rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
     139
     140        <echo>Setting up log4j properties</echo>
     141        <copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
     142        <rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
     143
     144        <echo>Creating installation properties file</echo>
     145        <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
     146
     147    </target>
     148
     149
    162150</project>
Note: See TracChangeset for help on using the changeset viewer.