Changeset 19006


Ignore:
Timestamp:
2009-04-16T13:37:26+12:00 (15 years ago)
Author:
oranfry
Message:

changed the release kits to use the new shared code structure

Location:
release-kits
Files:
16 deleted
37 edited

Legend:

Unmodified
Added
Removed
  • release-kits/cdrk2

    • Property svn:externals
      •  

        old new  
         1core http://svn.greenstone.org/release-kits/shared/core
        12linux http://svn.greenstone.org/release-kits/shared/linux
        23greenstone2 http://svn.greenstone.org/release-kits/shared/greenstone2
        3 lib http://svn.greenstone.org/release-kits/shared/lib
  • release-kits/cdrk2/ant-scripts

    • Property svn:externals deleted
  • release-kits/cdrk2/ant-scripts/build.xml

    r18847 r19006  
    1919   
    2020    <!-- IMPORT OTHER ANT SCRIPTS -->
    21     <import file="shared-ant-scripts/init.xml"/>
     21    <import file="../core/ant-scripts/init.xml"/>
    2222    <import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
    2323
  • release-kits/lirk2

    • Property svn:externals
      •  

        old new  
        1 lib http://svn.greenstone.org/release-kits/shared/lib
         1core http://svn.greenstone.org/release-kits/shared/core
        22linux http://svn.greenstone.org/release-kits/shared/linux
        33greenstone2 http://svn.greenstone.org/release-kits/shared/greenstone2
        4 uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller
        5 language-strings http://svn.greenstone.org/release-kits/shared/language-strings
        64
  • release-kits/lirk2/ant-scripts

    • Property svn:externals deleted
  • release-kits/lirk2/ant-scripts/build.xml

    r17996 r19006  
    2020   
    2121    <!-- IMPORT OTHER ANT SCRIPTS -->
    22     <import file="shared-ant-scripts/init.xml"/>
    23     <import file="shared-ant-scripts/operations-on-gli.xml"/>
     22    <import file="../core/ant-scripts/init.xml"/>
     23    <import file="../core/ant-scripts/operations-on-gli.xml"/>
    2424    <import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
    2525
  • release-kits/lirk2/ant-scripts/create-installer.xml

    r18283 r19006  
    1515        </copy>
    1616
    17         <unjar src="${lirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     17        <unjar src="${lirk2.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
    1818        <delete dir="${basedir}/installer/classes/META-INF"/>
    1919
    20         <unjar src="${lirk2.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
     20        <unjar src="${lirk2.home}/core/ant-tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
    2121        <delete dir="${basedir}/installer/classes/META-INF"/>
    2222
    23         <unjar src="${lirk2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
     23        <unjar src="${lirk2.home}/core/lib/crypt.jar" dest="${basedir}/installer/classes"/>
    2424        <delete dir="${basedir}/installer/classes/META-INF"/>
    2525
  • release-kits/lirk2/ant-scripts/wrap.xml

    r18500 r19006  
    1313        <mkdir dir="${basedir}/wrapped-installer/build"/>
    1414        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/wrapper.cpp"/>
    15         <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/libsearch4j.cpp"/>
    16         <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/libsearch4j.h"/>
     15        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/core/search4j/libsearch4j.cpp"/>
     16        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/core/search4j/libsearch4j.h"/>
    1717
    1818        <!-- copy bundled files -->
  • release-kits/lirk3

    • Property svn:externals
      •  

        old new  
        1 lib http://svn.greenstone.org/release-kits/shared/lib
         1core http://svn.greenstone.org/release-kits/shared/core
        22linux http://svn.greenstone.org/release-kits/shared/linux
        33greenstone3 http://svn.greenstone.org/release-kits/shared/greenstone3
        4 uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller
        5 language-strings http://svn.greenstone.org/release-kits/shared/language-strings
        6 
  • release-kits/lirk3/ant-scripts

    • Property svn:externals deleted
  • release-kits/lirk3/ant-scripts/build.xml

    r17898 r19006  
    1919
    2020    <!-- IMPORT OTHER ANT SCRIPTS -->
    21     <import file="shared-ant-scripts/init.xml"/>
    22     <import file="shared-ant-scripts/operations-on-gli.xml"/>
     21    <import file="../core/ant-scripts/init.xml"/>
     22    <import file="../core/ant-scripts/operations-on-gli.xml"/>
    2323    <import file="../greenstone3/ant-scripts/rk3-targets.xml"/>
    2424
  • release-kits/lirk3/ant-scripts/create-installer.xml

    r18283 r19006  
    1515        </copy>
    1616
    17         <unjar src="${lirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     17        <unjar src="${lirk3.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
    1818        <delete dir="${basedir}/installer/classes/META-INF"/>
    1919
    20         <unjar src="${lirk3.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
     20        <unjar src="${lirk3.home}/core/ant-tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
    2121        <delete dir="${basedir}/installer/classes/META-INF"/>
    2222
  • release-kits/mark2

    • Property svn:externals
      •  

        old new  
        1 lib http://svn.greenstone.org/release-kits/shared/lib
         1core http://svn.greenstone.org/release-kits/shared/core
        22linux http://svn.greenstone.org/release-kits/shared/linux
        33greenstone2 http://svn.greenstone.org/release-kits/shared/greenstone2
        44mac http://svn.greenstone.org/release-kits/shared/mac
        5 uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller
        6 language-strings http://svn.greenstone.org/release-kits/shared/language-strings
        7 
  • release-kits/mark2/ant-scripts

    • Property svn:externals deleted
  • release-kits/mark2/ant-scripts/build.xml

    r17996 r19006  
    2323
    2424    <!-- IMPORT OTHER ANT SCRIPTS -->
    25     <import file="shared-ant-scripts/init.xml"/>
    26     <import file="shared-ant-scripts/operations-on-gli.xml"/>
     25    <import file="../core/ant-scripts/init.xml"/>
     26    <import file="../core/ant-scripts/operations-on-gli.xml"/>
    2727    <import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
    2828    <import file="compile.xml"/>
  • release-kits/mark2/ant-scripts/create-installer.xml

    r18283 r19006  
    1515        </copy>
    1616
    17         <unjar src="${mark2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     17        <unjar src="${mark2.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
    1818        <delete dir="${basedir}/installer/classes/META-INF"/>
    1919
    20         <unjar src="${mark2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
     20        <unjar src="${mark2.home}/core/lib/crypt.jar" dest="${basedir}/installer/classes"/>
    2121        <delete dir="${basedir}/installer/classes/META-INF"/>
    2222
    23         <unjar src="${mark2.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
     23        <unjar src="${mark2.home}/core/ant-tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
    2424        <delete dir="${basedir}/installer/classes/META-INF"/>
    2525
  • release-kits/mark3

    • Property svn:externals
      •  

        old new  
        1 lib http://svn.greenstone.org/release-kits/shared/lib
         1core http://svn.greenstone.org/release-kits/shared/core
        22linux http://svn.greenstone.org/release-kits/shared/linux
        33greenstone3 http://svn.greenstone.org/release-kits/shared/greenstone3
        44mac http://svn.greenstone.org/release-kits/shared/mac
        5 uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller
        6 language-strings http://svn.greenstone.org/release-kits/shared/language-strings
        7 
  • release-kits/mark3/ant-scripts

    • Property svn:externals deleted
  • release-kits/mark3/ant-scripts/build.xml

    r17898 r19006  
    2222
    2323    <!-- IMPORT OTHER ANT SCRIPTS -->
    24     <import file="shared-ant-scripts/init.xml"/>
    25     <import file="shared-ant-scripts/operations-on-gli.xml"/>
     24    <import file="../core/ant-scripts/init.xml"/>
     25    <import file="../core/ant-scripts/operations-on-gli.xml"/>
    2626    <import file="../greenstone3/ant-scripts/rk3-targets.xml"/>
    2727    <import file="compile.xml"/>
  • release-kits/mark3/ant-scripts/create-installer.xml

    r18283 r19006  
    1515        </copy>
    1616
    17         <unjar src="${mark3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     17        <unjar src="${mark3.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
    1818        <delete dir="${basedir}/installer/classes/META-INF"/>
    1919
    20         <unjar src="${mark3.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
     20        <unjar src="${mark3.home}/core/ant-tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
    2121        <delete dir="${basedir}/installer/classes/META-INF"/>
    2222
  • release-kits/shared/core

    • Property svn:externals set to
  • release-kits/shared/core/ant-scripts/init.xml

    r18929 r19006  
    5252
    5353        <!-- our classes -->
    54         <fileset dir="${rk.home}">
    55             <include name="ant-scripts/tasks/antelope/AntelopeTasks_3.4.2.jar"/>
    56             <include name="ant-scripts/tasks/orangevolt/roxes-win32forjava-1.1.1.jar"/>
    57             <include name="ant-scripts/tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar"/>
    58             <include name="ant-scripts/tasks/svnant/lib/ganymed.jar"/>
    59             <include name="ant-scripts/tasks/svnant/lib/svnClientAdapter.jar"/>
    60             <include name="ant-scripts/tasks/svnant/lib/svnant.jar"/>
    61             <include name="ant-scripts/tasks/svnant/lib/svnjavahl.jar"/>
    62             <include name="ant-scripts/tasks/svnant/lib/svnkit.jar"/>
    63             <include name="ant-scripts/tasks/greenstone/anttasks.jar"/>
    64             <include name="ant-scripts/tasks/7z-ant/7z.jar"/>
     54        <fileset dir="${rk.home}/core">
     55            <include name="ant-tasks/antelope/AntelopeTasks_3.4.2.jar"/>
     56            <include name="ant-tasks/orangevolt/roxes-win32forjava-1.1.1.jar"/>
     57            <include name="ant-tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar"/>
     58            <include name="ant-tasks/svnant/lib/ganymed.jar"/>
     59            <include name="ant-tasks/svnant/lib/svnClientAdapter.jar"/>
     60            <include name="ant-tasks/svnant/lib/svnant.jar"/>
     61            <include name="ant-tasks/svnant/lib/svnjavahl.jar"/>
     62            <include name="ant-tasks/svnant/lib/svnkit.jar"/>
     63            <include name="ant-tasks/greenstone/anttasks.jar"/>
     64            <include name="ant-tasks/7z-ant/7z.jar"/>
    6565            <include name="lib/crypt.jar"/>
    6666            <include name="lib/serializer.jar"/>
     
    6868            <include name="lib/xercesImpl.jar"/>
    6969            <include name="lib/xml-apis.jar"/>
    70             <include name="packages/ant-installer/lib/ant-installer-ext.jar"/>
    71             <include name="packages/ant-installer/lib/ant-installer.jar"/>
     70            <include name="ant-installer/lib/ant-installer-ext.jar"/>
     71            <include name="ant-installer/lib/ant-installer.jar"/>
    7272        </fileset>
    7373
     
    8787   
    8888    <!-- DATES IN DIFFERENT LANGUAGES -->
    89     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="ar.Dates.${current.month}" outputProperty="month.ar"/>
    90     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="ca.Dates.${current.month}" outputProperty="month.ca"/>
    91     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="el.Dates.${current.month}" outputProperty="month.el"/>
    92     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="es.Dates.${current.month}" outputProperty="month.es"/>
    93     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="fr.Dates.${current.month}" outputProperty="month.fr"/>
    94     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="lv.Dates.${current.month}" outputProperty="month.lv"/>
    95     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="mr.Dates.${current.month}" outputProperty="month.mr"/>
    96     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="ro.Dates.${current.month}" outputProperty="month.ro"/>
    97     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="ru.Dates.${current.month}" outputProperty="month.ru"/>
    98     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="vi.Dates.${current.month}" outputProperty="month.vi"/>
    99     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="zh.Dates.${current.month}" outputProperty="month.zh"/>
    100     <get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="default.Dates.${current.month}" outputProperty="month.default"/>
     89    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ar.Dates.${current.month}" outputProperty="month.ar"/>
     90    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ca.Dates.${current.month}" outputProperty="month.ca"/>
     91    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="el.Dates.${current.month}" outputProperty="month.el"/>
     92    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="es.Dates.${current.month}" outputProperty="month.es"/>
     93    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="fr.Dates.${current.month}" outputProperty="month.fr"/>
     94    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="lv.Dates.${current.month}" outputProperty="month.lv"/>
     95    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="mr.Dates.${current.month}" outputProperty="month.mr"/>
     96    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ro.Dates.${current.month}" outputProperty="month.ro"/>
     97    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ru.Dates.${current.month}" outputProperty="month.ru"/>
     98    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="vi.Dates.${current.month}" outputProperty="month.vi"/>
     99    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="zh.Dates.${current.month}" outputProperty="month.zh"/>
     100    <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="default.Dates.${current.month}" outputProperty="month.default"/>
     101
    101102    <!--
    102103    <echo level="info">Current Date</echo>
     
    177178            installConfig="${basedir}/installer/antinstall-config-binary.xml"
    178179            buildFile="${basedir}/installer/build.xml"
    179             antInstallLib="${rk.home}/packages/ant-installer/lib"
    180             antLib="${rk.home}/packages/ant/lib"
     180            antInstallLib="${rk.home}/core/ant-installer/lib"
     181            antLib="${rk.home}/core/ant/lib"
    181182            validateConfig="true"
    182183            icons="bluecurve">
     
    199200            installConfig="${basedir}/installer/antinstall-config-minimal.xml"
    200201            buildFile="${basedir}/installer/build.xml"
    201             antInstallLib="${rk.home}/packages/ant-installer/lib"
    202             antLib="${rk.home}/packages/ant/lib"
     202            antInstallLib="${rk.home}/core/ant-installer/lib"
     203            antLib="${rk.home}/core/ant/lib"
    203204            validateConfig="true"
    204205            icons="bluecurve">
     
    219220            installConfig="${basedir}/installer/antinstall-config-source.xml"
    220221            buildFile="${basedir}/installer/build.xml"
    221             antInstallLib="${rk.home}/packages/ant-installer/lib"
    222             antLib="${rk.home}/packages/ant/lib"
     222            antInstallLib="${rk.home}/core/ant-installer/lib"
     223            antLib="${rk.home}/core/ant/lib"
    223224            validateConfig="true"
    224225            icons="bluecurve">
     
    247248            implementation="sun"
    248249            encoding="UTF-8"
    249             src="${rk.home}/language-strings"
     250            src="${rk.home}/core/language-strings"
    250251            dest="${basedir}/installer/classes/resources"/>
    251252
     
    348349        <!-- copile to build -->
    349350        <javac
    350             srcdir="${rk.home}/uninstaller"
     351            srcdir="${rk.home}/core/uninstaller"
    351352            destdir="${basedir}/compiled/uninstaller/build" />
    352353
     
    354355        <native2ascii
    355356            implementation="sun"
    356             src="${rk.home}/language-strings"
     357            src="${rk.home}/core/language-strings"
    357358            dest="${basedir}/compiled/uninstaller/build/resources"/>
    358359
     
    360361        <jar
    361362            destfile="${basedir}/compiled/uninst.jar"
    362             manifest="${rk.home}/uninstaller/manifest.mf"
     363            manifest="${rk.home}/core/uninstaller/manifest.mf"
    363364            basedir="${basedir}/compiled/uninstaller/build" />
    364365
     
    367368    <!-- copy the uninstaller script from the rk to web distribution -->
    368369    <target name="insert-uninstaller">
    369         <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" />
     370        <copy file="${rk.home}/core/uninstaller/Uninstall.${script-format}" todir="distributions/web" />
    370371    </target>
    371372
  • release-kits/shared/core/build.xml

    r18997 r19006  
    33
    44    <target name="compile">
    5         <ant dir="ant-scripts/tasks/greenstone" inheritAll="false">
    6             <property name="crypt.jar" value="${basedir}/lib/crypt.jar"/>
     5        <ant dir="ant-tasks/greenstone" inheritAll="false">
     6            <property name="crypt.jar" value="lib/crypt.jar"/>
    77        </ant>
    88    </target>
  • release-kits/shared/linux/rk

    r18904 r19006  
    11#!/bin/bash
    22function show_title() {
    3     echo    "O---------------------------------------------O"
    4     echo    "|                                             |"
    5     echo -n "|   $rk_name ";
    6     for a in `seq 0 $(( 40 - ${#rk_name} ))`; do echo -n " "; done; echo "|"
    7     echo -n "|   $rk_fullname ";
    8     for a in `seq 0 $(( 40 - ${#rk_fullname} ))`; do echo -n " "; done; echo "|"
    9     echo    "|                                             |"
    10     echo    "O---------------------------------------------O"
     3    echo "O---------------------------------------------O"
     4    echo
     5    echo "   $rk_name ";
     6    echo "   $rk_fullname ";
     7    echo
     8    echo "O---------------------------------------------O"
     9
     10    #for a in `seq 0 $(( 40 - ${#rk_name} ))`; do echo -n " "; done; echo "|"
     11    #for a in `seq 0 $(( 40 - ${#rk_fullname} ))`; do echo -n " "; done; echo "|"
     12
    1113}
    1214
     
    6264#work out the classpath
    6365CLASSPATH=$JAVA_HOME/lib/tools.jar
    64 for file in $RK_HOME/lib/*.jar; do
     66for file in $RK_HOME/core/lib/*.jar; do
    6567    CLASSPATH=$CLASSPATH:$file
    6668done
    67 for file in $RK_HOME/packages/ant/lib/*.jar; do
     69for file in $RK_HOME/core/ant/lib/*.jar; do
    6870    CLASSPATH=$CLASSPATH:$file
    6971done
    70 for file in $RK_HOME/packages/ant-installer/lib/*.jar; do
     72for file in $RK_HOME/core/ant-installer/lib/*.jar; do
    7173    CLASSPATH=$CLASSPATH:$file
    7274done
    73 CLASSPATH=$CLASSPATH:$RK_HOME/packages/ant-installer/classes
     75CLASSPATH=$CLASSPATH:$RK_HOME/core/ant-installer/classes
    7476
    7577export CLASSPATH
    7678
    7779#set ANT_HOME
    78 export ANT_HOME=$RK_HOME/packages/ant
     80export ANT_HOME=$RK_HOME/core/ant
    7981export ANT_OPTS=-Xmx800M
    8082
  • release-kits/sork2

    • Property svn:externals
      •  

        old new  
        1 lib http://svn.greenstone.org/release-kits/shared/lib
         1core http://svn.greenstone.org/release-kits/shared/core
        22linux http://svn.greenstone.org/release-kits/shared/linux
        33windows http://svn.greenstone.org/release-kits/shared/windows
        44greenstone2 http://svn.greenstone.org/release-kits/shared/greenstone2
        5 uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller
        6 language-strings http://svn.greenstone.org/release-kits/shared/language-strings
        7 
  • release-kits/sork2/ant-scripts

    • Property svn:externals deleted
  • release-kits/sork2/ant-scripts/build.xml

    r18011 r19006  
    1212    <!-- CONSTANTS -->
    1313
    14     <!-- for the benefit of the shared scripts, set release-kit home -->
     14.   <!-- for the benefit of the shared scripts, set release-kit home -->
    1515    <property name="rk.name" value="sork2"/>
    1616    <property name="rk.home" value="${sork2.home}" />
     
    1919   
    2020    <!-- IMPORT OTHER ANT SCRIPTS -->
    21     <import file="shared-ant-scripts/init.xml"/>
    22     <import file="shared-ant-scripts/operations-on-gli.xml"/>
     21    <import file="../core/ant-scripts/init.xml"/>
     22    <import file="../core/ant-scripts/operations-on-gli.xml"/>
    2323    <import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
    2424
  • release-kits/wirk2

    • Property svn:externals
      •  

        old new  
         1core http://svn.greenstone.org/release-kits/shared/core
        12greenstone2 http://svn.greenstone.org/release-kits/shared/greenstone2
        23windows http://svn.greenstone.org/release-kits/shared/windows
        3 lib http://svn.greenstone.org/release-kits/shared/lib
        4 uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller
        5 language-strings http://svn.greenstone.org/release-kits/shared/language-strings
        6 
  • release-kits/wirk2/ant-scripts

    • Property svn:externals deleted
  • release-kits/wirk2/ant-scripts/build.xml

    r17996 r19006  
    2323   
    2424    <!-- IMPORT OTHER ANT SCRIPTS -->
    25     <import file="shared-ant-scripts/init.xml"/>
    26     <import file="shared-ant-scripts/operations-on-gli.xml"/>
     25    <import file="../core/ant-scripts/init.xml"/>
     26    <import file="../core/ant-scripts/operations-on-gli.xml"/>
    2727    <import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
    2828    <import file="compile.xml"/>
  • release-kits/wirk2/ant-scripts/create-installer.xml

    r18283 r19006  
    1212
    1313        <copy todir="${basedir}/installer/classes" overwrite="true">
    14             <fileset dir="${wirk2.home}/packages/7za" includes="7za.exe"/>
     14            <fileset dir="${wirk2.home}/windows/7za" includes="7za.exe"/>
    1515            <fileset file="${basedir}/distributions/web/LICENSE.txt"/>
    1616        </copy>
    1717       
    18         <unjar src="${wirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     18        <unjar src="${wirk2.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
    1919        <delete dir="${basedir}/installer/classes/META-INF"/>
    2020       
    21         <unjar src="${wirk2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
     21        <unjar src="${wirk2.home}/core/lib/crypt.jar" dest="${basedir}/installer/classes"/>
    2222        <delete dir="${basedir}/installer/classes/META-INF"/>
    2323       
  • release-kits/wirk2/src/wirk2.cpp

    r17632 r19006  
    7777       
    7878    //set the classpath
    79     classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK2_HOME + "\\lib\\serializer.jar;" + WIRK2_HOME + "\\lib\\xalan.jar;" + WIRK2_HOME + "\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\classes";
    80     putenv( ("CLASSPATH=" + classpath).c_str() );
     79    //classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\core\\lib\\tools.jar;" + WIRK2_HOME + "\\core\\lib\\serializer.jar;" + WIRK2_HOME + "\\core\\lib\\xalan.jar;" + WIRK2_HOME + "\\core\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\core\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\core\\ant-installer\\classes";
     80    //putenv( ("CLASSPATH=" + classpath).c_str() );
    8181
    8282    //check that it worked
     
    8585   
    8686    //create the command
    87     command = WIRK2_HOME + "\\packages\\ant\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -addressing -Dwirk2.home=" + WIRK2_HOME;
     87    command = WIRK2_HOME + "\\core\\ant\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -addressing -Dwirk2.home=" + WIRK2_HOME;
    8888    //pass on the arguments
    8989    string a;
  • release-kits/wirk3

    • Property svn:externals
      •  

        old new  
        1 lib http://svn.greenstone.org/release-kits/shared/lib
         1core http://svn.greenstone.org/release-kits/shared/core
        22greenstone3 http://svn.greenstone.org/release-kits/shared/greenstone3
        33windows http://svn.greenstone.org/release-kits/shared/windows
        4 uninstaller http://svn.greenstone.org/release-kits/shared/uninstaller
        5 language-strings http://svn.greenstone.org/release-kits/shared/language-strings
        6 
  • release-kits/wirk3/ant-scripts

    • Property svn:externals deleted
  • release-kits/wirk3/ant-scripts/build.xml

    r17898 r19006  
    2222
    2323    <!-- IMPORT OTHER ANT SCRIPTS -->
    24     <import file="shared-ant-scripts/init.xml"/>
    25     <import file="shared-ant-scripts/operations-on-gli.xml"/>
     24    <import file="../core/ant-scripts/init.xml"/>
     25    <import file="../core/ant-scripts/operations-on-gli.xml"/>
    2626    <import file="../greenstone3/ant-scripts/rk3-targets.xml"/>
    2727
  • release-kits/wirk3/ant-scripts/create-installer.xml

    r18283 r19006  
    1313        <!-- some canned resources for the installer -->
    1414        <copy todir="${basedir}/installer/classes" overwrite="true">
    15             <fileset dir="${wirk3.home}/packages/7za" includes="7za.exe"/>
     15            <fileset dir="${wirk3.home}/windows/7za" includes="7za.exe"/>
    1616            <fileset file="${basedir}/distributions/web/LICENSE.txt"/>
    1717        </copy>
    1818
    1919        <!-- some classes from jars, unpacked to be repacked into installer -->
    20         <unjar src="${wirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
     20        <unjar src="${wirk3.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
    2121        <delete dir="${basedir}/installer/classes/META-INF"/>
    2222       
  • release-kits/wirk3/src/wirk3.cpp

    r17631 r19006  
    7676   
    7777    //set the classpath
    78     classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK3_HOME + "\\lib\\serializer.jar;" + WIRK3_HOME + "\\lib\\xalan.jar;" + WIRK3_HOME + "\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\packages\\ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\classes;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnjavahl.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnant.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnClientAdapter.jar";
    79     putenv( ("CLASSPATH=" + classpath).c_str() );
    80     putenv( "SystemDrive=C:" );
     78    //classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK3_HOME + "\\lib\\serializer.jar;" + WIRK3_HOME + "\\lib\\xalan.jar;" + WIRK3_HOME + "\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\packages\\ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\classes;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnjavahl.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnant.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnClientAdapter.jar";
     79    //putenv( ("CLASSPATH=" + classpath).c_str() );
     80    //putenv( "SystemDrive=C:" );
    8181
    8282    //create the command
    83     command = "\"\"" + WIRK3_HOME + "\\packages\\ant\\bin\\ant.bat\" -f \"" + WIRK3_HOME + "\\ant-scripts\\build.xml\" -addressing \"-Dwirk3.home=" + WIRK3_HOME + "\"";
     83    command = "\"\"" + WIRK3_HOME + "\\core\\ant\\bin\\ant.bat\" -f \"" + WIRK3_HOME + "\\ant-scripts\\build.xml\" -addressing \"-Dwirk3.home=" + WIRK3_HOME + "\"";
    8484    //pass on the arguments
    8585    string a;
Note: See TracChangeset for help on using the changeset viewer.