Changeset 16686

Show
Ignore:
Timestamp:
08.08.2008 13:15:42 (11 years ago)
Author:
oranfry
Message:

simplified these files, made sure component sizes get in and implemented rename build.xml for transit

Location:
release-kits/lirk3/installer
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/lirk3/installer/antinstall-config.xml

    r16003 r16686  
    3535        <comment name="choose-components"/> 
    3636 
    37         <target target="install-core-components"    diskRequirement="50Mb"                          defaultValue="true" displayText="" force="true" /> 
    38         <target target="install-java"               diskRequirement="@component.size.java@" defaultValue="true" displayText="" /> <!-- bundled java only --> 
    39         <target target="install-tomcat"             diskRequirement="@component.size.tomcat@"   defaultValue="true" displayText="" /> 
    40         <target target="install-ant"                    diskRequirement="@component.size.ant@"      defaultValue="true" displayText="" /> 
    41         <target target="install-source-code"        diskRequirement="10Mb"                          defaultValue="false"    displayText="" /> 
     37        <target target="install-core-components"    diskRequirement="@component.size.core@"         defaultValue="true" displayText="" force="true" /> 
     38        <target target="install-java"               diskRequirement="@component.size.linux-java@"   defaultValue="true" displayText="" /> <!-- bundled java only --> 
     39        <target target="install-tomcat"             diskRequirement="@component.size.tomcat@"           defaultValue="true" displayText="" /> 
     40        <target target="install-ant"                    diskRequirement="@component.size.ant@"              defaultValue="true" displayText="" /> 
     41        <target target="install-source-code"        diskRequirement="@component.size.sourcecode@"   defaultValue="false"    displayText="" /> 
    4242 
    4343    </page> 
  • release-kits/lirk3/installer/build.xml

    r15973 r16686  
    2626 
    2727 
    28         <!-- install binaries and set executable --> 
    29         <echo message="Installing Executable Binaries (bin)"/> 
    30         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="bin/**/*"/></patternset></unzip> 
    31         <echo/> 
    32  
    33         <echo message="Installing Documentation (docs)"/> 
    34         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="docs/**/*"/></patternset></unzip> 
    35         <echo/> 
    36  
    37         <echo message="Installing GLI (gli)"/> 
    38         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="gli/**/*"/></patternset></unzip> 
    39         <echo/> 
    40  
    41         <echo message="Installing gs2build (gs2build)"/> 
    42         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="gs2build/**/*"/></patternset></unzip> 
    43         <echo/> 
    44  
    45         <echo message="Installing Libraries (lib)"/> 
    46         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="lib/**/*"/></patternset></unzip> 
    47         <echo/> 
    48  
    49         <echo message="Installing Web Content (web)"/> 
    50         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="web/**/*"/></patternset></unzip> 
    51         <echo/> 
    52  
    53         <echo message="Installing Resources (resources)"/> 
    54         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="resources/**/*"/></patternset></unzip> 
    55         <echo/> 
    56  
    57         <echo message="Installing Top Level Files"/> 
     28        <!-- install files --> 
     29        <echo message="Installing Files"/> 
    5830        <unzip src="${antinstaller.jar}" dest="${installDir}"> 
    5931            <patternset> 
    60                 <include name="build.xml"/> 
     32 
     33                <include name="bin/**/*"/> 
     34                <include name="docs/**/*"/> 
     35                <include name="gli/**/*"/> 
     36                <include name="gs2build/**/*"/> 
     37                <include name="lib/**/*"/> 
     38                <include name="web/**/*"/> 
     39                <include name="resources/**/*"/> 
     40 
     41                <include name="greenstone3-build.xml"/> 
    6142                <include name="build.properties"/> 
    6243                <include name="gs3-server.sh"/> 
     
    6546                <include name="README.txt"/> 
    6647                <include name="server.jar"/> 
     48 
    6749            </patternset> 
    6850        </unzip> 
    6951        <echo/> 
     52 
     53        <!-- rename greenstone3-build.xml back to build.xml --> 
     54        <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/> 
     55 
    7056 
    7157        <echo message="Setting Binaries to Executable"/> 
     
    138124        <echo message="Installing Tomcat (packages/tomcat)"/> 
    139125        <!-- extract the files --> 
    140         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/tomcat/**/*"/></patternset></unzip> 
     126        <unzip src="${antinstaller.jar}" dest="${installDir}"> 
     127            <patternset> 
     128                <include name="packages/tomcat/**/*"/> 
     129            </patternset> 
     130        </unzip> 
    141131 
    142132        <!-- change the tomcat ports in tomcats server.xml --> 
     
    161151        <!-- extract the files --> 
    162152        <echo message="Installing Ant (packages/ant)"/> 
    163         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/ant/**/*"/></patternset></unzip> 
     153        <unzip src="${antinstaller.jar}" dest="${installDir}"> 
     154            <patternset> 
     155                <include name="packages/ant/**/*"/> 
     156            </patternset> 
     157        </unzip> 
    164158 
    165159        <!-- set binaries to executable -->