Changeset 17898 for release-kits

Show
Ignore:
Timestamp:
20.11.2008 16:33:21 (11 years ago)
Author:
oranfry
Message:

Standardised names of directories used in release kits

  • gsdl and greenstone3 -> compiled
  • distribution and distributions -> distributions
  • greenstone3 and web -> web

And, expect more specifically named properties files, e.g., lirk3-build.properties, wirk2-build.properties

Location:
release-kits
Files:
27 modified

Legend:

Unmodified
Added
Removed
  • release-kits/lirk2/ant-scripts/build.xml

    r17597 r17898  
    1313 
    1414    <!-- for the benefit of the shared scripts, set release-kit home --> 
     15    <property name="rk.name" value="lirk2"/> 
    1516    <property name="rk.home" value="${lirk2.home}" /> 
    1617    <property name="rk.os" value="linux" /> 
  • release-kits/lirk2/ant-scripts/compile.xml

    r17519 r17898  
    66        <!-- checkout --> 
    77        <antcall target="checkout-gsdl-gli" /> 
     8        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 
    89         
    910        <!-- configure --> 
     
    2930    <target name="checkout-gsdl-gli"> 
    3031        <svn> 
    31             <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/> 
    32             <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/> 
     32            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/> 
     33            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/> 
    3334        </svn> 
    3435    </target> 
     
    3637    <target name="add-static-to-configure-in"> 
    3738        <rsr 
    38             file="${basedir}/gsdl/configure.in" 
     39            file="${basedir}/compiled/configure.in" 
    3940            pattern="^LDFLAGS=.*$" 
    4041            replacement="LDFLAGS=-static" /> 
    41         <exec dir="${basedir}/gsdl" executable="autoconf" output="${basedir}/gsdl/configure"><arg value="configure.in"/></exec> 
     42        <exec dir="${basedir}/compiled" executable="autoconf" output="${basedir}/compiled/configure"><arg value="configure.in"/></exec> 
    4243    </target> 
    4344 
    4445    <target name="set-environment-in-packages-configure"> 
    4546        <rsr 
    46             file="${basedir}/gsdl/common-src/packages/configure" 
     47            file="${basedir}/compiled/common-src/packages/configure" 
    4748            pattern="^ENVIRONMENT=.*$" 
    4849            replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" /> 
    4950        <rsr 
    50             file="${basedir}/gsdl/build-src/packages/configure" 
     51            file="${basedir}/compiled/build-src/packages/configure" 
    5152            pattern="^ENVIRONMENT=.*$" 
    5253            replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" /> 
     
    5455 
    5556    <target name="run-configure"> 
    56         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure"> 
     57        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure"> 
    5758            <env key="LDFLAGS" value="-static"/> 
    5859        </exec> 
     
    6162    <target name="makefiles-add-static"> 
    6263        <rsr 
    63             file="${basedir}/gsdl/build-src/packages/wv/wv-gs/Makefile" 
     64            file="${basedir}/compiled/build-src/packages/wv/wv-gs/Makefile" 
    6465            pattern="^LDFLAGS =.*$" 
    6566            replacement="LDFLAGS = -static" /> 
    6667        <rsr 
    67             file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" 
     68            file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" 
    6869            pattern="^LDFLAGS =.*$" 
    6970            replacement="LDFLAGS = -static" /> 
    7071        <rsr 
    71             file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" 
     72            file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" 
    7273            pattern="^LDFLAGS =.*$" 
    7374            replacement="LDFLAGS = -static" /> 
    7475        <rsr 
    75             file="${basedir}/gsdl/build-src/packages/rtftohtml/rtftohtml_src/Makefile" 
     76            file="${basedir}/compiled/build-src/packages/rtftohtml/rtftohtml_src/Makefile" 
    7677            pattern="(-o rtftohtml.{2}EXEEXT.{1})" 
    7778            replacement="$1 -static" /> 
     
    7980 
    8081    <target name="run-make"> 
    81         <exec dir="${basedir}/gsdl" executable="make"/> 
     82        <exec dir="${basedir}/compiled" executable="make"/> 
    8283    </target> 
    8384 
    8485 
    8586    <target name="run-make-install"> 
    86         <exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec> 
     87        <exec dir="${basedir}/compiled" executable="make"><arg value="install"/></exec> 
    8788    </target> 
    8889 
    8990    <target name="copy-library-oai"> 
    90         <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/linux/library"/></exec> 
    91         <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec> 
     91        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/linux/library"/></exec> 
     92        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/linux/oaiserver"/></exec> 
    9293    </target> 
    9394 
    9495    <target name="strip-execs"> 
    95         <exec dir="${basedir}/gsdl/bin/linux" executable="find"> 
     96        <exec dir="${basedir}/compiled/bin/linux" executable="find"> 
    9697            <arg line="! -name . -type f -maxdepth 1 -exec strip {} &#59;"/> 
    9798        </exec> 
     
    99100 
    100101    <target name="build-demo-collection"> 
    101         <exec dir="${basedir}/gsdl" executable="${lirk2.home}/resources/build-demo.sh"/> 
     102        <exec dir="${basedir}/compiled" executable="${lirk2.home}/resources/build-demo.sh"/> 
    102103    </target> 
    103104 
  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r17835 r17898  
    55 
    66        <antcall target="export-gsdl-gli" /> 
    7         <antcall target="dist-set-version" /> 
     7        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall> 
    88        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 
    99        <antcall target="drop-in-docs" /> 
     
    3030            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 
    3131        </svn> 
    32     </target> 
    33      
    34     <target name="dist-set-version"> 
    35         <echo level="info">Setting version in src/lib/gsdlconf.h</echo> 
    36         <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
    37  
    38         <echo level="info">Setting version in Install.sh</echo> 
    39         <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" /> 
    40  
    41         <echo level="info">Setting version in etc/VERSION</echo> 
    42         <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" /> 
    4332    </target> 
    4433 
     
    8877        <echo level="info">Dropping compiled binaries into distribution</echo> 
    8978        <delete dir="distributions/web/bin/linux" /> 
    90         <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec> 
    91         <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec> 
    92         <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 
     79        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/linux distributions/web/bin"/></exec> 
     80        <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec> 
     81        <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 
    9382    </target> 
    9483 
     
    9685        <echo level="info">Dropping rebuilt demo collection into distribution</echo> 
    9786        <delete dir="distributions/web/collect/demo" /> 
    98         <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec> 
     87        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/collect/demo distributions/web/collect"/></exec> 
    9988    </target> 
    10089 
  • release-kits/lirk3/ant-scripts/build.xml

    r17596 r17898  
    1313 
    1414    <!-- for the benefit of the shared scripts, set release-kit home --> 
     15    <property name="rk.name" value="lirk3"/> 
    1516    <property name="rk.home" value="${lirk3.home}" /> 
    1617    <property name="rk.os" value="linux" /> 
  • release-kits/lirk3/ant-scripts/compile.xml

    r17523 r17898  
    99        <!-- preparation --> 
    1010        <antcall target="greenstone3-set-version-numbers"> 
    11             <param name="greenstone3basedir" value="${basedir}/greenstone3"/> 
     11            <param name="greenstone3basedir" value="${basedir}/compiled"/> 
    1212        </antcall> 
    13         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/> 
     13        <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/> 
    1414 
    1515        <antcall target="tweak-configure-scripts" /> 
    1616 
    1717        <!-- update --> 
    18         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/> 
     18        <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/> 
    1919 
    2020        <!-- configure --> 
    2121        <antcall target="regenerate-configure"/> 
    22         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/> 
     22        <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/> 
    2323        <antcall target="tweak-makefiles" /> 
    2424 
    2525        <!-- build --> 
    26         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/> 
     26        <ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/> 
    2727        <antcall target="linux-strip-execs" /> 
    2828 
     
    3737    <target name="checkout-greenstone3"> 
    3838        <svn> 
    39             <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/> 
     39            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/> 
    4040        </svn> 
    4141    </target> 
     
    4848 
    4949    <target name="regenerate-configure"> 
    50         <exec dir="greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure"> 
     50        <exec dir="compiled/gs2build" executable="autoconf" output="compiled/gs2build/configure"> 
    5151            <arg line="configure.in"/> 
    5252        </exec> 
    53         <chmod file="greenstone3/gs2build/configure" perm="+x"/> 
     53        <chmod file="compiled/gs2build/configure" perm="+x"/> 
    5454    </target> 
    5555 
     
    6363 
    6464    <target name="linux-strip-execs"> 
    65         <exec dir="greenstone3/gs2build/bin/linux" executable="find"> 
     65        <exec dir="compiled/gs2build/bin/linux" executable="find"> 
    6666            <arg line="! -name . -exec strip {} &#59;"/> 
    6767        </exec> 
     
    6969 
    7070    <target name="prepare-documentation"> 
    71         <mkdir dir="greenstone3/gsdl-manuals"/> 
     71        <mkdir dir="compiled/gsdl-manuals"/> 
    7272        <svn> 
    73             <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals"/> 
    74             <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/> 
     73            <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/> 
     74            <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/> 
    7575        </svn> 
    76         <javac srcdir="greenstone3/gsdl-manuals/shared" 
    77               destdir="greenstone3/gsdl-manuals/shared" 
     76        <javac srcdir="compiled/gsdl-manuals/shared" 
     77              destdir="compiled/gsdl-manuals/shared" 
    7878              debug="on"> 
    7979            <include name="*.java"/> 
    8080        </javac> 
    81         <unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/> 
     81        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/> 
    8282 
    8383        <path id="documentation.compile.classpath"> 
    84             <fileset dir="greenstone3/gsdl-manuals"> 
     84            <fileset dir="compiled/gsdl-manuals"> 
    8585                <include name="**/*.jar"/> 
    8686            </fileset> 
    87             <pathelement path="greenstone3/gsdl-manuals/shared"/> 
    88             <pathelement path="greenstone3/gsdl-manuals/manuals"/> 
     87            <pathelement path="compiled/gsdl-manuals/shared"/> 
     88            <pathelement path="compiled/gsdl-manuals/manuals"/> 
    8989        </path> 
    9090 
    91         <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml"> 
    92             <arg value="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 
    93             <arg value="greenstone3/gli/help/en/help.xml" /> 
    94             <arg value="greenstone3" /> 
     91        <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml"> 
     92            <arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 
     93            <arg value="compiled/gli/help/en/help.xml" /> 
     94            <arg value="compiled" /> 
    9595        </java> 
    9696 
    97         <chmod perm="a+x" file="greenstone3/gsdl-manuals/shared/fop/fop.sh"/> 
     97        <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/> 
    9898        <echo>Run generate-pdf.sh</echo> 
    99         <exec dir="greenstone3/gsdl-manuals/manuals" executable="/bin/sh"> 
     99        <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh"> 
    100100            <arg line="generate-pdf.sh u en" /> 
    101101        </exec> 
     
    109109 
    110110    <target name="mgpp-add-static"> 
    111         <rsr file="greenstone3/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" /> 
    112         <exec dir="greenstone3/gs2build/common-src/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mgpp/configure"> 
     111        <rsr file="compiled/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" /> 
     112        <exec dir="compiled/gs2build/common-src/indexers/mgpp" executable="autoconf" output="compiled/gs2build/common-src/indexers/mgpp/configure"> 
    113113            <arg line="configure.in"/> 
    114114        </exec> 
     
    116116 
    117117    <target name="mg-add-static"> 
    118         <rsr file="greenstone3/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" /> 
    119         <exec dir="greenstone3/gs2build/common-src/indexers/mg" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mg/configure"> 
     118        <rsr file="compiled/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" /> 
     119        <exec dir="compiled/gs2build/common-src/indexers/mg" executable="autoconf" output="compiled/gs2build/common-src/indexers/mg/configure"> 
    120120            <arg line="configure.in"/> 
    121121        </exec> 
     
    123123 
    124124    <target name="gs2build-add-static"> 
    125         <rsr file="greenstone3/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" /> 
    126         <rsr file="greenstone3/gs2build/build-src/packages/configure"  pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" /> 
    127         <rsr file="greenstone3/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" /> 
     125        <rsr file="compiled/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" /> 
     126        <rsr file="compiled/gs2build/build-src/packages/configure"  pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" /> 
     127        <rsr file="compiled/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" /> 
    128128    </target> 
    129129 
    130130    <target name="wv-add-static"> 
    131         <rsr file="greenstone3/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" /> 
     131        <rsr file="compiled/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" /> 
    132132    </target> 
    133133 
    134134    <target name="xlhtml-add-static"> 
    135         <rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" /> 
     135        <rsr file="compiled/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" /> 
    136136    </target> 
    137137 
    138138    <target name="ppthtml-add-static"> 
    139         <rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" /> 
     139        <rsr file="compiled/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" /> 
    140140    </target> 
    141141 
    142142    <target name="rtftohtml-add-static"> 
    143         <rsr file="greenstone3/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" /> 
     143        <rsr file="compiled/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" /> 
    144144    </target> 
    145145 
    146146    <target name="gdbm-add-static"> 
    147         <rsr file="greenstone3/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" /> 
     147        <rsr file="compiled/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" /> 
    148148    </target> 
    149149 
  • release-kits/lirk3/ant-scripts/create-components.xml

    r17814 r17898  
    22<project name="lirk3-create-components" default="create-components"> 
    33 
    4     <!-- create components from the distribution folder --> 
     4    <!-- create components from the distributions folder --> 
    55 
    66    <!-- 1st level --> 
     
    4242                 
    4343        <copy todir="components/tmp/core" overwrite="true"> 
    44             <fileset dir="distribution/greenstone3"> 
     44            <fileset dir="distributions/web"> 
    4545                <include name="**/*"/> 
    4646 
     
    5858                <exclude name="packages/tomcat"/> 
    5959                <exclude name="packages/tomcat/**/*"/> 
    60                 <exclude name="distributions/greenstone3/gs2build/bin/linux/imagemagick"/> 
    61                 <exclude name="distributions/greenstone3/gs2build/bin/linux/imagemagick/**/*"/> 
     60                <exclude name="distributions/web/gs2build/bin/linux/imagemagick"/> 
     61                <exclude name="distributions/web/gs2build/bin/linux/imagemagick/**/*"/> 
    6262 
    6363            </fileset> 
     
    7878 
    7979        <copy todir="components/tmp/sourcecode" overwrite="true"> 
    80                 <fileset dir="distribution/greenstone3"> 
     80                <fileset dir="distributions/web"> 
    8181                    <include name="src/**/*"/> 
    8282                    <include name="gs2build/common-src/**/*"/> 
     
    100100 
    101101        <copy todir="components/tmp/ant" overwrite="true"> 
    102             <fileset dir="distribution/greenstone3/packages"> 
     102            <fileset dir="distributions/web/packages"> 
    103103                <include name="ant/**/*"/> 
    104104            </fileset> 
     
    119119 
    120120        <copy todir="components/tmp/tomcat" overwrite="true"> 
    121             <fileset dir="distribution/greenstone3/packages"> 
     121            <fileset dir="distributions/web/packages"> 
    122122                <include name="tomcat/**/*"/> 
    123123            </fileset> 
     
    138138 
    139139        <copy todir="components/tmp/imagemagick" overwrite="true"> 
    140             <fileset dir="distribution/greenstone3/gs2build/bin/linux"> 
     140            <fileset dir="distributions/web/gs2build/bin/linux"> 
    141141                <include name="imagemagick/**/*"/> 
    142142            </fileset> 
  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r17816 r17898  
    66        <!-- create distribution --> 
    77        <antcall target="export-greenstone3-gli" /> 
    8         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/></antcall> 
    9         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall> 
     8        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web"/></antcall> 
     9        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 
    1010        <antcall target="insert-user-manual"/> 
    1111        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets --> 
    1212 
    13         <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets --> 
     13        <antcall target="copy-web-to-source" /> <!-- from init --> 
    1414 
    15         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false"> 
     15        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-1" inheritAll="false"> 
    1616            <property name="app.version" value="${version}"/> 
    1717            <property name="branch.path" value="${branch.path}"/> 
    1818        </ant> 
    19         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false"> 
     19        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-2" inheritAll="false"> 
    2020            <property name="app.version" value="${version}"/> 
    2121            <property name="branch.path" value="${branch.path}"/> 
    2222        </ant> 
    23         <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritAll="false"> 
     23        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-3" inheritAll="false"> 
    2424            <property name="app.version" value="${version}"/> 
    2525            <property name="branch.path" value="${branch.path}"/> 
     
    2929        <antcall target="export-imagemagick-linux-binaries" /> 
    3030     
    31         <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init --> 
     31        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init --> 
    3232 
    3333    </target> 
    3434 
    3535    <target name="export-greenstone3-gli"> 
    36         <mkdir dir="distribution"/> 
    37         <delete dir="distribution/greenstone3"/> 
     36        <mkdir dir="distributions"/> 
     37        <delete dir="distributions/web"/> 
    3838        <svn> 
    39             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/> 
    40             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/> 
     39            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/> 
     40            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 
    4141        </svn> 
    4242    </target> 
    4343     
    4444    <target name="export-imagemagick-linux-binaries"> 
    45         <delete dir="distribution/greenstone3/gs2build/bin/linux/imagemagick"/> 
     45        <delete dir="distributions/web/gs2build/bin/linux/imagemagick"/> 
    4646        <svn> 
    47             <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distribution/greenstone3/gs2build/bin/linux/imagemagick"/> 
     47            <export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distributions/web/gs2build/bin/linux/imagemagick"/> 
    4848        </svn> 
    4949    </target> 
    5050 
    5151    <target name="copy-over-build-xml"> 
    52         <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/> 
     52        <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/> 
    5353    </target> 
    5454 
    5555    <target name="insert-user-manual"> 
    56         <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/> 
     56        <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/> 
    5757    </target> 
    5858 
    5959    <target name="insert-compiled-binaries"> 
    60         <delete dir="distribution/greenstone3/lib/jni"/> 
    61         <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec> 
     60        <delete dir="distributions/web/lib/jni"/> 
     61        <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec> 
    6262 
    63         <delete dir="distribution/greenstone3/gs2build/bin/linux"/> 
    64         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec> 
     63        <delete dir="distributions/web/gs2build/bin/linux"/> 
     64        <exec executable="cp"><arg line="-r compiled/gs2build/bin/linux distributions/web/gs2build/bin"/></exec> 
    6565 
    66         <delete dir="distribution/greenstone3/gs2build/bin/java"/> 
    67         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec> 
     66        <delete dir="distributions/web/gs2build/bin/java"/> 
     67        <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec> 
    6868 
    69         <exec executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec> 
     69        <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec> 
    7070 
    7171    </target> 
  • release-kits/lirk3/ant-scripts/create-installer.xml

    r17697 r17898  
    1313 
    1414        <copy todir="${basedir}/installer/classes" overwrite="true"> 
    15             <fileset file="${basedir}/distribution/greenstone3/LICENSE.txt"/> 
     15            <fileset file="${basedir}/distributions/web/LICENSE.txt"/> 
    1616        </copy> 
    1717 
  • release-kits/mark2/ant-scripts/build.xml

    r17597 r17898  
    1616 
    1717    <!-- for the benefit of the shared scripts, set release-kit home --> 
     18    <property name="rk.name" value="mark2"/> 
    1819    <property name="rk.home" value="${mark2.home}" /> 
    1920    <property name="rk.os" value="linux" /> 
     21    <!-- os.suffix set dynamically below --> 
    2022 
    2123    <!-- IMPORT OTHER ANT SCRIPTS --> 
  • release-kits/mark2/ant-scripts/compile.xml

    r17523 r17898  
    66        <!-- checkout --> 
    77        <antcall target="checkout-gsdl-gli" /> 
     8        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 
    89         
    910        <!-- configure --> 
     
    2728    <target name="checkout-gsdl-gli"> 
    2829        <svn javahl="false"> 
    29             <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/> 
    30             <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/> 
     30            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/> 
     31            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/> 
    3132        </svn> 
    3233    </target> 
    3334 
    3435    <target name="run-configure"> 
    35         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure"> 
     36        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure"> 
    3637            <arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/> 
    3738        </exec> 
     
    3940 
    4041    <target name="tweak-makefiles"> 
    41         <rsr file="${basedir}/gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
    42         <rsr file="${basedir}/gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
    43         <rsr file="${basedir}/gsdl/common-src/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
    44         <rsr file="${basedir}/gsdl/common-src/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
    45         <rsr file="${basedir}/gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 
    46         <rsr file="${basedir}/gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 
     42        <rsr file="${basedir}/compiled/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
     43        <rsr file="${basedir}/compiled/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
     44        <rsr file="${basedir}/compiled/common-src/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
     45        <rsr file="${basedir}/compiled/common-src/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
     46        <rsr file="${basedir}/compiled/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 
     47        <rsr file="${basedir}/compiled/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" /> 
    4748    </target> 
    4849 
    4950    <target name="run-make"> 
    50         <exec dir="${basedir}/gsdl" executable="make"/> 
     51        <exec dir="${basedir}/compiled" executable="make"/> 
    5152    </target> 
    5253 
    5354    <target name="run-make-install"> 
    54         <exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec> 
     55        <exec dir="${basedir}/compiled" executable="make"><arg value="install"/></exec> 
    5556    </target> 
    5657 
    5758    <target name="copy-library-oai"> 
    58         <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec> 
    59         <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec> 
     59        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/darwin/library"/></exec> 
     60        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/darwin/oaiserver"/></exec> 
    6061    </target> 
    6162 
    6263    <target name="strip-execs"> 
    63         <exec dir="${basedir}/gsdl/bin/darwin" executable="find"> 
     64        <exec dir="${basedir}/compiled/bin/darwin" executable="find"> 
    6465            <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/> 
    6566        </exec> 
     
    6768 
    6869    <target name="build-demo-collection"> 
    69         <exec dir="${basedir}/gsdl" executable="${mark2.home}/resources/build-demo.sh"/> 
     70        <exec dir="${basedir}/compiled" executable="${mark2.home}/resources/build-demo.sh"/> 
    7071    </target> 
    7172 
  • release-kits/mark2/ant-scripts/create-distribution.xml

    r17835 r17898  
    55 
    66        <antcall target="export-gsdl-gli" /> 
    7         <antcall target="dist-set-version" /> 
     7        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall> 
    88        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 
    99        <antcall target="drop-in-docs" /> 
     
    4747    </target> 
    4848 
    49     <target name="dist-set-version"> 
    50         <echo level="info">Setting version in common-src/src/lib/gsdlconf.h</echo> 
    51         <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
    52  
    53         <echo level="info">Setting version in Install.sh</echo> 
    54         <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" /> 
    55  
    56         <echo level="info">Setting version in etc/VERSION</echo> 
    57         <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" /> 
    58     </target> 
    59  
    60     <target name="dist-set-gli-version"> 
    61  
    62     </target> 
    63  
    6449    <target name="drop-in-binaries"> 
    6550        <echo level="info">Dropping compiled binaries into distribution</echo> 
    6651        <delete dir="distributions/web/bin/linux" /> 
    6752        <delete dir="distributions/web/bin/darwin" /> 
    68         <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/darwin distributions/web/bin"/></exec> 
    69         <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec> 
    70         <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 
     53        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/darwin distributions/web/bin"/></exec> 
     54        <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec> 
     55        <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 
    7156    </target> 
    7257 
     
    7459        <echo level="info">Dropping rebuilt demo collection into distribution</echo> 
    7560        <delete dir="distributions/web/collect/demo" /> 
    76         <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec> 
     61        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/collect/demo distributions/web/collect"/></exec> 
    7762    </target> 
    7863 
  • release-kits/mark3/ant-scripts/build.xml

    r17597 r17898  
    1616 
    1717    <!-- for the benefit of the shared scripts, set release-kit home --> 
     18    <property name="rk.name" value="mark3"/> 
    1819    <property name="rk.home" value="${mark3.home}" /> 
    1920    <property name="rk.os" value="linux" /> 
     21    <!-- os.suffix set dynamically below --> 
    2022 
    2123    <!-- IMPORT OTHER ANT SCRIPTS --> 
  • release-kits/mark3/ant-scripts/compile.xml

    r17523 r17898  
    99        <!-- preparation --> 
    1010        <antcall target="greenstone3-set-version-numbers"> 
    11             <param name="greenstone3basedir" value="${basedir}/greenstone3"/> 
     11            <param name="greenstone3basedir" value="${basedir}/compiled"/> 
    1212        </antcall> 
    1313        <antcall target="set-gdbm-installed-path" /> 
    14         <ant target="prepare-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
     14        <ant target="prepare-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
    1515         
    1616        <!-- update --> 
    17         <ant target="update-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
     17        <ant target="update-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
    1818 
    1919        <!-- configure --> 
    20         <ant target="configure-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
     20        <ant target="configure-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
    2121        <antcall target="tweak-makefiles" /> 
    2222 
    2323        <!-- build --> 
    24         <ant target="build-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
     24        <ant target="build-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
    2525        <antcall target="linux-strip-execs" /> 
    2626 
     
    3535    <target name="checkout-greenstone3"> 
    3636        <svn javahl="false"> 
    37             <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/> 
     37            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/> 
    3838        </svn> 
    3939    </target> 
    4040 
    4141    <target name="set-version-number-property"> 
    42         <rsr file="greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" /> 
     42        <rsr file="compiled/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" /> 
    4343    </target> 
    4444 
    4545    <target name="set-gdbm-installed-path"> 
    46         <rsr file="greenstone3/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/> 
     46        <rsr file="compiled/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/> 
    4747    </target> 
    4848 
    4949    <target name="tweak-makefiles"> 
    5050        <rsr 
    51             file="${basedir}/greenstone3/gs2build/common-src/src/gdbmedit/db2txt/Makefile" 
     51            file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/db2txt/Makefile" 
    5252            pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" 
    5353            replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
    5454 
    5555        <rsr 
    56             file="${basedir}/greenstone3/gs2build/common-src/src/gdbmedit/txt2db/Makefile" 
     56            file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/txt2db/Makefile" 
    5757            pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" 
    5858            replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
    5959 
    6060        <rsr 
    61             file="${basedir}/greenstone3/src/packages/javagdbm/jni/Makefile" 
     61            file="${basedir}/compiled/src/packages/javagdbm/jni/Makefile" 
    6262            pattern="^(GDBM_LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" 
    6363            replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" /> 
     
    6565 
    6666    <target name="linux-strip-execs"> 
    67         <exec dir="greenstone3/gs2build/bin/darwin" executable="find"> 
     67        <exec dir="compiled/gs2build/bin/darwin" executable="find"> 
    6868            <arg line=". ! -name . -exec strip {} &#59;"/> 
    6969        </exec> 
     
    7171 
    7272    <target name="prepare-documentation"> 
    73         <mkdir dir="greenstone3/gsdl-manuals"/> 
     73        <mkdir dir="compiled/gsdl-manuals"/> 
    7474        <svn javahl="false"> 
    75             <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals"/> 
    76             <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/> 
     75            <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/> 
     76            <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/> 
    7777        </svn> 
    78         <javac srcdir="greenstone3/gsdl-manuals/shared" 
    79               destdir="greenstone3/gsdl-manuals/shared" 
     78        <javac srcdir="compiled/gsdl-manuals/shared" 
     79              destdir="compiled/gsdl-manuals/shared" 
    8080              debug="on"> 
    8181            <include name="*.java"/> 
    8282        </javac> 
    83         <unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/> 
     83        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/> 
    8484 
    8585        <path id="documentation.compile.classpath"> 
    86             <fileset dir="greenstone3/gsdl-manuals"> 
     86            <fileset dir="compiled/gsdl-manuals"> 
    8787                <include name="**/*.jar"/> 
    8888            </fileset> 
    89             <pathelement path="greenstone3/gsdl-manuals/shared"/> 
    90             <pathelement path="greenstone3/gsdl-manuals/manuals"/> 
     89            <pathelement path="compiled/gsdl-manuals/shared"/> 
     90            <pathelement path="compiled/gsdl-manuals/manuals"/> 
    9191        </path> 
    9292 
    93         <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml"> 
    94             <arg value="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 
    95             <arg value="greenstone3/gli/help/en/help.xml" /> 
    96             <arg value="greenstone3" /> 
     93        <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml"> 
     94            <arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 
     95            <arg value="compiled/gli/help/en/help.xml" /> 
     96            <arg value="compiled" /> 
    9797        </java> 
    9898 
    99         <chmod perm="a+x" file="greenstone3/gsdl-manuals/shared/fop/fop.sh"/> 
     99        <chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/> 
    100100        <echo>Run generate-pdf.sh</echo> 
    101         <exec dir="greenstone3/gsdl-manuals/manuals" executable="/bin/sh"> 
     101        <exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh"> 
    102102            <arg line="generate-pdf.sh u en" /> 
    103103        </exec> 
  • release-kits/mark3/ant-scripts/create-components.xml

    r17814 r17898  
    22<project name="mark3-create-components" default="create-components"> 
    33 
    4     <!-- create components from the distribution folder --> 
     4    <!-- create components from the distributions folder --> 
    55 
    66    <!-- 1st level --> 
     
    4343                 
    4444        <copy todir="components/tmp/core" overwrite="true"> 
    45             <fileset dir="distribution/greenstone3"> 
     45            <fileset dir="distributions/web"> 
    4646                <include name="**/*"/> 
    4747 
     
    8585 
    8686        <copy todir="components/tmp/sourcecode" overwrite="true"> 
    87                 <fileset dir="distribution/greenstone3"> 
     87                <fileset dir="distributions/web"> 
    8888                    <include name="src/**/*"/> 
    8989                    <include name="gs2build/common-src/**/*"/> 
     
    108108 
    109109        <copy todir="components/tmp/ant" overwrite="true"> 
    110             <fileset dir="distribution/greenstone3/packages"> 
     110            <fileset dir="distributions/web/packages"> 
    111111                <include name="ant/**/*"/> 
    112112            </fileset> 
     
    127127 
    128128        <copy todir="components/tmp/tomcat" overwrite="true"> 
    129             <fileset dir="distribution/greenstone3/packages"> 
     129            <fileset dir="distributions/web/packages"> 
    130130                <include name="tomcat/**/*"/> 
    131131            </fileset> 
     
    146146 
    147147        <copy todir="components/tmp/imagemagick" overwrite="true"> 
    148             <fileset dir="distribution/greenstone3/gs2build/bin/darwin"> 
     148            <fileset dir="distributions/web/gs2build/bin/darwin"> 
    149149                <include name="imagemagick/**/*"/> 
    150150            </fileset> 
     
    165165 
    166166        <copy todir="components/tmp/ghostscript" overwrite="true"> 
    167             <fileset dir="distribution/greenstone3/gs2build/bin/darwin"> 
     167            <fileset dir="distributions/web/gs2build/bin/darwin"> 
    168168                <include name="ghostscript/**/*"/> 
    169169            </fileset> 
  • release-kits/mark3/ant-scripts/create-distribution.xml

    r17833 r17898  
    66        <!-- create distribution --> 
    77        <antcall target="export-greenstone3-gli" /> 
    8         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/></antcall> 
    9         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall> 
     8        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web"/></antcall> 
     9        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 
    1010        <antcall target="insert-user-manual"/> 
    1111        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk3-targets --> 
    1212 
    13         <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets --> 
     13        <antcall target="copy-web-to-source" /> <!-- from init --> 
    1414 
    15         <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     15        <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    1616            <property name="app.version" value="${version}"/> 
    1717            <property name="branch.path" value="${branch.path}"/> 
    1818        </ant> 
    1919 
    20         <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     20        <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    2121            <property name="app.version" value="${version}"/> 
    2222            <property name="branch.path" value="${branch.path}"/> 
    2323        </ant> 
    2424 
    25         <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     25        <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    2626            <property name="app.version" value="${version}"/> 
    2727            <property name="branch.path" value="${branch.path}"/> 
     
    3232        <antcall target="export-imagemagick-darwin-binaries" /> 
    3333        <antcall target="export-ghostscript-darwin-binaries" /> 
    34         <antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init --> 
     34        <antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init --> 
    3535    </target> 
    3636 
    3737    <target name="export-greenstone3-gli"> 
    38         <mkdir dir="distribution"/> 
    39         <delete dir="distribution/greenstone3"/> 
     38        <mkdir dir="distributions"/> 
     39        <delete dir="distributions/web"/> 
    4040        <svn javahl="false"> 
    41             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/> 
    42             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/> 
     41            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/> 
     42            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 
    4343        </svn> 
    4444    </target> 
    4545     
    4646    <target name="export-imagemagick-darwin-binaries"> 
    47         <delete dir="distribution/greenstone3/gs2build/bin/darwin/imagemagick"/> 
     47        <delete dir="distributions/web/gs2build/bin/darwin/imagemagick"/> 
    4848        <svn> 
    49             <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distribution/greenstone3/gs2build/bin/darwin/imagemagick"/> 
     49            <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distributions/web/gs2build/bin/darwin/imagemagick"/> 
    5050        </svn> 
    5151    </target> 
    5252     
    5353    <target name="export-ghostscript-darwin-binaries"> 
    54         <delete dir="distribution/greenstone3/gs2build/bin/darwin/ghostscript"/> 
     54        <delete dir="distributions/web/gs2build/bin/darwin/ghostscript"/> 
    5555        <svn> 
    56             <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distribution/greenstone3/gs2build/bin/darwin/ghostscript"/> 
     56            <export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distributions/web/gs2build/bin/darwin/ghostscript"/> 
    5757        </svn> 
    5858    </target> 
    5959 
    60     <target name="dist-set-version-number-property"> 
    61         <rsr 
    62             file="distribution/greenstone3/resources/java/global.properties.in" 
    63             pattern="(.*)@gsdl3version@(.*)" 
    64             replacement="$1${version}$2" /> 
    65     </target> 
    66  
    6760    <target name="copy-over-build-xml"> 
    68         <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/> 
     61        <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/> 
    6962    </target> 
    7063 
    7164    <target name="insert-user-manual"> 
    72         <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/> 
     65        <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/> 
    7366    </target> 
    7467 
    7568    <target name="insert-compiled-binaries"> 
    76         <delete dir="distribution/greenstone3/lib/jni"/> 
    77         <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec> 
     69        <delete dir="distributions/web/lib/jni"/> 
     70        <exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec> 
    7871 
    79         <delete dir="distribution/greenstone3/gs2build/bin/darwin"/> 
    80         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/darwin distribution/greenstone3/gs2build/bin"/></exec> 
     72        <delete dir="distributions/web/gs2build/bin/darwin"/> 
     73        <exec executable="cp"><arg line="-r compiled/gs2build/bin/darwin distributions/web/gs2build/bin"/></exec> 
    8174 
    82         <delete dir="distribution/greenstone3/gs2build/bin/java"/> 
    83         <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec> 
    84         <exec executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec> 
     75        <delete dir="distributions/web/gs2build/bin/java"/> 
     76        <exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec> 
     77        <exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec> 
    8578    </target> 
    8679 
    87     <target name="rename-build-xml-for-transit"> 
    88         <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/> 
    89     </target> 
    90  
    91  
    9280</project> 
  • release-kits/mark3/ant-scripts/create-installer.xml

    r17697 r17898  
    1313 
    1414        <copy todir="${basedir}/installer/classes" overwrite="true"> 
    15             <fileset file="${basedir}/distribution/greenstone3/LICENSE.txt" />  
     15            <fileset file="${basedir}/distributions/web/LICENSE.txt" />  
    1616        </copy> 
    1717 
  • release-kits/shared/ant-scripts/init.xml

    r17881 r17898  
    33 
    44    <!-- load in static properties from build.properties --> 
    5     <property file="build.properties" /> 
     5    <property file="${rk.name}-build.properties" /> 
    66 
    77    <!-- CONSTANTS (overridable in build.properties) --> 
     
    5252 
    5353        <!-- our classes --> 
    54         <fileset dir="${rk.home}/ant-scripts/tasks"> 
    55             <include name="**/*.jar"/> 
    56         </fileset> 
    57  
    58         <!-- jars in lib directory --> 
    59         <fileset dir="${rk.home}/lib"> 
    60             <include name="*.jar"/> 
    61         </fileset> 
    62  
    63         <!-- a few ant-installer jars --> 
    64         <fileset dir="${rk.home}/packages/ant-installer/lib"> 
    65             <include name="ant-installer-ext.jar"/> 
    66             <include name="ant-installer.jar"/> 
     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"/> 
     65            <include name="lib/crypt.jar"/> 
     66            <include name="lib/serializer.jar"/> 
     67            <include name="lib/xalan.jar"/> 
     68            <include name="lib/xercesImpl.jar"/> 
     69            <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"/> 
    6772        </fileset> 
    6873 
     
    118123                <not><isset property="version"/></not> 
    119124            </bool> 
    120             <fail>Version number not set</fail> 
     125            <fail>Version number not set. 
     126Check that the file '${rk.name}-build.properties' exists and defines property 'version'.</fail> 
    121127        </if> 
    122128        <property name="app.version" value="${version}"/> 
     
    224230    </target> 
    225231 
     232    <!-- fork the web distribution to preserve a source release --> 
    226233    <target name="copy-web-to-source"> 
    227234        <copy todir="distributions/source"><fileset dir="distributions/web"/></copy> 
     
    415422    </target> 
    416423 
     424    <!-- shared target to compile the uninstaller --> 
     425    <target name="compile-uninstaller"> 
     426        <echo>Compiling Uninstaller</echo> 
     427 
     428        <!-- create working build directory --> 
     429        <mkdir dir="${basedir}/compiled/uninstaller/build/resources" /> 
     430 
     431        <!-- copile to build --> 
     432        <javac 
     433            srcdir="${rk.home}/uninstaller" 
     434            destdir="${basedir}/compiled/uninstaller/build" /> 
     435 
     436        <!-- copy language bundle into place --> 
     437        <native2ascii 
     438            implementation="sun" 
     439            src="${rk.home}/language-strings" 
     440            dest="${basedir}/compiled/uninstaller/build/resources"/> 
     441 
     442        <!-- jar it all up --> 
     443        <jar 
     444            destfile="${basedir}/compiled/uninstaller/uninst.jar" 
     445            manifest="${rk.home}/uninstaller/manifest.mf" 
     446            basedir="${basedir}/compiled/uninstaller/build" /> 
     447 
     448    </target> 
     449 
     450    <!-- copy the uninstaller from the compiled directory to web distribution --> 
     451    <target name="insert-uninstaller"> 
     452        <copy file="compiled/uninstaller/uninst.jar" todir="distributions/web" /> 
     453        <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" /> 
     454    </target> 
     455 
     456    <!-- creates the comp for the source release, works for all release kits --> 
     457    <target name="prepare-source-release"> 
     458        <delete dir="components/tmp/source-release"/> 
     459        <mkdir dir="components/tmp/source-release"/> 
     460 
     461        <copy todir="components/tmp/source-release" overwrite="true"> 
     462            <fileset dir="distributions/source"/> 
     463        </copy> 
     464        <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/> 
     465    </target> 
     466 
    417467</project> 
  • release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

    r17810 r17898  
    1212    <property name="version.major" value="2"/> 
    1313 
    14     <target name="compile-uninstaller"> 
    15         <echo>Compiling Uninstaller</echo> 
     14    <target name="gsdl-set-version-numbers"> 
     15        <echo level="info">Setting version in src/lib/gsdlconf.h</echo> 
     16        <rsr file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
    1617 
    17         <!-- create working build directory --> 
    18         <mkdir dir="${basedir}/gsdl/uninstaller/build/resources" /> 
     18        <echo level="info">Setting version in Install.sh</echo> 
     19        <rsr file="${gsdl.basedir}/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" /> 
    1920 
    20         <!-- copile to build --> 
    21         <javac 
    22             srcdir="${rk.home}/uninstaller" 
    23             destdir="${basedir}/gsdl/uninstaller/build" /> 
    24  
    25         <!-- copy language bundle into place --> 
    26         <native2ascii 
    27             implementation="sun" 
    28             src="${rk.home}/language-strings" 
    29             dest="${basedir}/gsdl/uninstaller/build/resources"/> 
    30  
    31         <!-- jar it all up --> 
    32         <jar 
    33             destfile="${basedir}/gsdl/uninstaller/uninst.jar" 
    34             manifest="${rk.home}/uninstaller/manifest.mf" 
    35             basedir="${basedir}/gsdl/uninstaller/build" /> 
    36  
    37     </target> 
    38  
    39     <target name="insert-uninstaller"> 
    40         <copy file="gsdl/uninstaller/uninst.jar" todir="distributions/web" /> 
    41         <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" /> 
     21        <echo level="info">Setting version in etc/VERSION</echo> 
     22        <rsr file="${gsdl.basedir}/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" /> 
    4223    </target> 
    4324 
     
    4930    </target> 
    5031 
    51     <!-- source-release --> 
    52     <target name="prepare-source-release"> 
    53         <delete dir="components/tmp/source-release"/> 
    54         <mkdir dir="components/tmp/source-release"/> 
    55  
    56         <copy todir="components/tmp/source-release" overwrite="true"> 
    57             <fileset dir="distributions/source"/> 
    58         </copy> 
    59         <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false" includes="**/*"/> 
    60     </target> 
    61  
    62  
    6332</project> 
  • release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

    r17813 r17898  
    1212    <property name="version.major" value="3"/> 
    1313 
    14     <target name="compile-uninstaller"> 
    15         <echo>Compiling Uninstaller</echo> 
    16  
    17         <!-- create working build directory --> 
    18         <mkdir dir="${basedir}/greenstone3/uninstaller/build/resources" /> 
    19  
    20         <!-- copile to build --> 
    21         <javac 
    22             srcdir="${rk.home}/uninstaller" 
    23             destdir="${basedir}/greenstone3/uninstaller/build" /> 
    24  
    25         <!-- copy language bundle into place --> 
    26         <native2ascii 
    27             implementation="sun" 
    28             src="${rk.home}/language-strings" 
    29             dest="${basedir}/greenstone3/uninstaller/build/resources"/> 
    30  
    31         <!-- jar it all up --> 
    32         <jar 
    33             destfile="${basedir}/greenstone3/uninstaller/uninst.jar" 
    34             manifest="${rk.home}/uninstaller/manifest.mf" 
    35             basedir="${basedir}/greenstone3/uninstaller/build" /> 
    36  
    37     </target> 
    38  
    39     <target name="insert-uninstaller"> 
    40         <copy file="greenstone3/uninstaller/uninst.jar" todir="distribution/greenstone3" /> 
    41         <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distribution/greenstone3" /> 
    42     </target> 
    43  
    4414    <target name="greenstone3-set-version-numbers"> 
    4515        <rsr 
     
    4919    </target> 
    5020 
    51     <target name="copy-web-to-source-greenstone3"> 
    52         <copy todir="distribution/source"><fileset dir="distribution/greenstone3"/></copy> 
    53     </target> 
    54  
    55  
    56     <!-- sourcecode-release --> 
    57     <target name="prepare-source-release"> 
    58         <delete dir="components/tmp/source-release"/> 
    59         <mkdir dir="components/tmp/source-release"/> 
    60  
    61         <copy todir="components/tmp/source-release" overwrite="true"> 
    62             <fileset dir="distribution/source"/> 
    63         </copy> 
    64         <zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/> 
    65     </target> 
    66  
    67  
    6821</project> 
  • release-kits/wirk2/ant-scripts/build.xml

    r17597 r17898  
    1616 
    1717    <!-- for the benefit of the shared scripts, set release-kit home --> 
     18    <property name="rk.name" value="wirk2"/> 
    1819    <property name="rk.home" value="${wirk2.home}" /> 
    1920    <property name="rk.os" value="windows" /> 
  • release-kits/wirk2/ant-scripts/compile.xml

    r17583 r17898  
    44    <target name="compile"> 
    55        <antcall target="checkout-gsdl-gli" /> 
    6         <antcall target="set-version-numbers" /> 
     6        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 
    77        <antcall target="unzip-packages" /> 
    88        <antcall target="get-winbin" /> 
     
    1515    <target name="checkout-gsdl-gli"> 
    1616        <svn> 
    17             <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/> 
    18             <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/> 
     17            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/> 
     18            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/> 
    1919        </svn> 
    2020    </target> 
    2121 
    22     <target name="set-version-numbers"> 
    23         <rsr file="${basedir}/gsdl/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" /> 
    24         <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" /> 
    25         <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" /> 
    26     </target> 
    27  
    2822    <target name="unzip-packages"> 
    29         <unzip src="${basedir}/gsdl/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/common-src/packages/windows/crypt"/> 
    30         <unzip src="${basedir}/gsdl/common-src/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/common-src/packages/windows/expat"/> 
    31         <unzip src="${basedir}/gsdl/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/common-src/packages/windows/gdbm"/> 
    32         <unzip src="${basedir}/gsdl/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/common-src/packages/windows/stlport"/> 
    33         <unzip src="${basedir}/gsdl/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/gsdl/common-src/indexers/packages/windows/iconv"/> 
     23        <unzip src="${basedir}/compiled/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/compiled/common-src/packages/windows/crypt"/> 
     24        <unzip src="${basedir}/compiled/common-src/packages/windows/expat/expat.zip" dest="${basedir}/compiled/common-src/packages/windows/expat"/> 
     25        <unzip src="${basedir}/compiled/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/compiled/common-src/packages/windows/gdbm"/> 
     26        <unzip src="${basedir}/compiled/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/compiled/common-src/packages/windows/stlport"/> 
     27        <unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/> 
    3428    </target> 
    3529 
    3630    <target name="get-winbin"> 
    3731        <if> 
    38             <bool><not><available file="${basedir}/gsdl/bin/windows"/></not></bool> 
    39             <svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/gsdl/bin/windows" revision="${branch.revision}"/></svn> 
     32            <bool><not><available file="${basedir}/compiled/bin/windows"/></not></bool> 
     33            <svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/compiled/bin/windows" revision="${branch.revision}"/></svn> 
    4034        </if> 
    4135    </target> 
    4236 
    4337    <target name="insert-perl"> 
    44         <mkdir dir="${basedir}/gsdl/bin/windows"/> 
    45         <delete dir="${basedir}/gsdl/bin/windows/perl"/> 
    46         <unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/gsdl/bin/windows"/> 
     38        <mkdir dir="${basedir}/compiled/bin/windows"/> 
     39        <delete dir="${basedir}/compiled/bin/windows/perl"/> 
     40        <unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/compiled/bin/windows"/> 
    4741    </target> 
    4842     
    4943    <target name="compile-c-code"> 
    50         <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/> 
    51         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat" /> 
    52         <move file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/> 
    53         <move todir="${basedir}/gsdl/bin/windows"> 
    54             <fileset dir="${basedir}/gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/> 
     44        <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/compiled" overwrite="true"/> 
     45        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/compile.bat" /> 
     46        <move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/> 
     47        <move todir="${basedir}/compiled/bin/windows"> 
     48            <fileset dir="${basedir}/compiled/cgi-bin" includes="library.exe,oaiserver.exe"/> 
    5549        </move> 
    5650    </target> 
     
    5852    <target name="build-demo-collection"> 
    5953        <!-- the envs on these execs simulate the environment when you run setup.bat --> 
    60         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe"> 
     54        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe"> 
    6155            <arg line="bin\script\import.pl --removeold demo"/> 
    62             <env key="GSDLHOME" value="${basedir}/gsdl"/> 
    63             <env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/> 
     56            <env key="GSDLHOME" value="${basedir}/compiled"/> 
     57            <env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/> 
    6458            <env key="GSDLOS" value="windows"/> 
    65             <env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/> 
     59            <env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/> 
    6660        </exec> 
    67         <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe"> 
     61        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe"> 
    6862            <arg line="bin\script\buildcol.pl --removeold demo"/> 
    69             <env key="GSDLHOME" value="${basedir}/gsdl"/> 
    70             <env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/> 
     63            <env key="GSDLHOME" value="${basedir}/compiled"/> 
     64            <env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/> 
    7165            <env key="GSDLOS" value="windows"/> 
    72             <env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/> 
     66            <env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/> 
    7367        </exec> 
    7468         
    75         <delete dir="${basedir}/gsdl/collect/demo/index"/> 
    76         <move file="${basedir}/gsdl/collect/demo/building" tofile="${basedir}/gsdl/collect/demo/index"/> 
     69        <delete dir="${basedir}/compiled/collect/demo/index"/> 
     70        <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/> 
    7771    </target> 
    7872     
  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r17882 r17898  
    55 
    66        <antcall target="export-gsdl-gli" /> 
    7         <antcall target="dist-set-version" /> 
     7        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall> 
    88        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 
    99        <antcall target="drop-in-docs" /> 
     
    3232    </target> 
    3333 
    34     <target name="dist-set-version"> 
    35         <echo level="info">Setting version in src/lib/gsdlconf.h</echo> 
    36         <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
    37         <echo level="info">Setting version in etc/VERSION</echo> 
    38         <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" /> 
    39     </target> 
    40      
    4134    <target name="drop-in-binaries"> 
    4235        <echo level="info">Dropping compiled binaries into distribution</echo> 
    4336        <delete dir="${basedir}/distributions/web/bin/windows" /> 
    4437        <copy todir="${basedir}/distributions/web/bin/windows"> 
    45             <fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/> 
     38            <fileset dir="${basedir}/compiled/bin/windows" includes="**/*"/> 
    4639        </copy> 
    47         <copy todir="${basedir}/distributions/web" file="${basedir}/gsdl/bin/windows/server.exe"/> 
     40        <copy todir="${basedir}/distributions/web" file="${basedir}/compiled/bin/windows/server.exe"/> 
    4841         
    4942        <echo level="info">Dropping LuceneWrapper.jar in place</echo> 
     
    5548        <delete dir="${basedir}/distributions/web/collect/demo" /> 
    5649        <copy todir="${basedir}/distributions/web/collect/demo"> 
    57             <fileset dir="${basedir}/gsdl/collect/demo" includes="**/*"/> 
     50            <fileset dir="${basedir}/compiled/collect/demo" includes="**/*"/> 
    5851        </copy> 
    5952    </target> 
  • release-kits/wirk3/ant-scripts/build.xml

    r17597 r17898  
    1616 
    1717    <!-- for the benefit of the shared scripts, set release-kit home --> 
     18    <property name="rk.name" value="wirk3"/> 
    1819    <property name="rk.home" value="${wirk3.home}" /> 
    1920    <property name="rk.os" value="windows" /> 
  • release-kits/wirk3/ant-scripts/compile.xml

    r17604 r17898  
    44    <target name="compile"> 
    55        <antcall target="checkout-greenstone3" /> 
    6         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/greenstone3" /></antcall> 
    7         <ant target="prepare-windows" dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 
     6        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/compiled" /></antcall> 
     7        <ant target="prepare-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 
    88            <property name="app.version" value="${version}"/> 
    99            <property name="branch.path" value="${branch.path}"/> 
    1010            <property name="branch.revision" value="${branch.revision}"/> 
    1111        </ant> 
    12         <ant target="build-windows" dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 
     12        <ant target="build-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"> 
    1313            <property name="app.version" value="${version}"/> 
    1414            <property name="branch.path" value="${branch.path}"/> 
     
    2121    <target name="checkout-greenstone3"> 
    2222        <svn> 
    23             <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3" revision="${branch.revision}"/> 
     23            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled" revision="${branch.revision}"/> 
    2424        </svn> 
    2525    </target> 
     
    3232 
    3333    <target name="prepare-documentation"> 
    34         <mkdir dir="greenstone3/gsdl-manuals"/> 
     34        <mkdir dir="compiled/gsdl-manuals"/> 
    3535        <svn> 
    36             <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals" revision="${branch.revision}"/> 
    37             <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared" revision="${branch.revision}"/> 
     36            <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals" revision="${branch.revision}"/> 
     37            <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared" revision="${branch.revision}"/> 
    3838        </svn> 
    39         <javac srcdir="greenstone3/gsdl-manuals/shared" destdir="greenstone3/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac> 
    40         <unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/> 
     39        <javac srcdir="compiled/gsdl-manuals/shared" destdir="compiled/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac> 
     40        <unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/> 
    4141 
    4242        <echo>Define Classpath</echo> 
    4343        <path id="documentation.compile.classpath"> 
    44             <fileset dir="greenstone3/gsdl-manuals"> 
     44            <fileset dir="compiled/gsdl-manuals"> 
    4545                <include name="**/*.jar"/> 
    4646            </fileset> 
    47             <pathelement path="greenstone3/gsdl-manuals/shared"/> 
    48             <pathelement path="greenstone3/gsdl-manuals/manuals"/> 
    49             <pathelement path="greenstone3/gli/classes"/> 
     47            <pathelement path="compiled/gsdl-manuals/shared"/> 
     48            <pathelement path="compiled/gsdl-manuals/manuals"/> 
     49            <pathelement path="compiled/gli/classes"/> 
    5050        </path> 
    5151                     
     
    5353        <java classname="org.apache.xalan.xslt.Process" classpathref="documentation.compile.classpath" fork="true"> 
    5454            <jvmarg value="-DGSDLHOME=${basedir}/greenstone" /> 
    55             <arg value="-IN"/><arg file="greenstone3/gli/help/en/help.xml" /> 
    56             <arg value="-XSL"/><arg file="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 
    57             <arg value="-OUT"/><arg file="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml" /> 
     55            <arg value="-IN"/><arg file="compiled/gli/help/en/help.xml" /> 
     56            <arg value="-XSL"/><arg file="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" /> 
     57            <arg value="-OUT"/><arg file="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml" /> 
    5858        </java> 
    5959                     
    6060        <echo>Run generate-pdf.bat</echo> 
    61         <exec dir="${basedir}\greenstone3/gsdl-manuals/manuals" executable="cmd"> 
     61        <exec dir="${basedir}\compiled/gsdl-manuals/manuals" executable="cmd"> 
    6262            <arg value="/C" /> 
    63             <arg file="${basedir}/greenstone3/gsdl-manuals/manuals/generate-pdf.bat" /> 
     63            <arg file="${basedir}/compiled/gsdl-manuals/manuals/generate-pdf.bat" /> 
    6464            <arg value="u" /> 
    6565            <arg value="en" /> 
  • release-kits/wirk3/ant-scripts/create-components.xml

    r17814 r17898  
    22<project name="wirk3-create-components" default="create-components"> 
    33 
    4     <!-- create components from the distribution folder --> 
     4    <!-- create components from the distributions folder --> 
    55 
    66    <!-- 1st level --> 
     
    4444                 
    4545        <copy todir="components/tmp/core" overwrite="true"> 
    46             <fileset dir="distribution/greenstone3"> 
     46            <fileset dir="distributions/web"> 
    4747                <include name="**/*"/> 
    4848 
     
    9090        <mkdir dir="components/tmp/imagemagick"/> 
    9191        <copy todir="components/tmp/imagemagick" overwrite="true"> 
    92             <fileset dir="distribution/greenstone3/gs2build/bin/windows/"> 
     92            <fileset dir="distributions/web/gs2build/bin/windows/"> 
    9393                <include name="imagemagick/**/*"/> 
    9494            </fileset> 
     
    108108        <mkdir dir="components/tmp/ghostscript"/> 
    109109        <copy todir="components/tmp/ghostscript" overwrite="true"> 
    110             <fileset dir="distribution/greenstone3/gs2build/bin/windows/"> 
     110            <fileset dir="distributions/web/gs2build/bin/windows/"> 
    111111                <include name="ghostscript/**/*"/> 
    112112            </fileset> 
     
    124124        <mkdir dir="components/tmp/sourcecode"/> 
    125125        <copy todir="components/tmp/sourcecode" overwrite="true"> 
    126                 <fileset dir="distribution/greenstone3"> 
     126                <fileset dir="distributions/web"> 
    127127                    <include name="src/**/*"/> 
    128128                    <include name="gs2build/common-src/**/*"/> 
     
    145145 
    146146        <copy todir="components/tmp/ant" overwrite="true"> 
    147             <fileset dir="distribution/greenstone3/packages"> 
     147            <fileset dir="distributions/web/packages"> 
    148148                <include name="ant/**/*"/> 
    149149            </fileset> 
     
    161161        <mkdir dir="components/tmp/tomcat"/> 
    162162        <copy todir="components/tmp/tomcat" overwrite="true"> 
    163             <fileset dir="distribution/greenstone3/packages"> 
     163            <fileset dir="distributions/web/packages"> 
    164164                <include name="tomcat/**/*"/> 
    165165            </fileset> 
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r17833 r17898  
    66        <!-- create distribution --> 
    77        <antcall target="export-greenstone3-gli" /> 
    8         <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3" /></antcall> 
    9         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli" /></antcall> 
     8        <antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web" /></antcall> 
     9        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli" /></antcall> 
    1010        <antcall target="insert-user-manual"/> 
    1111        <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets --> 
    1212 
    13         <antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets --> 
     13        <antcall target="copy-web-to-source" /> <!-- from gs3-targets --> 
    1414 
    15         <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     15        <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    1616            <property name="app.version" value="${version}"/> 
    1717            <property name="branch.path" value="${branch.path}"/> 
     
    2121        <antcall target="insert-icon"/> 
    2222 
    23         <ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     23        <ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    2424            <property name="app.version" value="${version}"/> 
    2525            <property name="branch.path" value="${branch.path}"/> 
    2626            <property name="branch.revision" value="${branch.revision}"/> 
    2727        </ant> 
    28         <ant target="create-distribution-3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false"> 
     28        <ant target="create-distribution-3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"> 
    2929            <property name="app.version" value="${version}"/> 
    3030            <property name="branch.path" value="${branch.path}"/> 
     
    3737 
    3838    <target name="export-greenstone3-gli"> 
    39         <mkdir dir="distribution"/> 
    40         <delete dir="distribution/greenstone3"/> 
     39        <mkdir dir="distributions"/> 
     40        <delete dir="distributions/web"/> 
    4141        <svn> 
    42             <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3" revision="${branch.revision}"/> 
    43             <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli" revision="${branch.revision}"/> 
     42            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web" revision="${branch.revision}"/> 
     43            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli" revision="${branch.revision}"/> 
    4444        </svn> 
    4545    </target> 
     
    4747    <target name="copy-over-build-xml"> 
    4848        <if><bool><istrue value="${execute}"/></bool> 
    49             <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/> 
     49            <move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/> 
    5050        </if> 
    5151    </target> 
    5252 
    5353    <target name="insert-user-manual"> 
    54         <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/> 
     54        <copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/> 
    5555    </target> 
    5656 
    5757    <target name="insert-compiled-binaries"> 
    5858 
    59         <delete dir="distribution/greenstone3/lib/jni"/> 
    60         <copy todir="distribution/greenstone3/lib/jni"><fileset dir="greenstone3/lib/jni"/></copy> 
     59        <delete dir="distributions/web/lib/jni"/> 
     60        <copy todir="distributions/web/lib/jni"><fileset dir="compiled/lib/jni"/></copy> 
    6161         
    62         <delete dir="distribution/greenstone3/gs2build/bin/windows"/> 
    63         <copy todir="distribution/greenstone3/gs2build/bin/windows"><fileset dir="greenstone3/gs2build/bin/windows"/></copy> 
     62        <delete dir="distributions/web/gs2build/bin/windows"/> 
     63        <copy todir="distributions/web/gs2build/bin/windows"><fileset dir="compiled/gs2build/bin/windows"/></copy> 
    6464 
    65         <delete dir="distribution/greenstone3/gs2build/bin/java"/> 
    66         <copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy> 
     65        <delete dir="distributions/web/gs2build/bin/java"/> 
     66        <copy todir="distributions/web/gs2build/bin/java"><fileset dir="compiled/gs2build/bin/java"/></copy> 
    6767 
    68         <copy todir="distribution/greenstone3/bin" file="greenstone3/bin/search4j.exe"/> 
     68        <copy todir="distributions/web/bin" file="compiled/bin/search4j.exe"/> 
    6969    </target> 
    7070     
     
    7272        <copy 
    7373            file="${wirk3.home}/greenstone3/icon/icon.ico" 
    74             tofile="distribution/greenstone3/resources/images/gs3.ico"/> 
    75     </target> 
    76  
    77     <target name="rename-build-xml-for-transit"> 
    78         <move 
    79             file="distribution/greenstone3/build.xml" 
    80             tofile="distribution/greenstone3/greenstone3-build.xml" /> 
     74            tofile="distributions/web/resources/images/gs3.ico"/> 
    8175    </target> 
    8276 
  • release-kits/wirk3/ant-scripts/create-installer.xml

    r17697 r17898  
    1515        <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1616            <fileset dir="${wirk3.home}/packages/7za" includes="7za.exe"/> 
    17             <fileset file="${basedir}/distribution/greenstone3/LICENSE.txt"/> 
     17            <fileset file="${basedir}/distributions/web/LICENSE.txt"/> 
    1818        </copy> 
    1919