greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 17268

Show
Ignore:
Timestamp:
2008-09-12 11:29:06 (4 months ago)
Author:
oranfry
Message:

compile search4j in release process and started standardising java installtion

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r17257 r17268  
    1919                <antcall target="strip-execs"/> 
    2020 
     21                <!-- search4j --> 
     22                <antcall target="compile-search4j" /> <!-- from rk2-targets --> 
     23 
    2124                <!-- uninstaller --> 
    22                 <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
     25                <antcall target="compile-uninstaller" /> <!-- from rk2-targets --> 
    2326 
    2427                <!-- build collections --> 

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

    r17257 r17268  
    3838                <delete dir="distributions/web/bin/linux" /> 
    3939                <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec> 
     40                <exec dir="${basedir}" executable="cp"><arg line="gsdl/bin/search4j distributions/web/bin"/></exec> 
    4041                <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec> 
    4142                <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 

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

    r17257 r17268  
    2525                <antcall target="linux-strip-execs" /> 
    2626 
     27                <!-- search4j --> 
     28                <antcall target="compile-search4j" /> <!-- from rk3-targets --> 
     29 
    2730                <!-- uninstaller --> 
    28                 <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
     31                <antcall target="compile-uninstaller" /> <!-- from rk3-targets --> 
    2932 
    3033                <!-- documentation --> 

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

    r17257 r17268  
    6060                <delete dir="distribution/greenstone3/gs2build/bin/linux"/> 
    6161                <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec> 
     62                <exec dir="${basedir}" executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec> 
    6263 
    6364                <delete dir="distribution/greenstone3/gs2build/bin/java"/> 

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

    r17257 r17268  
    1717                <antcall target="strip-execs"/> 
    1818 
     19                <!-- search4j --> 
     20                <antcall target="compile-search4j" /> <!-- from rk2-targets --> 
     21 
    1922                <!-- uninstaller --> 
    20                 <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
     23                <antcall target="compile-uninstaller" /> <!-- from rk2-targets --> 
    2124 
    2225                <!-- build collections --> 

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

    r17257 r17268  
    4545                <delete dir="distributions/web/bin/darwin" /> 
    4646                <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/darwin distributions/web/bin"/></exec> 
     47                <exec dir="${basedir}" executable="cp"><arg line="gsdl/bin/search4j distributions/web/bin"/></exec> 
    4748                <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec> 
    4849                <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec> 

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

    r17257 r17268  
    2222                <ant target="build-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/> 
    2323                <antcall target="linux-strip-execs" /> 
     24 
     25                <!-- search4j --> 
    2426                <antcall target="compile-search4j" /> <!-- from rk3-targets --> 
    2527 
    2628                <!-- uninstaller --> 
    27                 <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
     29                <antcall target="compile-uninstaller" /> <!-- from rk3-targets --> 
    2830 
    2931                <!-- documentation --> 

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

    r17257 r17268  
    6060                <delete dir="distribution/greenstone3/gs2build/bin/darwin"/> 
    6161                <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/darwin distribution/greenstone3/gs2build/bin"/></exec> 
     62                <exec dir="${basedir}" executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec> 
    6263 
    6364                <delete dir="distribution/greenstone3/gs2build/bin/java"/> 

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

    r17257 r17268  
    99                <antcall target="insert-perl" /> 
    1010                <antcall target="compile-c-code" /> 
    11                 <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
     11                <antcall target="compile-uninstaller" /> <!-- from rk2-targets --> 
    1212                <antcall target="build-demo-collection" /> 
    1313        </target> 

  • release-kits/wirk2/ant-scripts/wrap.xml

    r16774 r17268  
    1919                <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp" overwrite="true"/> 
    2020                <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h" overwrite="true"/> 
     21 
    2122        </target> 
    2223         
    2324        <target name="tweak-files-for-wrapping"> 
    24                 <!-- substitute the real java installer filename and min version into various files --> 
    2525                <echo>Substitute concrete values of things into source files</echo> 
    2626                <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/> 

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

    r17257 r17268  
    1515                        <property name="branch.revision" value="${branch.revision}"/> 
    1616                </ant> 
    17                 <antcall target="compile-uninstaller" /> <!-- from global-targets --> 
     17                <antcall target="compile-uninstaller" /> <!-- from rk3-targets --> 
    1818                <antcall target="prepare-documentation" /> 
    1919        </target> 

  • release-kits/wirk3/ant-scripts/create-installer.xml

    r17255 r17268  
    99 
    1010        <target name="copy-installer-files"> 
     11 
    1112                <echo>Getting things ready to compile the installer</echo> 
    1213                <mkdir dir="${basedir}/installer/resources"/> 
     14 
     15                <!-- the installer descriptors --> 
    1316                <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml" overwrite="true" /> 
    1417                <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml" overwrite="true" /> 
     18 
     19                <!-- the language files and other canned classes for the installer --> 
    1520                <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1621                        <fileset dir="${wirk3.home}/windows/installer-classes"/> 
    1722                        <fileset dir="${wirk3.home}/greenstone3/installer-classes"/> 
    1823                </copy> 
     24 
     25                <!-- some classes from jars, unpacked to be repacked into installer --> 
    1926                <unjar src="${wirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/> 
    2027                <delete dir="${basedir}/installer/classes/META-INF"/> 
     28 
    2129        </target> 
    2230 

  • release-kits/wirk3/ant-scripts/wrap.xml

    r17124 r17268  
    1212 
    1313        <target name="copy-files-for-wrapping"> 
    14                 <!--create a directory to build the wrapped installer in --> 
     14                <echo>Copying wrapper source files</echo> 
    1515                <mkdir dir="${basedir}/wrapped-installer/build"/> 
    16                 <!-- copy source files --> 
    1716                <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/windows/wrapper/wrapper.cpp"/> 
    1817                <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/packages/search4j/libsearch4j.cpp"/> 
    …… 
    2120         
    2221        <target name="tweak-files-for-wrapping"> 
    23                 <!-- substitute the real java installer filename and min version into various files --> 
    24                 <echo>Substitute concrete values of things into source files</echo> 
     22                <echo>Substituting concrete values into source files</echo> 
    2523                <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    2624                <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/> 
     25                <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${windows-java.extracted}"/> 
    2726                <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 
    2827        </target>