Changeset 17257

Show
Ignore:
Timestamp:
11.09.2008 16:58:26 (11 years ago)
Author:
oranfry
Message:

added the uninstaller to all release kits

Location:
release-kits
Files:
27 modified

Legend:

Unmodified
Added
Removed
  • release-kits/lirk2

    • Property svn:externals
      •  

        old new  
        22linux http://svn.greenstone.org/release-kits/shared/linux 
        33greenstone2 http://svn.greenstone.org/release-kits/shared/greenstone2 
         4uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller 
        45 
  • release-kits/lirk2/ant-scripts/build.xml

    r16815 r17257  
    1818    <import file="shared-ant-scripts/init.xml"/> 
    1919    <import file="shared-ant-scripts/operations-on-gli.xml"/> 
     20    <import file="shared-ant-scripts/global-targets.xml"/> 
    2021    <import file="../greenstone2/ant-scripts/rk2-targets.xml"/> 
    2122    <import file="compile.xml"/> 
  • release-kits/lirk2/ant-scripts/compile.xml

    r16739 r17257  
    1818        <antcall target="copy-library-oai"/> 
    1919        <antcall target="strip-execs"/> 
     20 
     21        <!-- uninstaller --> 
     22        <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
    2023 
    2124        <!-- build collections --> 
  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r16739 r17257  
    99        <antcall target="drop-in-demo-collection" /> 
    1010        <antcall target="drop-in-docs" /> 
     11        <antcall target="insert-uninstaller"/> <!-- from rk2-targets --> 
    1112        <antcall target="compile-gli" /> 
    1213        <antcall target="tweak-files" /> 
  • release-kits/lirk2/installer/build.xml

    r17152 r17257  
    5555                <include name="READMEes.txt"/> 
    5656                <include name="Support.htm"/> 
     57                <include name="Uninstall.jar"/> 
    5758            </patternset> 
    5859        </unzip> 
     
    107108        <delete file="${installDir}/resources/*.png"/> 
    108109 
     110        <echo>Creating installation properties file</echo> 
     111        <echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo> 
     112 
     113 
    109114        <echo message="Finished"/> 
    110115 
  • release-kits/lirk3/ant-scripts/compile.xml

    r17243 r17257  
    2626 
    2727        <!-- uninstaller --> 
    28         <antcall target="compile-uninstaller" /> 
     28        <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
    2929 
    3030        <!-- documentation --> 
  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r17243 r17257  
    2929        <antcall target="insert-user-manual"/> 
    3030        <antcall target="insert-compiled-binaries"/> 
    31         <antcall target="insert-uninstaller"/> 
     31        <antcall target="insert-uninstaller"/> <!-- from rk3-targets --> 
    3232        <antcall target="rename-build-xml-for-transit"/> 
    3333    </target> 
  • release-kits/lirk3/ant-scripts/create-installer.xml

    r17107 r17257  
    2121 
    2222    <target name="compile-installer"> 
     23 
    2324        <installer file="${basedir}/installer/greenstone3-with-java.jar" 
    2425                compress="true" 
     
    2930                antLib="${lirk3.home}/packages/ant/lib" 
    3031                validateConfig="true" 
    31                 failOnError="false" 
    3232                icons="bluecurve"> 
    3333 
    34             <!-- copy all the important files into the archive to be extracted for install --> 
    3534            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes --> 
    3635            <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/> 
     
    5453            <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/> 
    5554        </installer> 
     55 
    5656    </target> 
    5757 
  • release-kits/lirk3/installer/build.xml

    r17244 r17257  
    1919 
    2020        <!-- create the installation directory --> 
    21         <echo message="Creating Installation directory"/> 
     21        <echo>Creating Installation directory</echo> 
    2222        <echo>basedir: ${basedir}</echo> 
    2323        <echo>installDir: ${installDir}</echo> 
     
    8383        <delete file="${installDir}/resources/*.png"/> 
    8484 
     85        <echo>Creating installation properties file</echo> 
     86        <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo> 
     87 
    8588        <echo>Finished</echo> 
    8689 
     
    9093    <target name="install-source-code" depends=""> 
    9194 
    92         <echo>Installing Source Code<echo> 
     95        <echo>Installing Source Code</echo> 
    9396        <mkdir dir="${installDir}/src"/> 
    9497        <unzip src="${antinstaller.jar}" dest="${installDir}"> 
  • release-kits/mark2

    • Property svn:externals
      •  

        old new  
        33greenstone2 http://svn.greenstone.org/release-kits/shared/greenstone2 
        44mac http://svn.greenstone.org/release-kits/shared/mac 
         5uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller 
        56 
  • release-kits/mark2/ant-scripts/build.xml

    r16911 r17257  
    2222    <import file="shared-ant-scripts/init.xml"/> 
    2323    <import file="shared-ant-scripts/operations-on-gli.xml"/> 
     24    <import file="shared-ant-scripts/global-targets.xml"/> 
    2425    <import file="../greenstone2/ant-scripts/rk2-targets.xml"/> 
    2526    <import file="compile.xml"/> 
  • release-kits/mark2/ant-scripts/compile.xml

    r17077 r17257  
    1616        <antcall target="copy-library-oai"/> 
    1717        <antcall target="strip-execs"/> 
     18 
     19        <!-- uninstaller --> 
     20        <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
    1821 
    1922        <!-- build collections --> 
  • release-kits/mark2/ant-scripts/create-distribution.xml

    r17077 r17257  
    1111        <antcall target="drop-in-demo-collection" /> 
    1212        <antcall target="drop-in-docs" /> 
     13        <antcall target="insert-uninstaller"/> <!-- from rk2-targets --> 
    1314        <antcall target="compile-gli" /> 
    1415        <antcall target="tweak-files" /> 
  • release-kits/mark2/installer/build.xml

    r17107 r17257  
    5858                <include name="READMEes.txt"/> 
    5959                <include name="Support.htm"/> 
     60                <include name="Uninstall.jar"/> 
    6061            </patternset> 
    6162        </unzip> 
     
    9697        <delete file="${installDir}/resources/*.png"/> 
    9798 
     99        <echo>Creating installation properties file</echo> 
     100        <echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo> 
     101 
    98102        <echo message="Finished"/> 
    99103 
  • release-kits/mark3

    • Property svn:externals
      •  

        old new  
        33greenstone3 http://svn.greenstone.org/release-kits/shared/greenstone3 
        44mac http://svn.greenstone.org/release-kits/shared/mac 
         5uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller 
        56 
  • release-kits/mark3/ant-scripts/build.xml

    r16772 r17257  
    2626    <import file="shared-ant-scripts/init.xml"/> 
    2727    <import file="shared-ant-scripts/operations-on-gli.xml"/> 
     28    <import file="shared-ant-scripts/global-targets.xml"/> 
    2829    <import file="../greenstone3/ant-scripts/rk3-targets.xml"/> 
    2930    <import file="compile.xml"/> 
  • release-kits/mark3/ant-scripts/compile.xml

    r17078 r17257  
    2323        <antcall target="linux-strip-execs" /> 
    2424        <antcall target="compile-search4j" /> <!-- from rk3-targets --> 
     25 
     26        <!-- uninstaller --> 
     27        <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
    2528 
    2629        <!-- documentation --> 
  • release-kits/mark3/ant-scripts/create-distribution.xml

    r17078 r17257  
    2626        <antcall target="insert-user-manual"/> 
    2727        <antcall target="insert-compiled-binaries"/> 
     28        <antcall target="insert-uninstaller"/> <!-- from rk3-targets --> 
    2829        <antcall target="rename-build-xml-for-transit"/> 
    2930    </target> 
  • release-kits/mark3/installer/build.xml

    r17107 r17257  
    5151                <include name="README.txt"/> 
    5252                <include name="server.jar"/> 
     53                <include name="Uninstall.jar"/> 
    5354            </patternset> 
    5455 
     
    9394        <delete dir="${installDir}/resources/icons"/> 
    9495        <delete file="${installDir}/resources/*.png"/> 
     96 
     97        <echo>Creating installation properties file</echo> 
     98        <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo> 
    9599 
    96100        <echo message="Finished"/> 
  • release-kits/wirk2

    • Property svn:externals
      •  

        old new  
        22windows http://svn.greenstone.org/release-kits/shared/windows 
        33lib http://svn.greenstone.org/release-kits/shared/lib 
         4uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller 
        45 
  • release-kits/wirk2/ant-scripts/build.xml

    r16817 r17257  
    2222    <import file="shared-ant-scripts/init.xml"/> 
    2323    <import file="shared-ant-scripts/operations-on-gli.xml"/> 
     24    <import file="shared-ant-scripts/global-targets.xml"/> 
    2425    <import file="../greenstone2/ant-scripts/rk2-targets.xml"/> 
    2526    <import file="compile.xml"/> 
  • release-kits/wirk2/ant-scripts/compile.xml

    r16946 r17257  
    99        <antcall target="insert-perl" /> 
    1010        <antcall target="compile-c-code" /> 
     11        <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
    1112        <antcall target="build-demo-collection" /> 
    1213    </target> 
  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r17080 r17257  
    99        <antcall target="drop-in-docs" /> 
    1010        <antcall target="drop-in-misc" /> 
     11        <antcall target="insert-uninstaller"/> <!-- from rk2-targets --> 
    1112        <antcall target="compile-gli" /> 
    1213        <antcall target="tweak-files" /> 
  • release-kits/wirk2/installer/build.xml

    r17125 r17257  
    7171                <include name="setup.bat"/> 
    7272                <include name="server.exe"/> 
     73                <include name="Uninstall.jar"/> 
    7374                <include name="gsdlsite.cfg"/> 
    7475 
     
    158159            iconIndex="0" /> 
    159160        <shortcut 
     161            file="${startmenu.path}\Uninstall.lnk" 
     162            execute="${installDir}\bin\windows\search4j.exe -h packages\jre -l Uninstaller.jar" 
     163            workingDirectory="${installDir}" 
     164            iconFile="${installDir}\images\icon.ico" 
     165            iconIndex="0" /> 
     166        <shortcut 
    160167            file="${startmenu.path}\Documentation\READMEen.lnk" 
    161168            execute="${installDir}\READMEen.txt" /> 
  • release-kits/wirk3/ant-scripts/compile.xml

    r17255 r17257  
    1515            <property name="branch.revision" value="${branch.revision}"/> 
    1616        </ant> 
    17         <antcall target="compile-uninstaller"/> 
     17        <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
    1818        <antcall target="prepare-documentation" /> 
    1919    </target> 
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r17255 r17257  
    2424        <antcall target="insert-user-manual"/> 
    2525        <antcall target="insert-compiled-binaries"/> 
    26         <antcall target="insert-uninstaller"/> 
     26        <antcall target="insert-uninstaller"/> <!-- from rk3-targets --> 
    2727        <antcall target="rename-build-xml-for-transit"/> 
    2828    </target> 
  • release-kits/wirk3/installer/build.xml

    r17255 r17257  
    7373                <include name="README.txt"/> 
    7474                <include name="server.jar"/> 
    75  
     75                <include name="Uninstall.jar"/> 
    7676            </patternset> 
    7777        </unzip> 
     
    174174            iconFile="${installDir}\resources\images\gs3.ico" 
    175175            iconIndex="0" /> 
     176 
     177        <shortcut 
     178            file="${startmenu.path}\Uninstall.lnk" 
     179            execute="${installDir}\winutil\search4j.exe -h packages\jre -l Uninstaller.jar" 
     180            workingDirectory="${installDir}" 
     181            iconFile="${installDir}\images\icon.ico" 
     182            iconIndex="0" /> 
    176183         
     184 
    177185        <shortcut 
    178186            file="${startmenu.path}\Documentation\README.lnk"