greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 17255

Show
Ignore:
Timestamp:
2008-09-11 16:05:10 (4 months ago)
Author:
oranfry
Message:

wirk3 to include uninstaller and a little fix for gems link

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • release-kits/wirk3/ant-scripts/build.xml

    r16748 r17255  
    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"/> 
     30 
    2931        <import file="compile.xml"/> 
    3032        <import file="create-distribution.xml"/> 

  • release-kits/wirk3/ant-scripts/compile.xml

    r17044 r17255  
    1515                        <property name="branch.revision" value="${branch.revision}"/> 
    1616                </ant> 
     17                <antcall target="compile-uninstaller"/> 
    1718                <antcall target="prepare-documentation" /> 
    1819        </target> 

  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r16813 r17255  
    2424                <antcall target="insert-user-manual"/> 
    2525                <antcall target="insert-compiled-binaries"/> 
     26                <antcall target="insert-uninstaller"/> 
    2627                <antcall target="rename-build-xml-for-transit"/> 
    2728        </target> 

  • release-kits/wirk3/ant-scripts/create-installer.xml

    r17107 r17255  
    1111                <echo>Getting things ready to compile the installer</echo> 
    1212                <mkdir dir="${basedir}/installer/resources"/> 
    13                 <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml"/> 
    14                 <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml"/> 
    15                 <copy todir="${basedir}/installer/classes"> 
     13                <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml" overwrite="true" /> 
     14                <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml" overwrite="true" /> 
     15                <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1616                        <fileset dir="${wirk3.home}/windows/installer-classes"/> 
    1717                        <fileset dir="${wirk3.home}/greenstone3/installer-classes"/> 
    …… 
    2222 
    2323        <target name="compile-installer"> 
     24 
     25                <installer file="${basedir}/installer/Greenstone-${version}-win32-with-java.jar" 
     26                                compress="true" 
     27                                extractType="NonExtractor" 
     28                                installConfig="${basedir}/installer/antinstall-config.xml" 
     29                                buildFile="${basedir}/installer/build.xml" 
     30                                antInstallLib="${wirk3.home}/packages/ant-installer/lib" 
     31                                antLib="${wirk3.home}/packages/ant/lib" 
     32                                validateConfig="true" 
     33                                icons="bluecurve"> 
     34 
     35                        <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
     36                        <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*" /> 
     37                         
     38                </installer> 
     39 
     40                <!-- delete the 'bundled java only' lines from the installer config --> 
     41                <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/> 
     42 
    2443                <installer file="${basedir}/installer/greenstone-${version}-win32.jar" 
    2544                                compress="true" 
    …… 
    3655                         
    3756                </installer> 
     57 
    3858        </target> 
    3959         

  • release-kits/wirk3/ant-scripts/operations-on-gs3home.xml

    r17044 r17255  
    4343                <antcall target="checkout-gs2build"/> 
    4444                <antcall target="checkout-gli"/> 
    45                 <!--<delete file="${gli.home}/gli.bat"/>--> 
    4645                <delete file="${gli.home}/gli.sh"/> 
    47                 <delete file="${gli.home}/gems.bat"/> 
    4846                <delete file="${gli.home}/gems.sh"/> 
    4947                 

  • release-kits/wirk3/installer/build.xml

    r17239 r17255  
    170170                <shortcut 
    171171                        file="${startmenu.path}\Greenstone Editor for Metadata Sets (GEMS).lnk" 
    172                         execute="${installDir}\gli\gems4gs3.bat" 
     172                        execute="${installDir}\gli\gems.bat" 
    173173                        workingDirectory="${installDir}\gli" 
    174174                        iconFile="${installDir}\resources\images\gs3.ico"