Changeset 16817

Show
Ignore:
Timestamp:
15.08.2008 15:20:32 (11 years ago)
Author:
oranfry
Message:

fixed installer sourcecode target, use shared code from rk2 targets and show compnent sizes in wirk2

Location:
release-kits/wirk2
Files:
4 modified

Legend:

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

    r16745 r16817  
    2222    <import file="shared-ant-scripts/init.xml"/> 
    2323    <import file="shared-ant-scripts/operations-on-gli.xml"/> 
     24    <import file="../greenstone2/ant-scripts/rk2-targets.xml"/> 
    2425    <import file="compile.xml"/> 
    2526    <import file="create-distribution.xml"/> 
  • release-kits/wirk2/ant-scripts/create-installer.xml

    r16745 r16817  
    33 
    44    <target name="create-installer"> 
    5         <antcall target="setup-for-installer-creation"/> 
     5        <antcall target="copy-installer-files"/> 
     6        <antcall target="make-installer-files-concrete"/> <!-- from rk2-targets --> 
    67        <antcall target="compile-installer"/> 
    78    </target> 
    89 
    9     <target name="setup-for-installer-creation"> 
     10    <target name="copy-installer-files"> 
     11        <echo>Copying installer files</echo> 
    1012        <mkdir dir="${basedir}/installer/classes"/> 
    1113        <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml" overwrite="true"/> 
     
    1618            <fileset dir="${wirk2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" /> 
    1719        </copy> 
    18          
    19         <!-- put the concrete values of things in the config --> 
    20         <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/> 
    21         <rsr file="${basedir}/installer/build.xml" pattern="@version@" replacement="${version}"/> 
    22                                  
    23         <!-- put the concrete values of things in the text --> 
    24         <!-- default --> 
    25         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/> 
    26         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    27         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 
    28         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 
    29         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 
    30          
    31         <!-- chinese --> 
    32         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/> 
    33         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    34         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 
    35         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 
    36         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 
    3720    </target> 
    3821 
  • release-kits/wirk2/installer/antinstall-config.xml

    r16747 r16817  
    3535        <comment name="choose-components"/> 
    3636 
    37         <target target="install-core-components"            defaultValue="true" displayText="" force="true"/> 
    38         <target target="install-source-code"                defaultValue="false" displayText="" /> 
    39         <target target="install-start-menu-shortcuts"   defaultValue="true" displayText="" /> 
     37        <target target="install-core-components"            diskRequirement="@component.size.core@"         defaultValue="true" displayText="" force="true"/> 
     38        <target target="install-start-menu-shortcuts"   diskRequirement="~10 KB"                                defaultValue="true" displayText="" /> 
     39        <target target="install-source-code"                diskRequirement="@component.size.sourcecode@"   defaultValue="false"    displayText="" /> 
    4040 
    4141    </page> 
  • release-kits/wirk2/installer/build.xml

    r16774 r16817  
    8383    <target name="install-source-code" depends=""> 
    8484 
    85     <echo message="Installing Source Code (src)"/> 
    86         <echo message="Installing Packages (packages)"/> 
    87         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/**/*"/></patternset></unzip> 
    88         <echo/> 
    89          
    90         <mkdir dir="${installDir}/src"/> 
    91         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="src/**/*"/></patternset></unzip> 
     85        <echo message="Installing Source Code"/> 
     86        <unzip src="${antinstaller.jar}" dest="${installDir}"> 
     87            <patternset> 
     88                <include name="common-src/**/*"/> 
     89                <include name="runtime-src/**/*"/> 
     90                <include name="build-src/**/*"/> 
     91                <include name="packages/**/*"/> 
     92            </patternset> 
     93        </unzip> 
    9294         
    9395    </target>