Changeset 17597 for release-kits/wirk3


Ignore:
Timestamp:
2008-10-24T11:00:08+13:00 (16 years ago)
Author:
oranfry
Message:

untested changes to exclude sourcecode from the binary release, use nicer target names and icons

Location:
release-kits/wirk3
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r17466 r17597  
    1818    <property name="rk.home" value="${wirk3.home}" />
    1919    <property name="rk.os" value="windows" />
     20    <property name="os.suffix" value="win32"/>
    2021
    2122    <!-- IMPORT OTHER ANT SCRIPTS -->

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

    r17538 r17597  
    55        <antcall target="copy-installer-files"/>
    66        <antcall target="make-installer-files-concrete"><param name="java.os" value="windows"/></antcall> <!-- from rk3-targets -->
    7         <antcall target="compile-installer"/>
     7        <antcall target="compile-binary-installer"/> <!-- from init -->
     8        <antcall target="compile-minimal-installer"/> <!-- from init -->
     9        <antcall target="compile-source-installer"/> <!-- from init -->
    810    </target>
    911
    1012    <target name="copy-installer-files">
    11 
    12         <echo>Getting things ready to compile the installer</echo>
    1313
    1414        <!-- the installer descriptors -->
    … …  
    3737
    3838    </target>
    39 
    40     <target name="compile-installer">
    41 
    42         <installer file="${basedir}/installer/Greenstone-${version}-win32.jar"
    43                 compress="true"
    44                 extractType="NonExtractor"
    45                 installConfig="${basedir}/installer/antinstall-config.xml"
    46                 buildFile="${basedir}/installer/build.xml"
    47                 antInstallLib="${wirk3.home}/packages/ant-installer/lib"
    48                 antLib="${wirk3.home}/packages/ant/lib"
    49                 validateConfig="true"
    50                 icons="bluecurve">
    51 
    52             <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
    53             <zipfileset dir="${basedir}/components" includes="*.lzma" />
    54            
    55         </installer>
    56 
    57         <dcff file="${basedir}/installer/antinstall-config.xml" startTag=".*&lt;!-- start full --&gt;.*" endTag=".*&lt;!-- end full --&gt;.*" />
    58        
    59         <installer file="${basedir}/installer/Greenstone-${version}-win32-minimal.jar"
    60                     compress="true"
    61                     extractType="NonExtractor"
    62                     installConfig="${basedir}/installer/antinstall-config.xml"
    63                     buildFile="${basedir}/installer/build.xml"
    64                     antInstallLib="${wirk3.home}/packages/ant-installer/lib"
    65                     antLib="${wirk3.home}/packages/ant/lib"
    66                     validateConfig="true"
    67                     icons="bluecurve">
    68                 <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
    69                 <zipfileset dir="${basedir}/components" includes="core.lzma" />
    70         </installer>
    71     </target>
    72 
    7339   
    7440</project>

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

    r17538 r17597  
    4646
    4747        <target
    48             target="install-core-components"
     48            target="Looking For Previous Installation"
     49            diskRequirement="x"
     50            defaultValue="true"
     51            displayText="x"
     52            force="true"
     53            hidden="true"/>
     54
     55        <target
     56            target="Installing Core System"
    4957            diskRequirement="@component.size.core@"
    5058            defaultValue="true"
    … …  
    5361
    5462        <target
    55             target="install-start-menu-shortcuts"
     63            target="Installing Start Menu Shortcuts"
    5664            diskRequirement="~10 KB"
    5765            defaultValue="true"
    5866            displayText=""/>       
    5967
    60         <!-- start full -->
     68        <!-- start bundled components -->
    6169        <target
    62             target="install-tomcat"
     70            target="Installing Tomcat"
    6371            diskRequirement="@component.size.tomcat@"
    6472            defaultValue="true"
    … …  
    6674
    6775        <target
    68             target="install-ant"
     76            target="Installing Ant"
    6977            diskRequirement="@component.size.ant@"
    7078            defaultValue="true"
    … …  
    7280
    7381        <target
    74             target="install-imagemagick"
     82            target="Installing ImageMagick"
    7583            diskRequirement="@component.size.imagemagick@"
    7684            defaultValue="true"
    … …  
    7886           
    7987        <target
    80             target="install-ghostscript"
     88            target="Installing Ghostscript"
    8189            diskRequirement="@component.size.ghostscript@"
    8290            defaultValue="true"
    8391            displayText=""/>
     92        <!-- end bundled components -->
    8493           
     94        <!-- start sourcecode -->
    8595        <target
    86             target="install-source-code"
     96            target="Installing Source Code"
    8797            diskRequirement="@component.size.sourcecode@"
    8898            defaultValue="false"
    8999            displayText=""/>
    90         <!-- end full -->
     100        <!-- end sourcecode -->
     101
    91102    </page>
    92103
    93     <!-- start full -->
    94     <page type="input" name="tomcat-config" ifProperty="(${install-tomcat}==true)" displayText="">
     104    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
    95105
    96106        <text property="tomcat.server" defaultValue="localhost" displayText=""/>
    … …  
    99109
    100110    </page>
    101     <!-- end full -->
    102111
    103     <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText="">
    104     </page>
     112    <page type="progress" name="progress" showTargets="true" displayText=""/>
    105113
    106114</installer>

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

    r17477 r17597  
    3232    <available file="${installDir}\installation.properties" property="is.overinstall"/>
    3333
    34     <target name="load-previous-props" if="is.overinstall">
    35         <property file="${installDir}\installation.properties"/>
    36     </target>
    37    
    38     <target name="install-core-components" depends="load-previous-props">
     34    <target name="Looking For Previous Installation" if="is.overinstall">
     35        <property file="${installDir}\etc\installation.properties"/>
     36    </target>
     37   
     38    <target name="Installing Core System">
    3939
    4040        <!-- figure out the start menu path (if not already set from previous installation) -->
    … …  
    111111
    112112    <!-- Source -->
    113     <target name="install-source-code">
     113    <target name="Installing Source Code">
    114114        <echo message="Installing Source Code (src)"/>
    115115        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
    … …  
    120120    </target>
    121121
    122     <target name="install-tomcat">
     122    <target name="Installing Tomcat">
    123123       
    124124        <echo message="Installing Apache Tomcat"/>
    … …  
    136136    </target>
    137137
    138     <target name="install-ant">
     138    <target name="Installing Ant">
    139139        <echo message="Installing Apache Ant"/>
    140140        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ant.lzma"/></patternset></unzip>
    … …  
    145145    </target>
    146146
    147     <target name="install-imagemagick">
     147    <target name="Installing ImageMagick">
    148148        <echo message="Installing ImageMagick"/>
    149149        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
    … …  
    154154    </target>
    155155
    156     <target name="install-ghostscript">
     156    <target name="Installing Ghostscript">
    157157        <echo message="Installing GhostScript"/>
    158158        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
    … …  
    163163    </target>
    164164   
    165     <target name="cleanuptarget">
    166     </target>
    167    
    168     <target name="install-start-menu-shortcuts">
     165    <target name="Installing Start Menu Shortcuts">
    169166
    170167        <mkdir dir="${startmenu.path}\Documentation"/>
Note: See TracChangeset for help on using the changeset viewer.