Changeset 16931

Timestamp:

2008-08-21T11:16:35+12:00 (16 years ago)

Author:

oranfry

Message:

dont overwrite startmenu shortcuts for repeat installs unless they are over-installs

Location:

release-kits/wirk2

Files:

• ant-scripts/compile.xml (modified) (1 diff)
• ant-scripts/create-distribution.xml (modified) (1 diff)
• bin/wirk2.exe (modified) ( previous)
• installer/build.xml (modified) (6 diffs)
• src/wirk2.cpp (modified) (3 diffs)

release-kits/wirk2/ant-scripts/compile.xml

@@ -48 +48 @@
         <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>
         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat" />
-        
-        <move file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/>
+        <copy file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/>
         <move todir="${basedir}/gsdl/bin/windows">
             <fileset dir="${basedir}/gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/>

release-kits/wirk2/ant-scripts/create-distribution.xml

@@ -52 +52 @@
     </target>
 
-    <target name="copy-server-to-root">
-        <copy
-            todir="${basedir}/distributions/web"
-            file="${basedir}/distributions/web/bin/windows/server.exe"
-            overwrite="true"/>
-    </target>
-    
     <target name="compile-gli">
         <echo>Compiling gli...</echo>

release-kits/wirk2/installer/build.xml

@@ -6 +6 @@
 <project name="Installation">
 
-    <!-- this is required to pick up the properties generated during the install pages -->
-    <property file="${basedir}/ant.install.properties"/>
-
-    <path id="project.classpath">
-        <pathelement path="${antinstaller.jar}"/>
-    </path>
+    <!-- classpath -->
+    <path id="project.classpath"><pathelement path="${antinstaller.jar}"/></path>
 
     <!-- custom tasks -->
     <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
-    <typedef name="rsr" classname="GetFreePath" classpathref="project.classpath"/>
+    <typedef name="getfreepath" classname="GetFreePath" classpathref="project.classpath"/>
     <taskdef name="shortcut" classname="com.orangevolt.tools.ant.Win32ShortcutTask" classpathref="project.classpath"/> 
     <taskdef name="winprops" classname="com.orangevolt.tools.ant.Win32PropertiesTask" classpathref="project.classpath"/> 
 
-    <condition property="bundled.java.exists">
-        <available file="../@java.extracted@/bin/java"/>
-    </condition>
+    <!-- pick up the properties generated during the install pages -->
+    <property file="${basedir}/ant.install.properties"/>
+    
+    <!-- determine if there is an existing installation in the installDir-->
+    <available file="${installDir}\etc\installation.properties" property="is.overinstall"/>
 
     <!-- load windows properties -->
     <winprops/>
+    
+    <!-- create a local installDir String -->
+    <path id="installDir.path"><pathelement location="${installDir}"/></path>
+    <property name="installDir.local" refid="installDir.path"/>
+    
+    <target name="load-previous-props" if="is.overinstall">
+        <property file="${installDir}\etc\installation.properties"/>
+    </target>
 
-    <target name="install-core-components" depends="">
+    <target name="install-core-components" depends="load-previous-props">
 
         <echo>basedir: ${basedir}</echo>
@@ -35 +41 @@
         <echo message="Creating Installation directory"/>
         <mkdir dir="${installDir}"/>
-        
         
         <!-- install files -->
@@ -71 +76 @@
         <delete file="${installDir}/resources/*.png"/>
 
-        <echo message="Setting GSDLHOME in setup.bat"/>
+        <echo message="Setting GSDLHOME in config files"/>
         <rsr
             file="${installDir}/setup.bat"
@@ -77 +82 @@
             replacement="${installDir}"/>
         <rsr
-            file="${installDir}/cgi-bin/gsdlsite.bat"
+            file="${installDir}/cgi-bin/gsdlsite.cfg"
             pattern="\*\*GSDLHOME\*\*"
             replacement="${installDir}"/>
@@ -103 +108 @@
     <target name="install-start-menu-shortcuts">
 
-        <!-- figure out the start menu path -->
+        <!-- figure out the start menu path (if not already set from previous installation) -->
         <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/>
         
@@ -144 +149 @@
             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>
 

release-kits/wirk2/src/wirk2.cpp

@@ -48 +48 @@
     //pass on the arguments
     string a;
+    bool simMode = false;
     for ( int i=0; i < argc; i++ ) {
         a = argv[i];
@@ -54 +55 @@
             //show_help();
             return 0;
-        
         } else if ( a.compare("-cp") == 0) {
             cout << classpath;
             return 0;
-
+        } else if ( a.compare("-sim") == 0) {
+            command = command + " " + a;
+            simMode = true;
         } else {
             command = command + " " + a;
@@ -65 +67 @@
     }
 
+    //create directories
+    if ( !simMode ) {
+        system( "IF NOT EXIST installer\\classes MKDIR installer\\classes" );
+    }
     
     //use forward slashes for everything else