Changeset 15956


Ignore:
Timestamp:
2008-06-11T15:25:31+12:00 (16 years ago)
Author:
oranfry
Message:

first bit of work on lirk2

Location:
release-kits/lirk2
Files:
3 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

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

    r14982 r15956  
    99-->
    1010
    11 <project name="lirk3-build" default="lirk3">
     11<project name="lirk2-build" default="lirk2">
    1212
    1313    <import file="init.xml"/>
    … …  
    1515    <import file="compile.xml"/>
    1616    <import file="create-distribution.xml"/>
     17    <!--
    1718    <import file="create-installer.xml"/>
    1819    <import file="wrap.xml"/>
     20    -->
    1921
    20     <target name="lirk3" depends="init">
     22    <target name="lirk2" depends="init">
    2123        <addressedcall target="compile"/>
    2224        <addressedcall target="create-distribution"/>
     25        <!--
    2326        <addressedcall target="create-installer"/>
    2427        <addressedcall target="wrap"/>
     28        -->
    2529    </target>
    2630

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

    r15142 r15956  
    99-->
    1010
    11 <project name="lirk3-compile" default="compile">
     11<project name="lirk2-compile" default="compile">
    1212
    1313
    … …  
    1515
    1616        <!-- checkout -->
    17         <addressedcall target="checkout-greenstone3" />
     17        <addressedcall target="checkout-gsdl-indexers-gli" />
     18        <addressedcall target="insert-windows-perl" />
     19       
     20        <!-- configure -->
     21        <addressedcall target="add-static-to-configure-in"/>
     22        <addressedcall target="set-environment-in-packages-configure"/>
     23        <addressedcall target="run-configure"/>
     24        <addressedcall target="makefiles-add-static"/>
    1825
    19         <!-- preparation -->
    20         <addressedcall target="set-version-number-property" />
    21         <addressedcall target="dist-prepare-unix" />
    22         <addressedcall target="tweak-configure-scripts" />
     26        <!-- make -->
     27        <addressedcall target="run-make"/>
     28        <addressedcall target="fix-wget"/>
     29        <addressedcall target="run-make-install"/>
     30        <addressedcall target="copy-library-oai"/>
     31        <addressedcall target="strip-execs"/>
    2332
    24         <!-- update -->
    25         <addressedcall target="dist-update-unix" />
    26 
    27         <!-- configure -->
    28         <addressedcall target="dist-configure-unix" />
    29         <addressedcall target="tweak-makefiles" />
    30 
    31         <!-- build -->
    32         <addressedcall target="dist-build-unix" />
    33         <addressedcall target="fix-wget" />
    34         <addressedcall target="linux-strip-execs" />
    35 
    36         <!-- documentation -->
    37         <addressedcall target="prepare-documentation" />
     33        <!-- build collections -->
     34        <addressedcall target="build-demo-collection" />
    3835
    3936    </target>
    … …  
    4643    -->
    4744
    48     <target name="checkout-greenstone3">
     45    <target name="checkout-gsdl-indexers-gli">
    4946        <if><bool><istrue value="${execute}"/></bool>
    5047            <svn>
    51                 <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/>
     48                <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
     49            </svn>
     50            <svn>
     51                <checkout url="${svn.root}/indexers/${branch.path}" destPath="${basedir}/gsdl/indexers"/>
     52            </svn>
     53            <svn>
     54                <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
    5255            </svn>
    5356        </if>
    5457    </target>
    5558
    56     <target name="set-version-number-property">
     59    <target name="insert-windows-perl">
    5760        <if><bool><istrue value="${execute}"/></bool>
    58             <rsr file="greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
     61            <mkdir dir="${basedir}/gsdl/bin/windows"/>
     62            <delete dir="${basedir}/gsdl/bin/windows/perl"/>
     63            <exec executable="cp"><arg line="-r ${lirk2.home}/for-distributions/bin/windows/perl ${basedir}/gsdl/bin/windows"/></exec>
    5964        </if>
    6065    </target>
    6166
    62     <target name="dist-prepare-unix">
     67    <target name="add-static-to-configure-in">
    6368        <if><bool><istrue value="${execute}"/></bool>
    64             <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
    65         </if>   
    66     </target>
    67     <target name="tweak-configure-scripts">
    68         <addressedcall target="mgpp-add-static" />
    69         <addressedcall target="mg-add-static" />
    70         <addressedcall target="gs2buildextra-add-static" />
    71     </target>
    72 
    73     <target name="dist-update-unix">
    74         <if><bool><istrue value="${execute}"/></bool>
    75             <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
     69            <rsr file="${basedir}/gsdl/configure.in" pattern="^LDFLAGS=.*$" replacement="LDFLAGS=-static"/>
     70            <exec dir="${basedir}/gsdl" executable="autoconf" output="${basedir}/gsdl/configure"><arg value="configure.in"/></exec>
    7671        </if>
    7772    </target>
    7873
    79     <target name="dist-configure-unix">
     74    <target name="set-environment-in-packages-configure">
    8075        <if><bool><istrue value="${execute}"/></bool>
    81             <exec dir="greenstone3/gs2build/gs2build-extra" executable="autoconf" output="greenstone3/gs2build/configure">
    82                 <arg line="configure.in"/>
    83             </exec>
    84             <chmod file="greenstone3/gs2build/configure" perm="+x"/>
    85             <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
     76            <rsr file="${basedir}/gsdl/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
    8677        </if>
    8778    </target>
    8879
    89     <target name="tweak-makefiles">
    90         <addressedcall target="wv-add-static" />
    91         <addressedcall target="xlhtml-add-static" />
    92         <addressedcall target="ppthtml-add-static" />
    93         <addressedcall target="rtftohtml-add-static" />
    94         <addressedcall target="gdbm-add-static" />
     80    <target name="run-configure">
     81        <if><bool><istrue value="${execute}"/></bool>
     82            <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure"/>
     83        </if>
    9584    </target>
    9685
    97     <target name="dist-build-unix">
     86    <target name="makefiles-add-static">
    9887        <if><bool><istrue value="${execute}"/></bool>
    99             <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
     88            <rsr file="${basedir}/gsdl/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />
     89            <rsr file="${basedir}/gsdl/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />
     90            <rsr file="${basedir}/gsdl/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />
     91            <rsr file="${basedir}/gsdl/packages/rtftohtml/rtftohtml_src/Makefile" pattern="(-o rtftohtml.{2}EXEEXT.{1})" replacement="$1 -static" />
     92        </if>
     93    </target>
     94
     95    <target name="run-make">
     96        <if><bool><istrue value="${execute}"/></bool>
     97            <exec dir="${basedir}/gsdl" executable="make"/>
    10098        </if>
    10199    </target>
    … …  
    103101    <target name="fix-wget">
    104102        <if><bool><istrue value="${execute}"/></bool>
    105             <!-- fix this !!! -->
    106           <delete file="greenstone3/gs2build/packages/wget/wget-1.9/src/wget"/>
     103            <delete file="${basedir}/gsdl/packages/wget/wget-1.9/src/wget"/>
     104            <exec dir="${basedir}/gsdl/packages/wget/wget-1.9/src" executable="gcc"><arg line="-O2 -Wall -Wno-implicit -o wget cmpt.o connect.o convert.o cookies.o ftp.o ftp-basic.o ftp-ls.o ftp-opie.o hash.o headers.o host.o html-parse.o html-url.o http.o init.o log.o main.o gen-md5.o netrc.o progress.o rbuf.o recur.o res.o retr.o safe-ctype.o snprintf.o gen_sslfunc.o url.o utils.o version.o  -lssl -lcrypto -ldl -static"/></exec>
     105        </if>
     106    </target>
     107   
     108
     109    <target name="run-make-install">
     110        <if><bool><istrue value="${execute}"/></bool>
     111            <exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec>
    107112        </if>
    108113    </target>
    109114
    110     <target name="linux-strip-execs">
     115    <target name="copy-library-oai">
    111116        <if><bool><istrue value="${execute}"/></bool>
    112             <exec dir="greenstone3/gs2build/bin/linux" executable="find">
    113                 <arg line="! -name . -exec strip {} &#59;"/>
     117            <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/linux/library"/></exec>
     118            <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec>
     119        </if>
     120    </target>
     121
     122    <target name="strip-execs">
     123        <if><bool><istrue value="${execute}"/></bool>
     124            <exec dir="${basedir}/gsdl/bin/linux" executable="find">
     125                <arg line="! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
    114126            </exec>
    115127        </if>
    116128    </target>
    117129
    118     <target name="prepare-documentation">
     130    <target name="build-demo-collection">
    119131        <if><bool><istrue value="${execute}"/></bool>
    120             <mkdir dir="greenstone3/gsdl-manuals"/>
    121             <svn>
    122                 <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals"/>
    123                 <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/>
    124             </svn>
    125             <javac srcdir="greenstone3/gsdl-manuals/shared"
    126                   destdir="greenstone3/gsdl-manuals/shared"
    127                   debug="on">
    128                 <include name="*.java"/>
    129             </javac>
    130             <unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>
    131 
    132             <path id="documentation.compile.classpath">
    133                 <fileset dir="greenstone3/gsdl-manuals">
    134                     <include name="**/*.jar"/>
    135                 </fileset>
    136                 <pathelement path="greenstone3/gsdl-manuals/shared"/>
    137                 <pathelement path="greenstone3/gsdl-manuals/manuals"/>
    138             </path>
    139 
    140             <java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml">
    141                 <arg value="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
    142                 <arg value="greenstone3/gli/help/en/help.xml" />
    143                 <arg value="greenstone3" />
    144             </java>
    145 
    146             <chmod perm="a+x" file="greenstone3/gsdl-manuals/shared/fop/fop.sh"/>
    147             <echo>Run generate-pdf.sh</echo>
    148             <exec dir="greenstone3/gsdl-manuals/manuals" executable="/bin/sh">
    149                 <arg line="generate-pdf.sh u en" />
    150             </exec>
    151         </if>
    152     </target>
    153 
    154 
    155     <!--
    156 
    157         third level targets
    158 
    159     -->
    160 
    161     <target name="mgpp-add-static">
    162         <if><bool><istrue value="${execute}"/></bool>
    163             <rsr file="greenstone3/gs2build/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
    164             <exec dir="greenstone3/gs2build/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/indexers/mgpp/configure">
    165                 <arg line="configure.in"/>
    166             </exec>
    167         </if>
    168     </target>
    169     <target name="mg-add-static">
    170         <if><bool><istrue value="${execute}"/></bool>
    171             <rsr file="greenstone3/gs2build/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
    172             <exec dir="greenstone3/gs2build/indexers/mg" executable="autoconf" output="greenstone3/gs2build/indexers/mg/configure">
    173                 <arg line="configure.in"/>
    174             </exec>
    175         </if>
    176     </target>
    177     <target name="gs2buildextra-add-static">
    178         <if><bool><istrue value="${execute}"/></bool>
    179             <rsr file="greenstone3/gs2build/gs2build-extra/packages.configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
    180             <rsr file="greenstone3/gs2build/gs2build-extra/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
    181         </if>
    182     </target>
    183 
    184     <target name="wv-add-static">
    185         <if><bool><istrue value="${execute}"/></bool>
    186             <rsr file="greenstone3/gs2build/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    187         </if>
    188     </target>
    189     <target name="xlhtml-add-static">
    190         <if><bool><istrue value="${execute}"/></bool>
    191             <rsr file="greenstone3/gs2build/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    192         </if>
    193     </target>
    194     <target name="ppthtml-add-static">
    195         <if><bool><istrue value="${execute}"/></bool>
    196             <rsr file="greenstone3/gs2build/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    197         </if>
    198     </target>
    199     <target name="rtftohtml-add-static">
    200         <if><bool><istrue value="${execute}"/></bool>
    201             <rsr file="greenstone3/gs2build/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
    202         </if>
    203     </target>
    204     <target name="gdbm-add-static">
    205         <if><bool><istrue value="${execute}"/></bool>
    206             <rsr file="greenstone3/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" />
     132            <exec dir="${basedir}/gsdl" executable="${lirk2.home}/compile/build-demo.sh"/>
    207133        </if>
    208134    </target>

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

    r14982 r15956  
    99-->
    1010
    11 <project name="lirk3-create-distribution" default="create-distribution">
     11<project name="lirk2-create-distribution" default="create-distribution">
    1212
    1313
    1414    <target name="create-distribution">
    15         <!-- create distribution -->
    16         <addressedcall target="export-greenstone3" />
    17         <addressedcall target="dist-set-version-number-property" />
    18         <addressedcall target="create-distributions-1" />
    19         <addressedcall target="create-distributions-2" />
    20         <addressedcall target="create-distributions-3" />
    21         <addressedcall target="copy-over-build-xml" />
    22         <addressedcall target="insert-user-manual"/>
    23         <addressedcall target="insert-compiled-binaries"/>
    24     </target>
    25 
    26 
    27 
    28     <!--
    29 
    30         second level targets
    31 
    32     -->
    33    
    34     <target name="export-greenstone3">
    35         <if><bool><istrue value="${execute}"/></bool>
    36             <mkdir dir="distribution"/>
    37             <delete dir="distribution/greenstone3"/>
    38             <svn>
    39                 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
    40             </svn>
     15        <if><bool><istrue value="${execute}" /></bool>
     16            <addressedcall target="export-gsdl-gli-indexers" />
     17            <addressedcall target="dist-set-version" />
     18            <addressedcall target="compile-gli" />
     19            <addressedcall target="create-gli-client-zip" />
     20            <addressedcall target="tweak-files" />
    4121        </if>
    4222    </target>
    4323
    44     <target name="dist-set-version-number-property">
     24    <target name="export-gsdl-gli-indexers">
    4525        <if><bool><istrue value="${execute}"/></bool>
    46             <rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
     26
     27            <mkdir dir="distribution"/>
     28            <delete dir="distribution/gsdl"/>
     29            <svn>
     30                <export srcurl="${svn.root}/gsdl/${branch.path}"        destPath="distribution/gsdl"/>
     31            </svn>
     32
     33            <svn>
     34                <export srcurl="${svn.root}/gli/${branch.path}"         destPath="distribution/gsdl/gli"/>
     35            </svn>
     36
     37            <svn>
     38                <export srcurl="${svn.root}/indexers/${branch.path}"    destPath="distribution/gsdl/indexers"/>
     39            </svn>
     40
    4741        </if>
    4842    </target>
    4943
    50     <target name="create-distributions-1">
     44    <target name="dist-set-version">
    5145        <if><bool><istrue value="${execute}"/></bool>
    52             <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
    53                 <property name="app.version" value="${version}"/>
    54                 <property name="branch.path" value="${branch.path}"/>
    55             </ant>
     46
     47            <echo level="info">Setting version in src/lib/gsdlconf.h</echo>
     48            <rsr file="${basedir}/gsdl/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
     49
     50            <echo level="info">Setting version in Install.sh</echo>
     51            <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
     52
     53            <echo level="info">Setting version in etc/VERSION</echo>
     54            <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
     55
    5656        </if>
    5757    </target>
    5858
    59     <target name="create-distributions-2">
     59    <target name="compile-gli">
    6060        <if><bool><istrue value="${execute}"/></bool>
    61             <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2"  inheritAll="false">
    62                 <property name="app.version" value="${version}"/>
    63                 <property name="branch.path" value="${branch.path}"/>
    64             </ant>
     61
     62            <echo>Compiling gli...</echo>
     63            <exec dir="${basedir}/distribution/gsdl/gli" executable="${basedir}/distribution/gsdl/gli/makegli.sh"/>
     64
     65            <echo>Creating jar...</echo>
     66            <exec dir="${basedir}/distribution/gsdl/gli" executable="${basedir}/distribution/gsdl/gli/makejar.sh"/>
     67
     68            <echo>Cleaning up intermediate files...</echo>
     69            <delete dir="${basedir}/distribution/gsdl/gli/jar"/>
     70            <delete dir="${basedir}/distribution/gsdl/gli/classes/org"/>
     71
     72            <echo>Putting gli server jar in a better place</echo>
     73            <exec dir="${basedir}/distribution/gsdl" executable="mv" failonerror="true">
     74                <arg line="gli/GLIServer.jar bin/java" />
     75            </exec>
     76
    6577        </if>
    6678    </target>
    6779
    68     <target name="create-distributions-3">
     80    <target name="create-gli-client-zip">
    6981        <if><bool><istrue value="${execute}"/></bool>
    70             <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3"  inheritall="false">
    71                 <property name="app.version" value="${version}"/>
    72                 <property name="branch.path" value="${branch.path}"/>
    73             </ant>
    74         </if>
    75     </target>
     82            <!--
     83            # take a copy of GLI directory
     84            &util::cp_r(&util::filename_cat($tmpdir, "gsdl", "gli"), $tmpdir);
    7685
    77     <target name="copy-over-build-xml">
    78         <if><bool><istrue value="${execute}"/></bool>
    79             <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
    80         </if>
    81     </target>
     86            my $client_dirname = "gli-client-" . $version_num;
     87            rename ("gli", $client_dirname);
     88            chdir(&util::filename_cat($tmpdir, $client_dirname));
    8289
    83     <target name="insert-user-manual">
    84         <if><bool><istrue value="${execute}"/></bool>
    85             <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
    86         </if>
    87     </target>
    8890
    89     <target name="insert-compiled-binaries">
    90         <if><bool><istrue value="${execute}"/></bool>
     91            # delete unnecessary stuff
     92            `rm -rf clean.* document.* gems.* gli*.sh gli*.bat make*.sh make*.bat lib src`;
     93            # make sure permissions are ok
     94            `chmod a+x client-gli.sh client-gli.bat`;
     95            chdir($tmpdir);
    9196
    92             <delete dir="distribution/greenstone3/lib/jni"/>
    93             <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
    94 
    95             <delete dir="distribution/greenstone3/gs2build/bin/linux"/>
    96             <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>
    97 
    98             <delete dir="distribution/greenstone3/gs2build/bin/java"/>
    99             <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
     97            # zip up the client
     98            &zip($client_dirname, $client_dirname, $tmpdir, 1);
     99            -->
    100100        </if>
    101101    </target>
    102102
    103103
     104    <target name="tweak-files">
     105        <if><bool><istrue value="${execute}"/></bool>
     106
     107            <echo level="info">Changing Install.sh to web release</echo>
     108            <rsr file="${basedir}/distribution/gsdl/Install.sh" pattern="^(iscdrom=).*" replacement="$1&quot;no&quot;" />
     109
     110        </if>
     111    </target>
     112
     113   
     114
    104115
    105116

  • release-kits/lirk2/ant-scripts/init.xml

    r15832 r15956  
    99-->
    1010
    11 <project name="lirk3-init">
     11<project name="lirk2-init">
    1212
    1313    <!-- classpath -->
    1414    <path id="project.classpath">
    15         <fileset dir="${lirk3.home}/ant-scripts/tasks">
     15        <fileset dir="${lirk2.home}/ant-scripts/tasks">
    1616            <include name="**/*.jar"/>
    1717        </fileset>
    18         <fileset dir="${lirk3.home}/lib">
     18        <fileset dir="${lirk2.home}/lib">
    1919            <include name="*.jar"/>
    2020        </fileset>
    21         <fileset dir="${lirk3.home}/bin/ant-installer/lib">
     21        <fileset dir="${lirk2.home}/bin/ant-installer/lib">
    2222            <include name="ant-installer-ext.jar"/>
    2323            <include name="ant-installer.jar"/>
    2424        </fileset>
    25         <pathelement path="${lirk3.home}/ant-scripts/tasks/orans"/>
     25        <pathelement path="${lirk2.home}/ant-scripts/tasks/orans"/>
    2626
    2727        <pathelement path="${basedir}/installer/cp"/>
    … …  
    7878                <not><isset property="version"/></not>
    7979            </bool>
    80 
    81             <!-- version not set in build.properties, try get from repository -->
    82             <setloglevel level="error"/>
    83             <try>
    84                 <get src="${svn.root}/greenstone3/${branch.path}/version.properties" dest="${temp.file}"/>
    85                 <catch>
    86                     <echo level="error">Not set in build.properties or repository version.properties</echo>
    87                     <fail>Version number not set</fail>
    88                 </catch>
    89             </try>
    90             <setloglevel level="info"/>
    91 
    92             <property file="${temp.file}"/>
    93 
    94             <if>
    95                 <bool>
    96                     <not><isset property="version"/></not>
    97                 </bool>
    98                 <echo level="error">version.properties exists, but doesn't set version string</echo>
    99                 <fail>Version number not set</fail>
    100             </if>
    101 
    102             <echo level="info">Taken from repository version.properties</echo>
    103 
    104             <else>
    105                 <echo level="info">Taken from build.properties</echo>
    106             </else>
    107 
     80            <fail>Version number not set</fail>
    10881        </if>
    10982
    … …  
    11184        <property name="app.version" value="${version}"/>
    11285        <echo level="info"/>
    113 
    11486
    11587        <!-- check resume from -->
    … …  
    199171        <echo level="info"/>
    200172
    201         <!-- check branches exist -->
    202         <property name="svn.greenstone3" value="${svn.root}/greenstone3/${branch.path}"/>
    203         <property name="svn.gsdl" value="${svn.root}/gsdl/${branch.path}"/>
    204         <property name="svn.gli" value="${svn.root}/gli/${branch.path}"/>
    205         <property name="svn.indexers" value="${svn.root}/indexers/${branch.path}"/>
    206         <property name="svn.documentation" value="${svn.root}/documentation/${branch.path}"/>
    207 
    208         <!-- greenstone3 branch -->
    209         <echo level="info">Checking that ${svn.greenstone3} exists...</echo>
    210 
    211         <!-- try to put the html index of the location into the temp file -->
    212         <setloglevel level="error"/>
    213         <try>
    214             <get src="${svn.greenstone3}" dest="${temp.file}"/>
    215             <catch>
    216                 <echo level="error">No, it does not exist</echo>
    217                 <property name="svn.greenstone3.unavailable" value="true"/>
    218             </catch>
    219         </try>
    220         <setloglevel level="info"/>
    221         <if>
    222             <bool><not><istrue value="${svn.greenstone3.unavailable}"/></not></bool>
    223             <echo level="info">Yes, it exists</echo>
    224         </if>
    225 
    226         <!-- gsdl branch -->
    227         <echo level="info">Checking that ${svn.gsdl} exists...</echo>
    228         <setloglevel level="error"/>
    229         <try>
    230             <get src="${svn.gsdl}" dest="${temp.file}"/>
    231             <catch>
    232                 <echo level="error">No, it does not exist</echo>
    233                 <property name="svn.gsdl.unavailable" value="true"/>
    234             </catch>
    235         </try>
    236         <setloglevel level="info"/>
    237         <if>
    238             <bool><not><istrue value="${svn.gsdl.unavailable}"/></not></bool>
    239             <echo level="info">Yes, it exists</echo>
    240         </if>
    241 
    242 
    243         <!-- gli branch -->
    244         <echo level="info">Checking that ${svn.gli} exists...</echo>
    245         <!-- try to put the  html index of the location into the temp file -->
    246         <setloglevel level="error"/>
    247         <try>
    248             <get src="${svn.gli}" dest="${temp.file}"/>
    249             <catch>
    250                 <echo level="error">No, does not exist</echo>
    251                 <property name="svn.gli.unavailable" value="true"/>
    252             </catch>
    253         </try>
    254         <setloglevel level="info"/>
    255         <if>
    256             <bool><not><istrue value="${svn.gli.unavailable}"/></not></bool>
    257             <echo level="info">Yes, it exists</echo>
    258         </if>
    259 
    260 
    261         <!-- indexers branch -->
    262         <echo level="info">Checking that ${svn.indexers} exists...</echo>
    263         <!-- try to put the  html index of the location into the temp file -->
    264         <setloglevel level="error"/>
    265         <try>
    266             <get src="${svn.indexers}" dest="${temp.file}"/>
    267             <catch>
    268                 <echo level="error">No, it does not exist</echo>
    269                 <property name="svn.indexers.unavailable" value="true"/>
    270             </catch>
    271         </try>
    272         <setloglevel level="info"/>
    273         <if>
    274             <bool><not><istrue value="${svn.indexers.unavailable}"/></not></bool>
    275             <echo level="info">Yes, it exists</echo>
    276         </if>
    277 
    278         <!-- documentation branch -->
    279         <echo level="info">Checking that ${svn.documentation} exists...</echo>
    280         <!-- try to put the  html index of the location into the temp file -->
    281         <setloglevel level="error"/>
    282         <try>
    283             <get src="${svn.documentation}" dest="${temp.file}"/>
    284             <catch>
    285                 <echo level="error">No, it does not exist</echo>
    286                 <property name="svn.documentation.unavailable" value="true"/>
    287             </catch>
    288         </try>
    289         <setloglevel level="info"/>
    290         <if>
    291             <bool><not><istrue value="${svn.documentation.unavailable}"/></not></bool>
    292             <echo level="info">Yes, it exists</echo>
    293         </if>
    294 
    295 
    296         <!-- clean up the temp file -->
    297         <setloglevel level="error"/>
    298         <delete file="${temp.file}"/>
    299         <setloglevel level="info"/>
    300 
    301 
    302         <!-- fail if some branches were missing -->
    303         <if>
    304             <bool>
    305                 <or>
    306                     <istrue value="${svn.greenstone3.unavailable}"/>
    307                     <istrue value="${svn.gsdl.unavailable}"/>
    308                     <istrue value="${svn.gli.unavailable}"/>
    309                     <istrue value="${svn.indexers.unavailable}"/>
    310                     <istrue value="${svn.documentation.unavailable}"/>
    311                 </or>
    312             </bool>
    313             <fail>Some branches do not exist, or you are unable to access them from where you are. Please review the list above and create any branches that are missing, or run this script from somewhere with access to the repository.</fail>
    314             <else>
    315                 <echo level="info">All exist</echo>
    316             </else>
    317         </if>
    318 
    319173    </target>
    320174
Note: See TracChangeset for help on using the changeset viewer.