Changeset 18923

Show
Ignore:
Timestamp:
08.04.2009 16:36:36 (10 years ago)
Author:
oranfry
Message:

change the way the windows rk makes distributions

Location:
branches/rk-oran/wirk2/ant-scripts
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • branches/rk-oran/wirk2/ant-scripts/compile.xml

    r18870 r18923  
    44    <target name="compile"> 
    55        <antcall target="checkout-gsdl-gli" /> 
     6        <antcall target="drop-in-docs"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 
    67        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 
     8        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/compiled/gli"/></antcall> 
     9 
    710        <antcall target="unzip-packages" /> 
    811        <antcall target="get-winbin" /> 
    912        <antcall target="insert-windows-perl"><param name="gsdl.basedir" value="compiled"/></antcall> 
    1013        <antcall target="compile-c-code" /> 
    11         <antcall target="compile-uninstaller" /> <!-- from rk2-targets --> 
     14 
     15        <!-- gli --> 
     16        <antcall target="compile-gli"> 
     17            <param name="script.format" value="bat"/> 
     18            <param name="glibasedir"  value="${basedir}/compiled/gli"/> 
     19            <param name="gsdlbasedir" value="${basedir}/compiled"/> 
     20        </antcall> 
     21 
     22        <!-- uninstaller --> 
     23        <antcall target="compile-uninstaller" /> <!-- from init --> 
     24 
    1225        <antcall target="build-demo-collection" /> 
    1326    </target> 
  • branches/rk-oran/wirk2/ant-scripts/create-distribution.xml

    r18870 r18923  
    44    <target name="create-distribution"> 
    55 
    6         <antcall target="export-gsdl-gli"><param name="dest" value="distributions/web"/></antcall> 
    7         <antcall target="drop-in-docs"><param name="gsdl.basedir" value="distributions/web"/></antcall> 
    8         <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall> 
    9         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall> 
     6        <antcall target="copy-compiled-to-dist"/> <!-- from init --> 
     7        <antcall target="dist-clean-sourcecode"/> <!-- from rk2-targets --> 
     8         
    109        <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk2-targets --> 
    1110        <antcall target="dist-unzip-packages"/> 
    12         <antcall target="drop-in-binaries" /> 
    13         <antcall target="drop-in-demo-collection" /> 
    14         <!--Don't need because server.exe takes care of the gsdlhome path now--> 
    15         <!--<antcall target="drop-in-misc" />--> 
    16         <antcall target="compile-gli" /> 
     11         
    1712        <antcall target="remove-unneeded-files" /> 
     13        <antcall target="strip-svn-dirs"><param name="dir" value="${basedir}/distributions/web"/></antcall> 
    1814        <antcall target="create-needed-empty-files"><param name="gsdl.basedir" value="distributions/web"/></antcall> 
    1915 
     
    2218    </target> 
    2319 
    24     <target name="drop-in-binaries"> 
    25         <echo level="info">Dropping compiled binaries into distribution</echo> 
    26         <delete dir="${basedir}/distributions/web/bin/windows" /> 
    27         <copy todir="${basedir}/distributions/web/bin/windows"> 
    28             <fileset dir="${basedir}/compiled/bin/windows" includes="**/*"/> 
    29         </copy> 
    30         <copy todir="distributions/web" file="compiled/bin/windows/server.exe"/> 
    31         <copy todir="distributions/web/cgi-bin/library" file="compiled/cgi-bin/library.cgi"/> 
    32         <copy todir="distributions/web/cgi-bin/oaiserver" file="compiled/cgi-bin/oaiserver.cgi"/> 
    33          
    34         <echo level="info">Dropping LuceneWrapper.jar in place</echo> 
    35         <copy file="${basedir}/compiled/bin/java/LuceneWrapper.jar" todir="${basedir}/distributions/web/bin/java" /> 
    36     </target> 
    37  
    38     <target name="drop-in-demo-collection"> 
    39         <echo level="info">Dropping rebuilt demo collection into distribution</echo> 
    40         <delete dir="${basedir}/distributions/web/collect/demo" /> 
    41         <copy todir="${basedir}/distributions/web/collect/demo"> 
    42             <fileset dir="${basedir}/compiled/collect/demo" includes="**/*"/> 
    43         </copy> 
    44     </target> 
    45  
    46     <target name="drop-in-misc"> 
    47         <echo level="info">Putting the default llssite.cfg at the root of the distribution</echo> 
    48         <copy todir="${basedir}/distributions/web" file="${wirk2.home}/resources/llssite.cfg" overwrite="true"/> 
    49     </target> 
    50      
    51     <target name="compile-gli"> 
    52         <echo>Compiling gli...</echo> 
    53         <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.bat"/> 
    54          
    55         <echo>Creating jar...</echo> 
    56         <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.bat"/> 
    57          
    58         <echo>Cleaning up intermediate files...</echo> 
    59         <delete dir="${basedir}/distributions/web/gli/jar"/> 
    60         <delete dir="${basedir}/distributions/web/gli/classes/org"/> 
    61          
    62         <echo>Putting gli server jar in a better place</echo> 
    63         <move file="${basedir}/distributions/web/gli/GLIServer.jar" todir="${basedir}/distributions/web/bin/java" /> 
    64     </target> 
    65  
    6620    <target name="remove-unneeded-files"> 
     21        <delete dir="distributions/web/uninstaller"/> 
    6722        <delete file="${basedir}/distributions/web/gli/.greenstonestore" /> 
    6823        <delete dir="${basedir}/distributions/web/bin/linux" />