Changeset 16739

Show
Ignore:
Timestamp:
13.08.2008 11:38:39 (11 years ago)
Author:
oranfry
Message:

changes to lirk2 after ant hack cleaned up

Location:
release-kits/lirk2/ant-scripts
Files:
5 modified

Legend:

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

    r16241 r16739  
    77        .......................................................... 
    88--> 
     9 
    910<project name="lirk2-build" default="lirk2"> 
    1011 
    1112    <!-- CONSTANTS --> 
    12  
    13     <!-- set current month and year--> 
    14     <exec executable="date" outputproperty="current.month"><arg value="+%b"/></exec> 
    15     <exec executable="date" outputproperty="current.year"><arg value="+%Y"/></exec> 
    1613 
    1714    <!-- for the benefit of the shared scripts, set release-kit home --> 
     
    2017    <!-- IMPORT OTHER ANT SCRIPTS --> 
    2118    <import file="shared-ant-scripts/init.xml"/> 
     19    <import file="shared-ant-scripts/operations-on-gli.xml"/> 
    2220    <import file="compile.xml"/> 
    2321    <import file="create-distribution.xml"/> 
     
    2725    <!-- THE MAIN TARGET --> 
    2826    <target name="lirk2" depends="init"> 
    29         <addressedcall target="compile"/> 
    30         <addressedcall target="create-distribution"/> 
    31         <addressedcall target="create-installer"/> 
    32         <addressedcall target="wrap"/> 
     27        <antcall target="compile"/> 
     28        <antcall target="create-distribution"/> 
     29        <antcall target="create-installer"/> 
     30        <antcall target="wrap"/> 
    3331    </target> 
    3432 
  • release-kits/lirk2/ant-scripts/compile.xml

    r16629 r16739  
    55 
    66        <!-- checkout --> 
    7         <addressedcall target="checkout-gsdl-gli" /> 
     7        <antcall target="checkout-gsdl-gli" /> 
    88         
    99        <!-- configure --> 
    10         <addressedcall target="add-static-to-configure-in"/> 
    11         <addressedcall target="set-environment-in-packages-configure"/> 
    12         <addressedcall target="run-configure"/> 
    13         <addressedcall target="makefiles-add-static"/> 
     10        <antcall target="add-static-to-configure-in"/> 
     11        <antcall target="set-environment-in-packages-configure"/> 
     12        <antcall target="run-configure"/> 
     13        <antcall target="makefiles-add-static"/> 
    1414 
    1515        <!-- make --> 
    16         <addressedcall target="run-make"/> 
    17         <addressedcall target="run-make-install"/> 
    18         <addressedcall target="copy-library-oai"/> 
    19         <addressedcall target="strip-execs"/> 
     16        <antcall target="run-make"/> 
     17        <antcall target="run-make-install"/> 
     18        <antcall target="copy-library-oai"/> 
     19        <antcall target="strip-execs"/> 
    2020 
    2121        <!-- build collections --> 
    22         <addressedcall target="build-demo-collection" /> 
     22        <antcall target="build-demo-collection" /> 
    2323 
    2424    </target> 
    2525 
    2626    <target name="checkout-gsdl-gli"> 
    27         <if><bool><istrue value="${execute}"/></bool> 
    28             <svn> 
    29                 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/> 
    30                 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/> 
    31             </svn> 
    32         </if> 
     27        <svn> 
     28            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/> 
     29            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/> 
     30        </svn> 
    3331    </target> 
    3432 
    3533    <target name="add-static-to-configure-in"> 
    36         <if><bool><istrue value="${execute}"/></bool> 
    37             <rsr file="${basedir}/gsdl/configure.in" pattern="^LDFLAGS=.*$" replacement="LDFLAGS=-static"/> 
    38             <exec dir="${basedir}/gsdl" executable="autoconf" output="${basedir}/gsdl/configure"><arg value="configure.in"/></exec> 
    39         </if> 
     34        <rsr 
     35            file="${basedir}/gsdl/configure.in" 
     36            pattern="^LDFLAGS=.*$" 
     37            replacement="LDFLAGS=-static" /> 
     38        <exec dir="${basedir}/gsdl" executable="autoconf" output="${basedir}/gsdl/configure"><arg value="configure.in"/></exec> 
    4039    </target> 
    4140 
    4241    <target name="set-environment-in-packages-configure"> 
    43         <if><bool><istrue value="${execute}"/></bool> 
    44             <rsr file="${basedir}/gsdl/common-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/> 
    45             <rsr file="${basedir}/gsdl/build-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/> 
    46  
    47         </if> 
     42        <rsr 
     43            file="${basedir}/gsdl/common-src/packages/configure" 
     44            pattern="^ENVIRONMENT=.*$" 
     45            replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" /> 
     46        <rsr 
     47            file="${basedir}/gsdl/build-src/packages/configure" 
     48            pattern="^ENVIRONMENT=.*$" 
     49            replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" /> 
    4850    </target> 
    4951 
    5052    <target name="run-configure"> 
    51         <if><bool><istrue value="${execute}"/></bool> 
    52             <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure"> 
    53                 <env key="LDFLAGS" value="-static"/> 
    54             </exec> 
    55         </if> 
     53        <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure"> 
     54            <env key="LDFLAGS" value="-static"/> 
     55        </exec> 
    5656    </target> 
    5757 
    5858    <target name="makefiles-add-static"> 
    59         <if><bool><istrue value="${execute}"/></bool> 
    60             <rsr file="${basedir}/gsdl/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" /> 
    61             <rsr file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" /> 
    62             <rsr file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" /> 
    63             <rsr file="${basedir}/gsdl/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="(-o rtftohtml.{2}EXEEXT.{1})" replacement="$1 -static" /> 
    64         </if> 
     59        <rsr 
     60            file="${basedir}/gsdl/build-src/packages/wv/wv-gs/Makefile" 
     61            pattern="^LDFLAGS =.*$" 
     62            replacement="LDFLAGS = -static" /> 
     63        <rsr 
     64            file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" 
     65            pattern="^LDFLAGS =.*$" 
     66            replacement="LDFLAGS = -static" /> 
     67        <rsr 
     68            file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" 
     69            pattern="^LDFLAGS =.*$" 
     70            replacement="LDFLAGS = -static" /> 
     71        <rsr 
     72            file="${basedir}/gsdl/build-src/packages/rtftohtml/rtftohtml_src/Makefile" 
     73            pattern="(-o rtftohtml.{2}EXEEXT.{1})" 
     74            replacement="$1 -static" /> 
    6575    </target> 
    6676 
    6777    <target name="run-make"> 
    68         <if><bool><istrue value="${execute}"/></bool> 
    69             <exec dir="${basedir}/gsdl" executable="make"/> 
    70         </if> 
     78        <exec dir="${basedir}/gsdl" executable="make"/> 
    7179    </target> 
    7280 
    7381 
    7482    <target name="run-make-install"> 
    75         <if><bool><istrue value="${execute}"/></bool> 
    76             <exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec> 
    77         </if> 
     83        <exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec> 
    7884    </target> 
    7985 
    8086    <target name="copy-library-oai"> 
    81         <if><bool><istrue value="${execute}"/></bool> 
    82             <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/linux/library"/></exec> 
    83             <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec> 
    84         </if> 
     87        <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/linux/library"/></exec> 
     88        <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec> 
    8589    </target> 
    8690 
    8791    <target name="strip-execs"> 
    88         <if><bool><istrue value="${execute}"/></bool> 
    89             <exec dir="${basedir}/gsdl/bin/linux" executable="find"> 
    90                 <arg line="! -name . -type f -maxdepth 1 -exec strip {} &#59;"/> 
    91             </exec> 
    92         </if> 
     92        <exec dir="${basedir}/gsdl/bin/linux" executable="find"> 
     93            <arg line="! -name . -type f -maxdepth 1 -exec strip {} &#59;"/> 
     94        </exec> 
    9395    </target> 
    9496 
    9597    <target name="build-demo-collection"> 
    96         <if><bool><istrue value="${execute}"/></bool> 
    97             <exec dir="${basedir}/gsdl" executable="${lirk2.home}/resources/build-demo.sh"/> 
    98         </if> 
     98        <exec dir="${basedir}/gsdl" executable="${lirk2.home}/resources/build-demo.sh"/> 
    9999    </target> 
    100100 
  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r16629 r16739  
    22<project name="lirk2-create-distribution" default="create-distribution"> 
    33 
     4    <target name="create-distribution"> 
     5        <antcall target="export-gsdl-gli" /> 
     6        <antcall target="dist-set-version" /> 
     7        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 
     8        <antcall target="drop-in-binaries" /> 
     9        <antcall target="drop-in-demo-collection" /> 
     10        <antcall target="drop-in-docs" /> 
     11        <antcall target="compile-gli" /> 
     12        <antcall target="tweak-files" /> 
     13    </target> 
    414 
    5     <target name="create-distribution"> 
    6         <addressedcall target="export-gsdl-gli" /> 
    7         <addressedcall target="dist-set-version" /> 
    8         <addressedcall target="dist-set-gli-version" /> 
    9         <addressedcall target="drop-in-binaries" /> 
    10         <addressedcall target="drop-in-demo-collection" /> 
    11         <addressedcall target="drop-in-docs" /> 
    12         <addressedcall target="compile-gli" /> 
    13         <addressedcall target="create-gli-client-zip" /> 
    14         <addressedcall target="tweak-files" /> 
     15    <target name="export-gsdl-gli"> 
     16        <mkdir dir="distributions"/> 
     17        <delete dir="distributions/web"/> 
     18        <svn> 
     19            <export srcurl="${svn.root}/gsdl/${branch.path}" destPath="distributions/web"/> 
     20            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 
     21        </svn> 
     22    </target> 
     23 
     24    <target name="dist-set-version"> 
     25        <echo level="info">Setting version in src/lib/gsdlconf.h</echo> 
     26        <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
     27 
     28        <echo level="info">Setting version in Install.sh</echo> 
     29        <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" /> 
     30 
     31        <echo level="info">Setting version in etc/VERSION</echo> 
     32        <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" /> 
     33    </target> 
     34 
     35    <target name="drop-in-binaries"> 
     36        <echo level="info">Dropping compiled binaries into distribution</echo> 
     37        <delete dir="distributions/web/bin/linux" /> 
     38        <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec> 
     39        <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec> 
     40        <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 
     41    </target> 
     42 
     43    <target name="drop-in-demo-collection"> 
     44        <echo level="info">Dropping rebuilt demo collection into distribution</echo> 
     45        <delete dir="distributions/web/collect/demo" /> 
     46        <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec> 
     47    </target> 
     48 
     49    <target name="drop-in-docs"> 
     50        <echo level="info">Dropping gsdl docs  into distribution</echo> 
     51        <copy todir="${basedir}/distributions/web" overwrite="true"> 
     52            <fileset dir="${lirk2.home}/greenstone2/docs"/> 
     53        </copy> 
     54    </target> 
     55 
     56    <target name="compile-gli"> 
     57        <echo>Compiling gli...</echo> 
     58        <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.sh"/> 
     59 
     60        <echo>Creating jar...</echo> 
     61        <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.sh"/> 
     62 
     63        <echo>Cleaning up intermediate files...</echo> 
     64        <delete dir="${basedir}/distributions/web/gli/jar"/> 
     65        <delete dir="${basedir}/distributions/web/gli/classes/org"/> 
     66 
     67        <echo>Putting gli server jar in a better place</echo> 
     68        <exec dir="${basedir}/distributions/web" executable="mv" failonerror="true"> 
     69            <arg line="gli/GLIServer.jar bin/java" /> 
     70        </exec> 
     71    </target> 
     72 
     73    <target name="tweak-files"> 
     74        <echo level="info">Changing Install.sh to web release</echo> 
     75        <rsr file="${basedir}/distributions/web/Install.sh" pattern="^(iscdrom=).*" replacement="$1&quot;no&quot;" /> 
     76 
     77        <echo level="info">Changing date and version in the docs</echo> 
     78        <!-- ar --> 
     79        <rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(التاريخ : \s*)(.*)" replacement="$1${month.ar} ${current.year}" /> 
     80        <rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(النسخه : \s*)(.*)" replacement="$1${version}" /> 
     81 
     82        <!-- es --> 
     83        <rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Fecha\s*)(.*)" replacement="$1${month.es} de ${current.year}" /> 
     84        <rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Versi.?n\s*)(.*)" replacement="$1${version}" /> 
     85        <!-- fr --> 
     86        <rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Date\s*)(.*)" replacement="$1${month.fr} ${current.year}" /> 
     87        <rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Version\s*)(.*)" replacement="$1${version}" /> 
     88        <!-- ru --> 
     89        <rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(Дата\s*)(.*)" replacement="$1${month.ru} ${current.year}" /> 
     90        <rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(ВерсОя\s*)(.*)" replacement="$1${version}" /> 
     91        <!-- en --> 
     92        <rsr file="${basedir}/distributions/web/READMEen.txt" pattern="^(Date\s*)(.*)" replacement="$1${month.default} ${current.year}" /> 
     93        <rsr file="${basedir}/distributions/web/READMEen.txt" pattern="^(Version\s*)(.*)" replacement="$1${version}" /> 
     94 
     95        <!-- Support.htm --> 
     96        <rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*Greenstone Digital Library version: ).*(&lt;br&gt;.*)" replacement="$1${version}$2"/> 
     97        <rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*&lt;input.* name=&quot;gsdl version&quot;.* value=&quot;).*(&quot;.*&gt;)" replacement="$1${version}$2"/> 
     98 
     99        <echo level="info">Removing signed gatherer</echo> 
     100        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" /> 
     101 
     102        <echo level="info">Removing some unneeded stuff</echo> 
     103        <delete file="${basedir}/distributions/web/gli/.greenstonestore" /> 
     104        <delete file="${basedir}/distributions/web/gli/gli4gs3.sh" /> 
     105        <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete> 
     106        <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete> 
    15107 
    16108    </target> 
    17109 
    18     <target name="export-gsdl-gli"> 
    19         <if><bool><istrue value="${execute}"/></bool> 
    20              
    21             <mkdir dir="distributions"/> 
    22             <delete dir="distributions/web"/> 
    23             <svn> 
    24                 <export srcurl="${svn.root}/gsdl/${branch.path}" destPath="distributions/web"/> 
    25                 <export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/> 
    26             </svn> 
    27              
    28         </if> 
    29     </target> 
    30  
    31     <target name="dist-set-version"> 
    32         <if><bool><istrue value="${execute}"/></bool> 
    33  
    34             <echo level="info">Setting version in src/lib/gsdlconf.h</echo> 
    35             <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
    36  
    37             <echo level="info">Setting version in Install.sh</echo> 
    38             <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" /> 
    39  
    40             <echo level="info">Setting version in etc/VERSION</echo> 
    41             <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" /> 
    42  
    43         </if> 
    44     </target> 
    45  
    46     <target name="dist-set-gli-version"> 
    47         <if><bool><istrue value="${execute}"/></bool> 
    48             <ant antfile="${lirk2.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distributions/web/gli" target="set-version-numbers"/> 
    49         </if> 
    50     </target> 
    51  
    52     <target name="drop-in-binaries"> 
    53         <if><bool><istrue value="${execute}"/></bool> 
    54             <echo level="info">Dropping compiled binaries into distribution</echo> 
    55             <delete dir="distributions/web/bin/linux" /> 
    56             <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec> 
    57             <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec> 
    58             <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 
    59         </if> 
    60     </target> 
    61  
    62     <target name="drop-in-demo-collection"> 
    63         <if><bool><istrue value="${execute}"/></bool> 
    64             <echo level="info">Dropping rebuilt demo collection into distribution</echo> 
    65             <delete dir="distributions/web/collect/demo" /> 
    66             <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec> 
    67         </if> 
    68     </target> 
    69  
    70     <target name="drop-in-docs"> 
    71         <if><bool><istrue value="${execute}"/></bool> 
    72             <echo level="info">Dropping gsdl docs  into distribution</echo> 
    73             <copy todir="${basedir}/distributions/web" overwrite="true"> 
    74                 <fileset dir="${lirk2.home}/greenstone2/docs"/> 
    75             </copy> 
    76         </if> 
    77     </target> 
    78  
    79     <target name="compile-gli"> 
    80         <if><bool><istrue value="${execute}"/></bool> 
    81  
    82             <echo>Compiling gli...</echo> 
    83             <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.sh"/> 
    84  
    85             <echo>Creating jar...</echo> 
    86             <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.sh"/> 
    87  
    88             <echo>Cleaning up intermediate files...</echo> 
    89             <delete dir="${basedir}/distributions/web/gli/jar"/> 
    90             <delete dir="${basedir}/distributions/web/gli/classes/org"/> 
    91  
    92             <echo>Putting gli server jar in a better place</echo> 
    93             <exec dir="${basedir}/distributions/web" executable="mv" failonerror="true"> 
    94                 <arg line="gli/GLIServer.jar bin/java" /> 
    95             </exec> 
    96  
    97         </if> 
    98     </target> 
    99  
    100     <target name="create-gli-client-zip"> 
    101         <if><bool><istrue value="${execute}"/></bool> 
    102             <!-- 
    103             # take a copy of GLI directory 
    104             &util::cp_r(&util::filename_cat($tmpdir, "gsdl", "gli"), $tmpdir); 
    105  
    106             my $client_dirname = "gli-client-" . $version_num; 
    107             rename ("gli", $client_dirname); 
    108             chdir(&util::filename_cat($tmpdir, $client_dirname)); 
    109  
    110  
    111             # delete unnecessary stuff 
    112             `rm -rf clean.* document.* gems.* gli*.sh gli*.bat make*.sh make*.bat lib src`; 
    113             # make sure permissions are ok 
    114             `chmod a+x client-gli.sh client-gli.bat`; 
    115             chdir($tmpdir); 
    116  
    117             # zip up the client 
    118             &zip($client_dirname, $client_dirname, $tmpdir, 1); 
    119             --> 
    120         </if> 
    121     </target> 
    122  
    123  
    124     <target name="tweak-files"> 
    125         <if><bool><istrue value="${execute}"/></bool> 
    126  
    127             <echo level="info">Changing Install.sh to web release</echo> 
    128             <rsr file="${basedir}/distributions/web/Install.sh" pattern="^(iscdrom=).*" replacement="$1&quot;no&quot;" /> 
    129  
    130  
    131             <echo level="info">Changing date and version in the docs</echo> 
    132             <!-- ar --> 
    133             <rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(التاريخ : \s*)(.*)" replacement="$1${month.ar} ${current.year}" /> 
    134             <rsr file="${basedir}/distributions/web/READMEar.txt" pattern="(النسخه : \s*)(.*)" replacement="$1${version}" /> 
    135  
    136             <!-- es --> 
    137             <rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Fecha\s*)(.*)" replacement="$1${month.es} de ${current.year}" /> 
    138             <rsr file="${basedir}/distributions/web/READMEes.txt" pattern="^(Versi.?n\s*)(.*)" replacement="$1${version}" /> 
    139             <!-- fr --> 
    140             <rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Date\s*)(.*)" replacement="$1${month.fr} ${current.year}" /> 
    141             <rsr file="${basedir}/distributions/web/READMEfr.txt" pattern="^(Version\s*)(.*)" replacement="$1${version}" /> 
    142             <!-- ru --> 
    143             <rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(Дата\s*)(.*)" replacement="$1${month.ru} ${current.year}" /> 
    144             <rsr file="${basedir}/distributions/web/READMEru.txt" pattern="^(ВерсОя\s*)(.*)" replacement="$1${version}" /> 
    145             <!-- en --> 
    146             <rsr file="${basedir}/distributions/web/READMEen.txt" pattern="^(Date\s*)(.*)" replacement="$1${month.default} ${current.year}" /> 
    147             <rsr file="${basedir}/distributions/web/READMEen.txt" pattern="^(Version\s*)(.*)" replacement="$1${version}" /> 
    148  
    149             <!-- Support.htm --> 
    150             <rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*Greenstone Digital Library version: ).*(&lt;br&gt;.*)" replacement="$1${version}$2"/> 
    151             <rsr file="${basedir}/distributions/web/Support.htm" pattern="^(\s*&lt;input.* name=&quot;gsdl version&quot;.* value=&quot;).*(&quot;.*&gt;)" replacement="$1${version}$2"/> 
    152  
    153             <echo level="info">Removing signed gatherer</echo> 
    154             <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" /> 
    155  
    156             <echo level="info">Removing some unneeded stuff</echo> 
    157             <delete file="${basedir}/distributions/web/gli/.greenstonestore" /> 
    158             <delete file="${basedir}/distributions/web/gli/gli4gs3.sh" /> 
    159             <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete> 
    160             <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete> 
    161  
    162         </if> 
    163     </target> 
    164  
    165110</project> 
  • release-kits/lirk2/ant-scripts/create-installer.xml

    r16278 r16739  
    33 
    44    <target name="create-installer"> 
    5         <addressedcall target="setup-for-installer-creation"/> 
    6         <addressedcall target="compile-installer"/> 
     5        <antcall target="setup-for-installer-creation"/> 
     6        <antcall target="compile-installer"/> 
    77    </target> 
    88 
    99    <target name="setup-for-installer-creation"> 
    10         <if><bool><istrue value="${execute}"/></bool> 
    1110 
    12             <echo>Getting things ready to compile the installer</echo> 
    13             <mkdir dir="${basedir}/installer/classes"/> 
    14             <copy todir="${basedir}/installer" file="${lirk2.home}/installer/antinstall-config.xml" overwrite="true"/> 
    15             <copy todir="${basedir}/installer" file="${lirk2.home}/installer/build.xml" overwrite="true"/> 
    16             <copy todir="${basedir}/installer/classes" overwrite="true"> 
    17                 <fileset dir="${lirk2.home}/greenstone2/installer-classes"/> 
    18                 <fileset dir="${lirk2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" /> 
    19             </copy> 
     11        <echo>Getting things ready to compile the installer</echo> 
     12        <mkdir dir="${basedir}/installer/classes"/> 
     13        <copy todir="${basedir}/installer" file="${lirk2.home}/installer/antinstall-config.xml" overwrite="true"/> 
     14        <copy todir="${basedir}/installer" file="${lirk2.home}/installer/build.xml" overwrite="true"/> 
     15        <copy todir="${basedir}/installer/classes" overwrite="true"> 
     16            <fileset dir="${lirk2.home}/greenstone2/installer-classes"/> 
     17            <fileset dir="${lirk2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" /> 
     18        </copy> 
    2019 
    21             <!-- put the concrete values of things in the config --> 
    22             <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/> 
    23             <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.java@" replacement="${component.size.linux-java}"/> 
    24             <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    25             <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/> 
     20        <!-- put the concrete values of things in the config --> 
     21        <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/> 
     22        <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.java@" replacement="${component.size.linux-java}"/> 
     23        <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/> 
     24        <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/> 
    2625 
    27             <!-- put the concrete values of things in the text --> 
    28             <!-- default --> 
    29             <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/> 
    30             <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    31             <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.linux-java}"/> 
     26        <!-- put the concrete values of things in the text --> 
     27        <!-- default --> 
     28        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/> 
     29        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 
     30        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.linux-java}"/> 
    3231 
    33         </if> 
    3432    </target> 
    3533 
    3634    <target name="compile-installer"> 
    37         <if><bool><istrue value="${execute}"/></bool> 
    3835 
    39             <!-- create the installer with java --> 
    40             <installer file="${basedir}/installer/greenstone-${version}-linux-with-java.jar" 
    41                     compress="true" 
    42                     extractType="NonExtractor" 
    43                     installConfig="${basedir}/installer/antinstall-config.xml" 
    44                     buildFile="${basedir}/installer/build.xml" 
    45                     antInstallLib="${lirk2.home}/packages/ant-installer/lib" 
    46                     antLib="${lirk2.home}/packages/ant/lib" 
    47                     validateConfig="true" 
    48                     failOnError="false" 
    49                     icons="bluecurve"> 
     36        <!-- create the installer with java --> 
     37        <installer file="${basedir}/installer/greenstone-${version}-linux-with-java.jar" 
     38                compress="true" 
     39                extractType="NonExtractor" 
     40                installConfig="${basedir}/installer/antinstall-config.xml" 
     41                buildFile="${basedir}/installer/build.xml" 
     42                antInstallLib="${lirk2.home}/packages/ant-installer/lib" 
     43                antLib="${lirk2.home}/packages/ant/lib" 
     44                validateConfig="true" 
     45                failOnError="false" 
     46                icons="bluecurve"> 
    5047 
    51                 <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
    52                 <zipfileset dir="${basedir}/distributions/web" includes="**/*"/> 
     48            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
     49            <zipfileset dir="${basedir}/distributions/web" includes="**/*"/> 
    5350 
    54             </installer> 
     51        </installer> 
    5552 
    56             <!-- delete the 'bundled java only' lines from the installer config --> 
    57             <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/> 
     53        <!-- delete the 'bundled java only' lines from the installer config --> 
     54        <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/> 
    5855 
    59             <!-- create the installer without java --> 
    60             <installer file="${basedir}/installer/greenstone-${version}-linux.jar" 
    61                     compress="true" 
    62                     extractType="NonExtractor" 
    63                     installConfig="${basedir}/installer/antinstall-config.xml" 
    64                     buildFile="${basedir}/installer/build.xml" 
    65                     antInstallLib="${lirk2.home}/packages/ant-installer/lib" 
    66                     antLib="${lirk2.home}/packages/ant/lib" 
    67                     validateConfig="true" 
    68                     failOnError="false" 
    69                     icons="bluecurve"> 
     56        <!-- create the installer without java --> 
     57        <installer file="${basedir}/installer/greenstone-${version}-linux.jar" 
     58                compress="true" 
     59                extractType="NonExtractor" 
     60                installConfig="${basedir}/installer/antinstall-config.xml" 
     61                buildFile="${basedir}/installer/build.xml" 
     62                antInstallLib="${lirk2.home}/packages/ant-installer/lib" 
     63                antLib="${lirk2.home}/packages/ant/lib" 
     64                validateConfig="true" 
     65                failOnError="false" 
     66                icons="bluecurve"> 
    7067 
    71                 <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
    72                 <zipfileset dir="${basedir}/distributions/web" includes="**/*"/> 
     68            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
     69            <zipfileset dir="${basedir}/distributions/web" includes="**/*"/> 
    7370 
    74             </installer> 
     71        </installer> 
    7572 
    76         </if> 
    7773    </target> 
    7874 
  • release-kits/lirk2/ant-scripts/wrap.xml

    r16233 r16739  
    33 
    44    <target name="wrap"> 
    5         <addressedcall target="setup-for-wrapping"/> 
    6         <addressedcall target="compile-wrapper"/> 
     5        <antcall target="setup-for-wrapping"/> 
     6        <antcall target="compile-wrapper"/> 
    77    </target> 
    88 
    99 
    1010    <target name="setup-for-wrapping"> 
    11         <if><bool><istrue value="${execute}"/></bool> 
    1211 
    13             <!-- create and setup the build directory --> 
    14             <mkdir dir="${basedir}/wrapped-installer/build"/> 
    15             <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/wrapper.cpp"/> 
    16             <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/libsearch4j.cpp"/> 
    17             <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/libsearch4j.h"/> 
     12        <!-- create and setup the build directory --> 
     13        <mkdir dir="${basedir}/wrapped-installer/build"/> 
     14        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/wrapper.cpp"/> 
     15        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/libsearch4j.cpp"/> 
     16        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/libsearch4j.h"/> 
    1817 
    19             <!-- copy bundled files --> 
    20             <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${linux-java.installer}"/> 
    21             <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/greenstone-${version}-linux.jar"/> 
    22             <copy tofile="${basedir}/wrapped-installer/build/greenstone2-with-java.jar" file="${basedir}/installer/greenstone-${version}-linux-with-java.jar"/> 
     18        <!-- copy bundled files --> 
     19        <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${linux-java.installer}"/> 
     20        <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/greenstone-${version}-linux.jar"/> 
     21        <copy tofile="${basedir}/wrapped-installer/build/greenstone2-with-java.jar" file="${basedir}/installer/greenstone-${version}-linux-with-java.jar"/> 
    2322 
    24             <!-- substitute in real values --> 
    25             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/> 
    26             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone2"/> 
    27             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/> 
    28             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/> 
     23        <!-- substitute in real values --> 
     24        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/> 
     25        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone2"/> 
     26        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/> 
     27        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    2928 
    30         </if> 
    3129    </target> 
    3230 
    3331    <target name="compile-wrapper"> 
    34         <if><bool><istrue value="${execute}"/></bool> 
    3532 
    36             <echo level="info">create an object file (extension .o) for each file to bundle</echo> 
    37             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 
    38                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_jar_start=greenstone2jar --readonly-text greenstone2.jar greenstone2.jar.o"/> 
    39             </exec> 
    40             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 
    41                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_with_java_jar_start=greenstone2jar --readonly-text greenstone2-with-java.jar greenstone2-with-java.jar.o"/> 
    42             </exec> 
    43             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 
    44                 <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/> 
    45             </exec> 
     33        <echo level="info">create an object file (extension .o) for each file to bundle</echo> 
     34        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 
     35            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_jar_start=greenstone2jar --readonly-text greenstone2.jar greenstone2.jar.o"/> 
     36        </exec> 
     37        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 
     38            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_with_java_jar_start=greenstone2jar --readonly-text greenstone2-with-java.jar greenstone2-with-java.jar.o"/> 
     39        </exec> 
     40        <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build"> 
     41            <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/> 
     42        </exec> 
    4643 
    47             <!-- get size of greenstone.jar --> 
    48             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec> 
    49             <exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
     44        <!-- get size of greenstone.jar --> 
     45        <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec> 
     46        <exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
    5047 
    51             <!-- get size of greenstone-with-java.jar --> 
    52             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2-with-java.jar.ls"><arg line="-l greenstone2-with-java.jar"/></exec> 
    53             <exec executable="sed" inputstring="${greenstone2-with-java.jar.ls}" outputproperty="greenstone2-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
     48        <!-- get size of greenstone-with-java.jar --> 
     49        <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2-with-java.jar.ls"><arg line="-l greenstone2-with-java.jar"/></exec> 
     50        <exec executable="sed" inputstring="${greenstone2-with-java.jar.ls}" outputproperty="greenstone2-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
    5451 
    55             <!-- get size of java --> 
    56             <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec> 
    57             <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
     52        <!-- get size of java --> 
     53        <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec> 
     54        <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec> 
    5855 
    59             <echo level="info">creating the header file for no java version</echo> 
    60             <delete file="wrapper.h"/> 
    61             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.jar.size}];"/></exec> 
     56        <echo level="info">creating the header file for no java version</echo> 
     57        <delete file="wrapper.h"/> 
     58        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.jar.size}];"/></exec> 
    6259 
    63             <echo level="info">compile the wrapper program</echo> 
    64             <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
    65                 <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/> 
    66             </exec> 
     60        <echo level="info">compile the wrapper program</echo> 
     61        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
     62            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/> 
     63        </exec> 
    6764 
    68             <echo level="info">compile libsearch4j</echo> 
    69             <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
    70                 <arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/> 
    71             </exec> 
     65        <echo level="info">compile libsearch4j</echo> 
     66        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
     67            <arg line="-Wall -static -static-libgcc -c -o libsearch4j.o libsearch4j.cpp"/> 
     68        </exec> 
    7269 
    73             <echo level="info">link, bundling the files to be bundled</echo> 
    74             <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
    75                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o"/> 
    76             </exec> 
     70        <echo level="info">link, bundling the files to be bundled</echo> 
     71        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
     72            <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o"/> 
     73        </exec> 
    7774 
    78             <echo level="info">creating the header file for bundled java version</echo> 
    79             <delete file="wrapper.h"/> 
    80             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2-with-java.jar.size}];"/></exec> 
    81             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec> 
    82             <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec> 
     75        <echo level="info">creating the header file for bundled java version</echo> 
     76        <delete file="wrapper.h"/> 
     77        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2-with-java.jar.size}];"/></exec> 
     78        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec> 
     79        <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec> 
    8380 
    84             <echo level="info">recompile the wrapper program</echo> 
    85             <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
    86                 <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/> 
    87             </exec> 
     81        <echo level="info">recompile the wrapper program</echo> 
     82        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
     83            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/> 
     84        </exec> 
    8885 
    89             <echo level="info">relink, bundling the files to be bundled</echo> 
    90             <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
    91                 <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone2-with-java.jar.o java.o"/> 
    92             </exec> 
     86        <echo level="info">relink, bundling the files to be bundled</echo> 
     87        <exec executable="g++" dir="${basedir}/wrapped-installer/build"> 
     88            <arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o libsearch4j.o greenstone2-with-java.jar.o java.o"/> 
     89        </exec> 
    9390 
    94         </if> 
    9591    </target> 
    9692