Changeset 17124 for release-kits/wirk3

Show
Ignore:
Timestamp:
03.09.2008 13:30:37 (11 years ago)
Author:
oranfry
Message:

simplified the installation.properties system in wirk2

Location:
release-kits/wirk3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk3/ant-scripts/wrap.xml

    r16748 r17124  
    1414        <!--create a directory to build the wrapped installer in --> 
    1515        <mkdir dir="${basedir}/wrapped-installer/build"/> 
    16  
    1716        <!-- copy source files --> 
    1817        <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/windows/wrapper/wrapper.cpp"/> 
  • release-kits/wirk3/installer/build.xml

    r17107 r17124  
    3737    <target name="install-core-components" depends="load-previous-props"> 
    3838 
    39         <!-- create the installation directory --> 
    40         <echo message="Creating Installation directory"/> 
     39        <!-- figure out the start menu path (if not already set from previous installation) --> 
     40        <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/> 
     41         
    4142        <echo>basedir: ${basedir}</echo> 
    4243        <echo>installDir: ${installDir}</echo> 
    4344        <echo>antinstaller.jar: ${antinstaller.jar}</echo> 
     45        <echo>startmenu.path: ${startmenu.path}</echo> 
     46         
     47        <!-- create the installation directory --> 
     48        <echo message="Creating Installation directory"/> 
    4449        <mkdir dir="${installDir}"/> 
    45  
     50         
    4651        <!-- install files --> 
    4752        <echo message="Installing Files"/> 
     
    6368                <include name="greenstone3-build.xml"/> 
    6469                <include name="build.properties"/> 
    65                 <include name="installation.properties"/> 
    6670                <include name="gs3-server.bat"/> 
    6771                <include name="gs3-setup.bat"/> 
     
    7377        </unzip> 
    7478        <echo/> 
    75          
     79 
    7680        <!-- rename greenstone3-build.xml back to build.xml --> 
    7781        <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/> 
     
    8892        <rsr file="${installDir}/gs2build/setup.bat" pattern="@gsdlhome@" replacement="${installDir.local}\gs2build" /> 
    8993 
    90          
    9194        <!-- copy the greenstone3.xml file to tomcat --> 
    9295        <echo message="Copying greenstone3.xml to tomcat directory"/> 
     
    109112        <delete dir="${installDir}/resources/icons"/> 
    110113        <delete file="${installDir}/resources/*.png"/> 
    111  
     114         
     115        <echo message="Creating installation properties file"/> 
     116        <echo file="${installDir}\installation.properties">startmenu.path:${startmenu.path}</echo> 
     117         
    112118    </target> 
    113119 
     
    147153    <target name="install-start-menu-shortcuts"> 
    148154 
    149         <!-- figure out the start menu path (if not already set from previous installation) --> 
    150         <getfreepath path="${win32.personal.programs_menu}\Greenstone-@version@" property="startmenu.path"/> 
    151          
    152155        <mkdir dir="${startmenu.path}\Documentation"/> 
    153156         
     
    185188            execute="${installDir}\documentation\manual\gs2_user_en.pdf" /> 
    186189         
    187         <rsr file="${installDir}\installation.properties" pattern="@startmenu.path@" replacement="${startmenu.path}" winPath="true"/> 
    188              
    189190    </target> 
    190191