Changeset 18929

Show
Ignore:
Timestamp:
09.04.2009 10:08:46 (11 years ago)
Author:
oranfry
Message:

changing the way the release kits make the greenstone2 distribution: instead of starting from a fresh export of greenstone, start from a copy of the compiled working copy

Location:
release-kits
Files:
10 modified

Legend:

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

    r18870 r18929  
    66        <!-- checkout --> 
    77        <antcall target="checkout-gsdl-gli" /> 
     8        <antcall target="drop-in-docs"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 
    89        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 
    9          
     10        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/compiled/gli"/></antcall> 
     11 
    1012        <!-- configure --> 
    1113        <antcall target="add-static-to-configure-in"/> 
     
    1315        <antcall target="run-configure"/> 
    1416        <antcall target="makefiles-add-static"/> 
     17 
     18        <!-- make common-src and reconfigure --> 
     19        <!-- this is a workaround to a problem with the gsdl build code --> 
     20        <!-- expat needs to be compiled before the perl XML Parser is configured --> 
     21        <antcall target="make-common-src"/> 
     22        <antcall target="run-configure"/> 
    1523 
    1624        <!-- make --> 
     
    2028        <antcall target="strip-execs"/> 
    2129 
     30        <!-- gli --> 
     31        <antcall target="compile-gli"> 
     32            <param name="script.format"  value="sh"/> 
     33            <param name="glibasedir"  value="${basedir}/compiled/gli"/> 
     34            <param name="gsdlbasedir" value="${basedir}/compiled"/> 
     35        </antcall> 
     36 
    2237        <!-- uninstaller --> 
    23         <antcall target="compile-uninstaller" /> <!-- from rk2-targets --> 
     38        <antcall target="compile-uninstaller" /> <!-- from init --> 
    2439 
    2540        <!-- build collections --> 
    2641        <antcall target="build-demo-collection" /> 
    2742 
    28     </target> 
    29  
    30     <target name="checkout-gsdl-gli"> 
    31         <svn> 
    32             <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/> 
    33             <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/> 
    34         </svn> 
    3543    </target> 
    3644 
     
    104112 
    105113 
    106  
    107114</project> 
  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r18874 r18929  
    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        <antcall target="dist-unzip-packages"/> <!-- from rk2-targets --> 
     9        <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets --> 
    1010        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets --> 
    11         <antcall target="dist-unzip-packages"/> 
    12         <antcall target="drop-in-demo-collection" /> 
    13         <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets --> 
    14         <antcall target="drop-in-binaries" /> 
    15         <antcall target="export-imagemagick-linux-binaries" /> 
    16         <antcall target="export-wvware-linux-binaries" /> 
    17         <antcall target="compile-gli" /> 
     11 
     12        <antcall target="export-imagemagick-linux-binaries"/> 
     13        <antcall target="export-wvware-linux-binaries"/> 
     14         
    1815        <antcall target="remove-unneeded-files" /> 
     16        <antcall target="strip-svn-dirs"><param name="dir" value="${basedir}/distributions/web"/></antcall> 
    1917        <antcall target="create-needed-empty-files"><param name="gsdl.basedir" value="distributions/web"/></antcall> 
    2018 
     
    5856    </target> 
    5957 
    60     <target name="compile-gli"> 
    61         <echo>Compiling gli...</echo> 
    62         <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.sh"/> 
    63  
    64         <echo>Creating jar...</echo> 
    65         <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.sh"/> 
    66  
    67         <echo>Cleaning up intermediate files...</echo> 
    68         <delete dir="${basedir}/distributions/web/gli/jar"/> 
    69         <delete dir="${basedir}/distributions/web/gli/classes/org"/> 
    70  
    71         <echo>Putting gli server jar in a better place</echo> 
    72         <exec dir="${basedir}/distributions/web" executable="mv" failonerror="true"> 
    73             <arg line="gli/GLIServer.jar bin/java" /> 
    74         </exec> 
    75     </target> 
    76  
    77     <target name="dist-unzip-packages"> 
    78         <untar src="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/distributions/web/common-src/packages/sqlite" compression="gzip"/> 
    79         <delete file="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/> 
    80     </target> 
    81  
    82  
    8358    <target name="remove-unneeded-files"> 
     59        <delete dir="${basedir}/distributions/web/uninstaller" /> 
     60        <delete dir="${basedir}/distributions/web/autom4te.cache" /> 
    8461        <delete file="${basedir}/distributions/web/gli/.greenstonestore" /> 
    85         <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,win32cfg.h,Install.sh,Support.htm"/></delete> 
     62        <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,win32cfg.h,Install.sh,Support.htm,micotest.cpp"/></delete> 
    8663        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" /> 
    8764        <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete> 
    8865        <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete> 
    8966        <delete dir="${basedir}/distributions/web/common-src/packages/windows"/> 
     67        <delete dir="${basedir}/distributions/web/common-src/indexers/packages/windows"/> 
    9068    </target> 
    9169 
  • release-kits/lirk2/resources/build-demo.sh

    r16167 r18929  
    1 . setup.bash 
    2 import.pl --removeold demo 
    3 buildcol.pl --removeold demo 
    4 rm -rf collect/demo/index 
     1#!/bin/bash 
     2source setup.bash 
     3import.pl --removeold demo && \ 
     4buildcol.pl --removeold demo && \ 
     5rm -rf collect/demo/index collect/demo/archives && \ 
    56mv collect/demo/building collect/demo/index 
     7 
  • release-kits/mark2/ant-scripts/compile.xml

    r18870 r18929  
    66        <!-- checkout --> 
    77        <antcall target="checkout-gsdl-gli" /> 
     8        <antcall target="drop-in-docs"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 
    89        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 
     10        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/compiled/gli"/></antcall> 
    911         
    1012        <!-- configure --> 
    1113        <antcall target="run-configure"/> 
    1214        <antcall target="tweak-makefiles"/> 
     15 
     16        <!-- make common-src and reconfigure --> 
     17        <!-- this is a workaround to a problem with the gsdl build code --> 
     18        <!-- expat needs to be compiled before the perl XML Parser is configured --> 
     19        <antcall target="make-common-src"/> 
     20        <antcall target="run-configure"/> 
    1321 
    1422        <!-- make --> 
     
    1826        <antcall target="strip-execs"/> 
    1927 
     28        <!-- gli --> 
     29        <antcall target="compile-gli"> 
     30            <param name="script.format"  value="sh"/> 
     31            <param name="glibasedir"  value="${basedir}/compiled/gli"/> 
     32            <param name="gsdlbasedir" value="${basedir}/compiled"/> 
     33        </antcall> 
     34 
    2035        <!-- uninstaller --> 
    2136        <antcall target="compile-uninstaller" /> <!-- from rk2-targets --> 
     
    2439        <antcall target="build-demo-collection" /> 
    2540 
    26     </target> 
    27  
    28     <target name="checkout-gsdl-gli"> 
    29         <svn javahl="false"> 
    30             <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/> 
    31             <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/> 
    32         </svn> 
    3341    </target> 
    3442 
  • release-kits/mark2/ant-scripts/create-distribution.xml

    r18874 r18929  
    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        <antcall target="dist-unzip-packages"/> <!-- from rk2-targets --> 
     9        <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets --> 
    1010        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets --> 
    11         <antcall target="dist-unzip-packages"/> 
    12         <antcall target="drop-in-binaries" /> 
    13         <antcall target="drop-in-demo-collection" /> 
    14         <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets --> 
     11 
    1512        <antcall target="export-imagemagick-darwin-binaries" /> 
    1613        <antcall target="export-ghostscript-darwin-binaries" /> 
    17         <antcall target="compile-gli" /> 
    18         <antcall target="remove-unneeded-files" /> 
     14 
     15        <antcall target="remove-unneeded-files"/> 
     16        <antcall target="strip-svn-dirs"><param name="dir" value="${basedir}/distributions/web"/></antcall> 
    1917        <antcall target="create-needed-empty-files"><param name="gsdl.basedir" value="distributions/web"/></antcall> 
    2018 
     
    7573    </target> 
    7674 
    77     <target name="dist-unzip-packages"> 
    78         <untar src="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/distributions/web/common-src/packages/sqlite" compression="gzip"/> 
    79         <delete file="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/> 
    80     </target> 
    81  
    82  
    8375    <target name="remove-unneeded-files"> 
     76        <delete dir="${basedir}/distributions/web/uninstaller" /> 
    8477        <delete file="${basedir}/distributions/web/gli/.greenstonestore" /> 
    8578        <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,win32cfg.h,Install.sh,Support.htm"/></delete> 
  • release-kits/mark2/resources/build-demo.sh

    r16167 r18929  
    1 . setup.bash 
    2 import.pl --removeold demo 
    3 buildcol.pl --removeold demo 
    4 rm -rf collect/demo/index 
     1#!/bin/bash 
     2source setup.bash 
     3import.pl --removeold demo && \ 
     4buildcol.pl --removeold demo && \ 
     5rm -rf collect/demo/index collect/demo/archives && \ 
    56mv collect/demo/building collect/demo/index 
     7 
  • release-kits/shared/ant-scripts/init.xml

    r18072 r18929  
    359359        <!-- jar it all up --> 
    360360        <jar 
    361             destfile="${basedir}/compiled/uninstaller/uninst.jar" 
     361            destfile="${basedir}/compiled/uninst.jar" 
    362362            manifest="${rk.home}/uninstaller/manifest.mf" 
    363363            basedir="${basedir}/compiled/uninstaller/build" /> 
     
    365365    </target> 
    366366 
    367     <!-- copy the uninstaller from the compiled directory to web distribution --> 
     367    <!-- copy the uninstaller script from the rk to web distribution --> 
    368368    <target name="insert-uninstaller"> 
    369         <copy file="compiled/uninstaller/uninst.jar" todir="distributions/web" /> 
    370369        <copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" /> 
    371370    </target> 
     
    391390        <unzip src="${rk.home}/windows/perl.zip" dest="${gsdl.basedir}/bin/windows"/> 
    392391    </target> 
    393  
     392    <target name="copy-compiled-to-dist"> 
     393        <delete dir="distributions/web"/> 
     394        <mkdir dir="distributions"/> 
     395        <exec executable="cp"><arg line="-r compiled distributions/web"/></exec> 
     396    </target> 
    394397 
    395398</project> 
  • release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

    r18869 r18929  
    9797    <target name="create-binary-zip-linux"> 
    9898        <property name="binzip.dir" value="distributions/Greenstone-${version}-${os.suffix}-binary"/> 
     99 
     100        <delete dir="${binzip.dir}"/> 
    99101        <exec dir="${basedir}" executable="cp"><arg line="-r distributions/web ${binzip.dir}"/></exec> 
    100102 
     
    137139    </target> 
    138140 
     141    <target name="dist-clean-sourcecode"> 
     142        <delete> 
     143            <fileset dir="distributions/web" includes="Makefile,config.cache,config.h,config.log,stamp-h,config.status"/> 
     144        </delete> 
     145        <delete dir="distributions/web/common-src"/> 
     146        <delete dir="distributions/web/build-src"/> 
     147        <delete dir="distributions/web/runtime-src"/> 
     148        <svn> 
     149            <export srcurl="${svn.root}/gsdl/${branch.path}/common-src" destPath="distributions/web/common-src"/> 
     150            <export srcurl="${svn.root}/gsdl/${branch.path}/build-src" destPath="distributions/web/build-src"/> 
     151            <export srcurl="${svn.root}/gsdl/${branch.path}/runtime-src" destPath="distributions/web/runtime-src"/> 
     152        </svn> 
     153    </target> 
     154 
     155    <target name="dist-unzip-packages"> 
     156        <untar src="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/distributions/web/common-src/packages/sqlite" compression="gzip"/> 
     157        <delete file="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/> 
     158    </target> 
     159 
     160    <target name="make-common-src"> 
     161        <exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"/> 
     162        <exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"><arg value="install"/></exec> 
     163    </target> 
     164 
     165    <target name="checkout-gsdl-gli"> 
     166        <svn> 
     167            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/> 
     168            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/> 
     169        </svn> 
     170    </target> 
     171 
     172    <target name="compile-gli"> 
     173 
     174        <!-- default to sh --> 
     175        <property name="script.format" value="sh"/> 
     176         
     177        <echo>Compiling gli...</echo> 
     178        <exec dir="${glibasedir}" executable="${glibasedir}/makegli.${script.format}"/> 
     179 
     180        <echo>Creating jar...</echo> 
     181        <exec dir="${glibasedir}" executable="${glibasedir}/makejar.${script.format}"/> 
     182 
     183        <echo>Cleaning up intermediate files...</echo> 
     184        <delete dir="${glibasedir}/jar"/> 
     185        <delete dir="${glibasedir}/classes/org"/> 
     186 
     187        <if><bool><isset property="gsdlbasedir"/></bool> 
     188            <echo>Putting gli server jar in a better place</echo> 
     189            <exec executable="mv" failonerror="true"> 
     190                <arg line="${glibasedir}/GLIServer.jar ${gsdlbasedir}/bin/java" /> 
     191            </exec> 
     192        </if> 
     193 
     194    </target> 
     195 
     196 
    139197</project> 
    140198     
  • release-kits/wirk2/ant-scripts/compile.xml

    r18870 r18929  
    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> 
  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r18870 r18929  
    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        <antcall target="copy-server"/> 
     12         
    1713        <antcall target="remove-unneeded-files" /> 
     14        <antcall target="strip-svn-dirs"><param name="dir" value="${basedir}/distributions/web"/></antcall> 
    1815        <antcall target="create-needed-empty-files"><param name="gsdl.basedir" value="distributions/web"/></antcall> 
    1916 
     
    2219    </target> 
    2320 
    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  
    6621    <target name="remove-unneeded-files"> 
     22        <delete dir="distributions/web/uninstaller"/> 
    6723        <delete file="${basedir}/distributions/web/gli/.greenstonestore" /> 
    6824        <delete dir="${basedir}/distributions/web/bin/linux" /> 
     
    9147        <delete file="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/> 
    9248    </target> 
     49 
     50    <target name="copy-server"> 
     51        <copy file="distributions/web/bin/windows/server.exe" tofile="distributions/web/server.exe"/> 
     52    </target> 
    9353     
    9454</project>