Changeset 19847

Show
Ignore:
Timestamp:
15.06.2009 17:00:37 (11 years ago)
Author:
oranfry
Message:

changes that went in for the 2.82cd release

Location:
release-kits/wirk2
Files:
6 modified

Legend:

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

    r18929 r19847  
    2626    </target> 
    2727 
    28     <target name="checkout-gsdl-gli"> 
    29         <svn> 
    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> 
    33     </target> 
    34  
    3528    <target name="unzip-packages"> 
    3629        <unzip src="${basedir}/compiled/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/compiled/common-src/packages/windows/crypt"/> 
     
    5144        <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/compiled" overwrite="true"/> 
    5245        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/compile.bat" /> 
     46        <mkdir dir="products"/> 
     47        <copy file="${basedir}/compiled/server.exe" tofile="${basedir}/products/server-${version}.exe"/> 
    5348        <move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/> 
    5449    </target> 
  • release-kits/wirk2/ant-scripts/create-cdrom-components.xml

    r19768 r19847  
    2424        <!-- core --> 
    2525        <mkdir dir="cdrom/dist/Software/core/windows"/> 
    26         <copy todir="cdromdist/Software/core/windows" overwrite="true"> 
     26        <copy todir="cdrom/dist/Software/core/windows" overwrite="true"> 
    2727            <fileset dir="components/tmp/core"> 
    2828                <include name="bin/windows"/> 
     29                <include name="server.exe"/> 
    2930                <include name="bin/windows/**/*"/> 
    3031                <include name="cgi-bin/library.cgi"/> 
    3132                <include name="cgi-bin/oaiserver.cgi"/> 
    3233                <include name="*.bat"/> 
     34                <include name="gli/*.bat"/> 
    3335            </fileset> 
    3436        </copy> 
     
    5557 
    5658    <target name="compile-cdrom-wrapper"> 
    57         <copy file="${wirk2.home}/greenstone2/icon/icon.ico" todir="cdrom/build"/> 
    58         <echo file="cdrom/build/wrapper.rc">MAINICON ICON "icon.ico"</echo> 
     59        <antcall target="get-copy-of-wrapper-source"><param name="todir" value="cdrom/build"/></antcall> 
    5960        <exec executable="rc" dir="cdrom/build"> 
    6061            <arg line="wrapper.rc"/> 
    6162        </exec> 
     63 
    6264        <exec executable="cl" dir="cdrom/build"> 
    63             <arg line="/c -GX -DCDROM ${rk.home}/windows/wrapper/wrapper.cpp /out:wrapper.obj"/> 
     65            <arg line="/c -GX -DCDROM wrapper.cpp"/> 
    6466        </exec> 
    6567        <exec executable="link" dir="cdrom/build"> 
  • release-kits/wirk2/ant-scripts/create-components.xml

    r19586 r19847  
    4949    <target name="compress-core-component"> 
    5050        <!-- <sevenzip task="encode" input="${basedir}/components/core.comp" output="${basedir}/components/core.lzma" dictionnary="26"/> --> 
    51         <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 core.lzma core.comp"/></exec> 
     51        <exec executable="${wirk2.home}/windows/7za/7za.exe" dir="components"><arg line="a -t7z -mx=9 core.lzma core.comp"/></exec> 
    5252    </target> 
    5353     
     
    6666    <target name="compress-imagemagick-component"> 
    6767        <!-- <sevenzip task="encode" input="${basedir}/components/imagemagick.comp" output="${basedir}/components/imagemagick.lzma" dictionnary="26"/> --> 
    68         <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 imagemagick.lzma imagemagick.comp"/></exec> 
     68        <exec executable="${wirk2.home}/windows/7za/7za.exe" dir="components"><arg line="a -t7z -mx=9 imagemagick.lzma imagemagick.comp"/></exec> 
    6969    </target> 
    7070     
     
    8383    <target name="compress-ghostscript-component"> 
    8484        <!-- <sevenzip task="encode" input="${basedir}/components/ghostscript.comp" output="${basedir}/components/ghostscript.lzma" dictionnary="26"/> --> 
    85         <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 ghostscript.lzma ghostscript.comp"/></exec> 
     85        <exec executable="${wirk2.home}/windows/7za/7za.exe" dir="components"><arg line="a -t7z -mx=9 ghostscript.lzma ghostscript.comp"/></exec> 
    8686    </target> 
    8787             
  • release-kits/wirk2/ant-scripts/wrap.xml

    r19586 r19847  
    1313        <!--create a directory to build the wrapped installer in --> 
    1414        <mkdir dir="${basedir}/wrapped-installer"/> 
    15          
    16         <!-- copy source files --> 
    17         <copy todir="${basedir}/wrapped-installer" file="${wirk2.home}/windows/wrapper/wrapper.cpp"  overwrite="true"/> 
    18         <copy todir="${basedir}/wrapped-installer" file="${wirk2.home}/core/search4j/libsearch4j.cpp" overwrite="true"/> 
    19         <copy todir="${basedir}/wrapped-installer" file="${wirk2.home}/core/search4j/libsearch4j.h" overwrite="true"/> 
     15 
     16        <!-- copy wrapper source into place --> 
     17        <antcall target="get-copy-of-wrapper-source"><param name="todir" value="wrapped-installer"/></antcall> 
     18 
    2019 
    2120    </target> 
     
    3938             
    4039            <echo>copying the small resource files into place</echo> 
    41             <copy todir="${basedir}/wrapped-installer" overwrite="true"> 
    42                 <fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/> 
    43                 <fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/> 
    44                 <fileset dir="${wirk2.home}/greenstone2/icon" includes="icon.ico"/> 
    45             </copy> 
    4640             
    4741            <echo>adding ${windows-java.installer} to the copy as chunks</echo> 
  • release-kits/wirk2/installer/antinstall-config.xml

    r19790 r19847  
    2828    <!-- start binary release --> 
    2929    <page type="input" name="intro" displayText=""> 
    30         <comment name="welcome-message"/> 
     30        <comment name="welcome"/> 
    3131    </page> 
    3232    <!-- end binary release --> 
  • release-kits/wirk2/installer/build.xml

    r19790 r19847  
    4848        <!-- create the installation directory --> 
    4949        <echo message="Creating Installation directory"/> 
    50         <mkdir dir="${installDir}"/> 
     50        <mkdir dir="${installDir}/packages"/> 
    5151         
    5252        <!-- extract 7za tool --> 
     
    6464        <unzip src="${basedir}/core.comp" dest="${installDir}"/> 
    6565        <delete file="core.comp"/> 
     66        <copy todir="${installDir}/packages/jre" failonerror="false"> 
     67            <fileset dir="../@windows-java.extracted@"/> 
     68        </copy> 
    6669        <!-- end web --> 
    6770 
     
    7174            <fileset dir="${orig.dir}/Software/core/windows"/> 
    7275        </copy> 
     76        <copy todir="${installDir}/packages/jre" failonerror="false"> 
     77            <fileset dir="${orig.dir}/Java/Windows/jre"/> 
     78        </copy> 
    7379        <!-- end cdrom --> 
    74  
    75         <!-- jre --> 
    76         <mkdir dir="${installDir}/packages"/> 
    77         <copy todir="${installDir}/packages/jre" failonerror="false"> 
    78             <fileset dir="../@windows-java.extracted@"/> 
    79         </copy> 
    8080         
    8181        <echo>Correcting perl shebangs in perl scripts</echo>