Changeset 17125 for release-kits/wirk2

Timestamp:

2008-09-03T13:31:16+12:00 (16 years ago)

Author:

oranfry

Message:

simplified the installation.properties system in wirk3

File:

• release-kits/wirk2/installer/build.xml (modified) (7 diffs)

release-kits/wirk2/installer/build.xml

@@ -35 +35 @@
     <target name="install-core-components" depends="load-previous-props">
 
+        <!-- figure out the start menu path (if not already set from previous installation) -->
+        <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>        
+        
         <echo>basedir: ${basedir}</echo>
         <echo>installDir: ${installDir}</echo>
         <echo>antinstaller.jar: ${antinstaller.jar}</echo>
+        <echo>startmenu.path: ${startmenu.path}</echo>
 
         <!-- create the installation directory -->
@@ -109 +113 @@
                 
         <echo message="Creating installation properties file"/>
-        <echo file="${installDir}\etc\installation.properties">startmenu.path:@startmenu.path@</echo>
-
+        <echo file="${installDir}\etc\installation.properties">startmenu.path:${startmenu.path}</echo>
+        
         <echo message="Finished"/>
         
@@ -133 +137 @@
     <target name="install-start-menu-shortcuts">
 
-        <!-- figure out the start menu path (if not already set from previous installation) -->
-        <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>
-        
         <mkdir dir="${startmenu.path}\Documentation"/>
         
@@ -144 +145 @@
             iconFile="${installDir}\images\icon.ico"
             iconIndex="0" />
-
         <shortcut
             file="${startmenu.path}\Greenstone Librarian Interface (GLI).lnk"
@@ -151 +151 @@
             iconFile="${installDir}\images\icon.ico"
             iconIndex="0" />
-            
         <shortcut
             file="${startmenu.path}\Greenstone Editor for Metadata Sets (GEMS).lnk"
@@ -158 +157 @@
             iconFile="${installDir}\images\icon.ico"
             iconIndex="0" />
-        
         <shortcut
             file="${startmenu.path}\Documentation\READMEen.lnk"
@@ -174 +172 @@
             file="${startmenu.path}\Documentation\READMEru.lnk"
             execute="${installDir}\READMEru.txt" />
-        
-        <rsr file="${installDir}\etc\installation.properties" pattern="@startmenu.path@" replacement="${startmenu.path}" winPath="true"/>
-                
     </target>