Changeset 21608

Timestamp:

2010-01-25T16:06:19+13:00 (14 years ago)

Author:

oranfry

Message:

moving things around for simplicity

Location:

main/trunk/release-kits

Files:

• kits/rk2/ant-scripts/create-installer.xml (modified) (1 diff)
• kits/rk2/installer/build.xml (modified) (4 diffs)
• kits/rk3/installer (moved) (moved from main/trunk/release-kits/shared/greenstone3/installer )
• kits/rk3/installer-classes (moved) (moved from main/trunk/release-kits/shared/greenstone3/installer-classes )
• shared/core/ant-scripts/init.xml (modified) (2 diffs)
• shared/core/installer-classes (moved) (moved from main/trunk/release-kits/kits/rk2/installer-classes )

main/trunk/release-kits/kits/rk2/ant-scripts/create-installer.xml

@@ -16 +16 @@
         <!-- windows -->
         <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-            <fileset dir="${rk.home}/shared/windows/7za" includes="7za.exe"/>
+            <copy todir="installer/classes" file="${rk.home}/shared/windows/7za/7za.exe"/>
         <!-- linux and mac -->
         <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

@@ -223 +223 @@
             execute="${installDir}\server.exe"
             workingDirectory="${installDir}"
-            iconFile="${installDir}\web\images\serverico.ico"
+            iconFile="${installDir}\web\images\server.ico"
             iconIndex="0" />
 
@@ -230 +230 @@
             execute="${installDir}\gli\gli.bat"
             workingDirectory="${installDir}\gli"
-            iconFile="${installDir}\web\images\icon.ico"
+            iconFile="${installDir}\web\images\librarian.ico"
             iconIndex="0" />
 
@@ -237 +237 @@
             execute="${installDir}\gli\client-gli.bat"
             workingDirectory="${installDir}\gli"
-            iconFile="${installDir}\web\images\icon.ico"
+            iconFile="${installDir}\web\images\librarian.ico"
             iconIndex="0" />
 
@@ -244 +244 @@
             execute="${installDir}\gli\gems.bat"
             workingDirectory="${installDir}\gli"
-            iconFile="${installDir}\web\images\gems.ico"
+            iconFile="${installDir}\web\images\metadata.ico"
             iconIndex="0" />
 

main/trunk/release-kits/shared/core/ant-scripts/init.xml

@@ -182 +182 @@
         <!-- show important properties -->
         <echo level="info">Version (version): ${version}</echo>
+        <echo level="info">Major Version (version.major): ${version.major}</echo>
         <echo level="info">Branch Path (branch.path): ${branch.path}</echo>
         <echo level="info">Date (date): ${date}</echo>
@@ -260 +261 @@
             dest="${basedir}/installer/classes/resources"/>
 
-        <!-- os- and major version-specific files -->
+        <!-- other installer classes -->
         <copy todir="${basedir}/installer/classes" overwrite="true">
-            <fileset dir="${rk.home}/linux/installer-classes" erroronmissingdir="false"/>
-            <fileset dir="${rk.home}/windows/installer-classes"  erroronmissingdir="false"/>
-            <fileset dir="${rk.home}/greenstone3/installer-classes" erroronmissingdir="false"/>
-            <fileset dir="${rk.home}/greenstone2/installer-classes" erroronmissingdir="false"/>
+            <fileset dir="${rk.home}/kits/rk${version.major}/installer-classes" erroronmissingdir="false"/>
+            <fileset dir="${rk.home}/shared/${rk.os}/installer-classes" erroronmissingdir="false"/>
         </copy>