Changeset 17107 for release-kits


Ignore:
Timestamp:
2008-08-29T16:24:07+12:00 (16 years ago)
Author:
oranfry
Message:

changed build scripts and create-installer targets after the greenstone ant tasks were moved. also, greenstone2 installer now creates admin and demo users at install

Location:
release-kits
Files:
17 edited

Legend:

Unmodified
Added
Removed

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

    r16815 r17107  
    1515        <copy todir="${basedir}/installer/classes" overwrite="true">
    1616            <fileset dir="${lirk2.home}/greenstone2/installer-classes"/>
    17             <fileset dir="${lirk2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
    1817        </copy>
     18        <unjar src="${lirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     19        <delete dir="${basedir}/installer/classes/META-INF"/>
     20        <unjar src="${lirk2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
     21        <delete dir="${basedir}/installer/classes/META-INF"/>
    1922    </target>
    2023

  • release-kits/lirk2/installer/antinstall-config.xml

    r17039 r17107  
    3535        <comment name="choose-components"/>
    3636
    37         <target target="install-core-components"    diskRequirement="@component.size.core@"             displayText="" defaultValue="true" force="true" />
     37        <target target="install-core-components"    diskRequirement="@component.size.core@"         displayText="" defaultValue="true" force="true" />
    3838        <target target="install-java"               diskRequirement="@component.size.linux-java@"   displayText="" defaultValue="true" /> <!-- bundled java only -->
    3939        <target target="install-source-code"        diskRequirement="@component.size.sourcecode@"   defaultValue="false" displayText="" />
    … …  
    4141    </page>
    4242
     43    <page type="input" name="admin-password" displayText="">
     44        <comment name="admin-password-expl"/>
     45        <text property="admin.password" defaultValue="" displayText=""/>
     46    </page>
     47
    4348    <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText=""></page>
    4449

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

    r17075 r17107  
    1414
    1515    <!-- custom tasks -->
    16     <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
     16    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
     17    <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/>
    1718
    1819    <condition property="bundled.java.exists">
    … …  
    7576        <echo/>
    7677
     78        <echo message="Creating admin and demo users"/>
     79        <adduser txt2db="${installDir}/bin/linux/txt2db"
     80            usersDb="${installDir}/etc/users.db"
     81            username="admin"
     82            password="${admin.password}"
     83            groups="administrator,colbuilder"
     84            comment="created at install time"/>
     85        <adduser
     86            txt2db="${installDir}/bin/linux/txt2db"
     87            usersDb="${installDir}/etc/users.db"
     88            username="demo"
     89            password="demo"
     90            groups="demo"
     91            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/>
     92
    7793        <!-- delete unneeded files -->
    7894        <echo message="Deleting some unneeded files"/>
    … …  
    105121    </target>
    106122
    107     <target name="cleanuptarget">
    108     </target>
     123    <target name="cleanuptarget"></target>
    109124   
    110125

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

    r16777 r17107  
    1515        <copy todir="${basedir}/installer/classes" overwrite="true">
    1616            <fileset dir="${lirk3.home}/greenstone3/installer-classes"/>
    17             <fileset dir="${lirk3.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
    1817        </copy>
     18        <unjar src="${lirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     19        <delete dir="${basedir}/installer/classes/META-INF"/>
    1920    </target>
    2021

  • release-kits/lirk3/installer/antinstall-config.xml

    r16686 r17107  
    3838        <target target="install-java"               diskRequirement="@component.size.linux-java@"   defaultValue="true" displayText="" /> <!-- bundled java only -->
    3939        <target target="install-tomcat"             diskRequirement="@component.size.tomcat@"           defaultValue="true" displayText="" />
    40         <target target="install-ant"                    diskRequirement="@component.size.ant@"              defaultValue="true" displayText="" />
     40        <target target="install-ant"                diskRequirement="@component.size.ant@"              defaultValue="true" displayText="" />
    4141        <target target="install-source-code"        diskRequirement="@component.size.sourcecode@"   defaultValue="false"    displayText="" />
    4242

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

    r17051 r17107  
    1414
    1515    <!-- custom tasks -->
    16     <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
     16    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
    1717
    1818    <target name="install-core-components" depends="">

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

    r16818 r17107  
    1515        <copy todir="${basedir}/installer/classes" overwrite="true">
    1616            <fileset dir="${mark2.home}/greenstone2/installer-classes"/>
    17             <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
    1817        </copy>
     18        <unjar src="${mark2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     19        <delete dir="${basedir}/installer/classes/META-INF"/>
     20        <unjar src="${mark2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
     21        <delete dir="${basedir}/installer/classes/META-INF"/>
    1922    </target>
    2023

  • release-kits/mark2/installer/antinstall-config.xml

    r17040 r17107  
    4040    </page>
    4141
     42    <page type="input" name="admin-password" displayText="">
     43        <comment name="admin-password-expl"/>
     44        <text property="admin.password" defaultValue="" displayText=""/>
     45    </page>
     46
    4247    <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText=""></page>
    4348

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

    r17076 r17107  
    1414
    1515    <!-- custom tasks -->
    16     <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
     16    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
     17    <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/>
    1718
    1819    <condition property="bundled.java.exists">
    … …  
    7576        <echo/>
    7677
     78        <echo message="Creating admin and demo users"/>
     79        <adduser txt2db="${installDir}/bin/linux/txt2db"
     80            usersDb="${installDir}/etc/users.db"
     81            username="admin"
     82            password="${admin.password}"
     83            groups="administrator,colbuilder"
     84            comment="created at install time"/>
     85        <adduser
     86            txt2db="${installDir}/bin/linux/txt2db"
     87            usersDb="${installDir}/etc/users.db"
     88            username="demo"
     89            password="demo"
     90            groups="demo"
     91            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/>
     92
    7793        <!-- delete unneeded files -->     
    7894        <echo message="Deleting some unneeded files"/>

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

    r16807 r17107  
    1414        <copy todir="${basedir}/installer/classes" overwrite="true">
    1515            <fileset dir="${mark3.home}/greenstone3/installer-classes"/>
    16             <fileset dir="${mark3.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
    1716        </copy>
     17        <unjar src="${mark3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     18        <delete dir="${basedir}/installer/classes/META-INF"/>
    1819    </target>
    1920

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

    r17052 r17107  
    1414
    1515    <!-- custom tasks -->
    16     <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
     16    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
    1717
    1818    <target name="install-core-components" depends="">

  • release-kits/shared/resources/Uninstall.txt

    r17049 r17107  
    33To uninstall Greenstone, follow these instructions:
    44
    5     * Back up your collections from %GSDLHOME%/collect
    6     * Back up any other files from %GSDLHOME% you wish to keep
    7     * Remove the entire %GSDLHOME% folder
     5    * Back up your collections from the "collect" subfolder of the
     6      folder you installed Greenstone to
     7    * Back up any other files from you wish to keep from the
     8      folder you installed Greenstone to
     9    * Remove the entire folder you installed Greenstone to
    810    * Remove the Start Menu shortcuts
    911        (right-click on Greenstone in Start Menu, click delete)

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

    r16916 r17107  
    1616            <fileset dir="${wirk2.home}/greenstone2/installer-classes"/>
    1717            <fileset dir="${wirk2.home}/windows/installer-classes"/>
    18             <fileset dir="${wirk2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
    19             <fileset dir="${wirk2.home}/ant-scripts/tasks/orans" includes="GetFreePath.class" />
    2018        </copy>
     19        <unjar src="${wirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     20        <delete dir="${basedir}/installer/classes/META-INF"/>
     21        <unjar src="${wirk2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
     22        <delete dir="${basedir}/installer/classes/META-INF"/>
    2123    </target>
    2224

  • release-kits/wirk2/installer/antinstall-config.xml

    r17041 r17107  
    4141    </page>
    4242
     43    <page type="input" name="admin-password" displayText="">
     44        <comment name="admin-password-expl"/>
     45        <text property="admin.password" defaultValue="" displayText=""/>
     46    </page>
     47
     48
    4349    <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText=""></page>
    4450

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

    r17080 r17107  
    1010
    1111    <!-- custom tasks -->
    12     <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
    13     <typedef name="getfreepath" classname="GetFreePath" classpathref="project.classpath"/>
    1412    <taskdef name="shortcut" classname="com.orangevolt.tools.ant.Win32ShortcutTask" classpathref="project.classpath"/>
    1513    <taskdef name="winprops" classname="com.orangevolt.tools.ant.Win32PropertiesTask" classpathref="project.classpath"/>
     14    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
     15    <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/>
     16    <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/>
    1617
    1718    <!-- pick up the properties generated during the install pages -->
    … …  
    7273        <echo/>
    7374       
     75        <echo message="Creating admin and demo users"/>
     76        <adduser txt2db="${installDir}/bin/linux/txt2db"
     77            usersDb="${installDir}/etc/users.db"
     78            username="admin"
     79            password="${admin.password}"
     80            groups="administrator,colbuilder"
     81            comment="created at install time"/>
     82        <adduser
     83            txt2db="${installDir}/bin/linux/txt2db"
     84            usersDb="${installDir}/etc/users.db"
     85            username="demo"
     86            password="demo"
     87            groups="demo"
     88            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/>
     89
    7490        <!-- delete unneeded files -->     
    7591        <echo message="Deleting some unneeded files"/>
    … …  
    163179    </target>
    164180
    165 
    166181    <target name="cleanuptarget"></target>
    167182   

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

    r16930 r17107  
    1616            <fileset dir="${wirk3.home}/windows/installer-classes"/>
    1717            <fileset dir="${wirk3.home}/greenstone3/installer-classes"/>
    18             <fileset dir="${wirk3.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
    19             <fileset dir="${wirk3.home}/ant-scripts/tasks/orans" includes="GetFreePath.class" />
    2018        </copy>
     19        <unjar src="${wirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     20        <delete dir="${basedir}/installer/classes/META-INF"/>
    2121    </target>
    2222

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

    r17050 r17107  
    1414
    1515    <!-- custom tasks -->
    16     <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/>
    17     <typedef name="getfreepath" classname="GetFreePath" classpathref="project.classpath"/>
    1816    <taskdef name="shortcut" classname="com.orangevolt.tools.ant.Win32ShortcutTask" classpathref="project.classpath"/>
    1917    <taskdef name="winprops" classname="com.orangevolt.tools.ant.Win32PropertiesTask" classpathref="project.classpath"/>
     18    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
     19    <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/>
    2020
    2121    <!-- create a local installDir String -->
Note: See TracChangeset for help on using the changeset viewer.