Changeset 21608


Ignore:
Timestamp:
2010-01-25T16:06:19+13:00 (12 years ago)
Author:
oranfry
Message:

moving things around for simplicity

Location:
main/trunk/release-kits
Files:
3 edited
3 moved

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/create-installer.xml

    r21394 r21608  
    1616        <!-- windows -->
    1717        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
    18             <fileset dir="${rk.home}/shared/windows/7za" includes="7za.exe"/>
     18            <copy todir="installer/classes" file="${rk.home}/shared/windows/7za/7za.exe"/>
    1919        <!-- linux and mac -->
    2020        <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
  • main/trunk/release-kits/kits/rk2/installer/build.xml

    r21208 r21608  
    223223            execute="${installDir}\server.exe"
    224224            workingDirectory="${installDir}"
    225             iconFile="${installDir}\web\images\serverico.ico"
     225            iconFile="${installDir}\web\images\server.ico"
    226226            iconIndex="0" />
    227227
     
    230230            execute="${installDir}\gli\gli.bat"
    231231            workingDirectory="${installDir}\gli"
    232             iconFile="${installDir}\web\images\icon.ico"
     232            iconFile="${installDir}\web\images\librarian.ico"
    233233            iconIndex="0" />
    234234
     
    237237            execute="${installDir}\gli\client-gli.bat"
    238238            workingDirectory="${installDir}\gli"
    239             iconFile="${installDir}\web\images\icon.ico"
     239            iconFile="${installDir}\web\images\librarian.ico"
    240240            iconIndex="0" />
    241241
     
    244244            execute="${installDir}\gli\gems.bat"
    245245            workingDirectory="${installDir}\gli"
    246             iconFile="${installDir}\web\images\gems.ico"
     246            iconFile="${installDir}\web\images\metadata.ico"
    247247            iconIndex="0" />
    248248
  • main/trunk/release-kits/shared/core/ant-scripts/init.xml

    r21593 r21608  
    182182        <!-- show important properties -->
    183183        <echo level="info">Version (version): ${version}</echo>
     184        <echo level="info">Major Version (version.major): ${version.major}</echo>
    184185        <echo level="info">Branch Path (branch.path): ${branch.path}</echo>
    185186        <echo level="info">Date (date): ${date}</echo>
     
    260261            dest="${basedir}/installer/classes/resources"/>
    261262
    262         <!-- os- and major version-specific files -->
     263        <!-- other installer classes -->
    263264        <copy todir="${basedir}/installer/classes" overwrite="true">
    264             <fileset dir="${rk.home}/linux/installer-classes" erroronmissingdir="false"/>
    265             <fileset dir="${rk.home}/windows/installer-classes"  erroronmissingdir="false"/>
    266             <fileset dir="${rk.home}/greenstone3/installer-classes" erroronmissingdir="false"/>
    267             <fileset dir="${rk.home}/greenstone2/installer-classes" erroronmissingdir="false"/>
     265            <fileset dir="${rk.home}/kits/rk${version.major}/installer-classes" erroronmissingdir="false"/>
     266            <fileset dir="${rk.home}/shared/${rk.os}/installer-classes" erroronmissingdir="false"/>
    268267        </copy>
    269268
Note: See TracChangeset for help on using the changeset viewer.