Changeset 17124 for release-kits

Timestamp:

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

Author:

oranfry

Message:

simplified the installation.properties system in wirk2

Location:

release-kits/wirk3

Files:

• ant-scripts/wrap.xml (modified) (1 diff)
• installer/build.xml (modified) (7 diffs)

release-kits/wirk3/ant-scripts/wrap.xml

@@ -14 +14 @@
         <!--create a directory to build the wrapped installer in -->
         <mkdir dir="${basedir}/wrapped-installer/build"/>
-
         <!-- copy source files -->
         <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/windows/wrapper/wrapper.cpp"/>

release-kits/wirk3/installer/build.xml

@@ -37 +37 @@
     <target name="install-core-components" depends="load-previous-props">
 
-        <!-- create the installation directory -->
-        <echo message="Creating Installation directory"/>
+        <!-- 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 -->
+        <echo message="Creating Installation directory"/>
         <mkdir dir="${installDir}"/>
-
+        
         <!-- install files -->
         <echo message="Installing Files"/>
@@ -63 +68 @@
                 <include name="greenstone3-build.xml"/>
                 <include name="build.properties"/>
-                <include name="installation.properties"/>
                 <include name="gs3-server.bat"/>
                 <include name="gs3-setup.bat"/>
@@ -73 +77 @@
         </unzip>
         <echo/>
-        
+
         <!-- rename greenstone3-build.xml back to build.xml -->
         <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
@@ -88 +92 @@
         <rsr file="${installDir}/gs2build/setup.bat" pattern="@gsdlhome@" replacement="${installDir.local}\gs2build" />
 
-        
         <!-- copy the greenstone3.xml file to tomcat -->
         <echo message="Copying greenstone3.xml to tomcat directory"/>
@@ -109 +112 @@
         <delete dir="${installDir}/resources/icons"/>
         <delete file="${installDir}/resources/*.png"/>
-
+        
+        <echo message="Creating installation properties file"/>
+        <echo file="${installDir}\installation.properties">startmenu.path:${startmenu.path}</echo>
+        
     </target>
 
@@ -147 +153 @@
     <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"/>
         
@@ -185 +188 @@
             execute="${installDir}\documentation\manual\gs2_user_en.pdf" />
         
-        <rsr file="${installDir}\installation.properties" pattern="@startmenu.path@" replacement="${startmenu.path}" winPath="true"/>
-            
     </target>