Changeset 21521

Show
Ignore:
Timestamp:
19.01.2010 12:01:16 (9 years ago)
Author:
oranfry
Message:

getting rk2 working properly under windows

Location:
main/trunk/release-kits
Files:
3 added
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r21394 r21521  
    194194 
    195195    <target name="compile-c-code"> 
    196         <copy file="${rk.home}/kits/rk2/resources/compile.bat" todir="${basedir}/compiled" overwrite="true"/> 
    197196        <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="clean"/></exec> 
    198197        <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="APACHE_HTTPD=1"/></exec> 
  • main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml

    r21394 r21521  
    88    --> 
    99 
    10     <target name="create-cdrom-components"> 
     10    <target name="create-cdrom-components" depends="init,gs2-init"> 
    1111        <antcall target="compile-cdrom-installer"/> <!-- from init --> 
    1212        <antcall target="prepare-cdrom-components"/> 
     
    3232        <!-- core linux --> 
    3333        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
    34             <copy todir="cdrom/dist/Software/core/all" overwrite="true"> 
    35                 <fileset dir="components/tmp/core"/> 
    36             </copy> 
     34            <unzip src="components/core.comp" dest="cdrom/dist/Software/core/all" overwrite="true"/> 
    3735            <move todir="cdrom/dist/Software/core/linux" overwrite="true"> 
    3836                <fileset dir="cdrom/dist/Software/core/all"> 
     
    5452        <!-- core windows --> 
    5553        <else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
    56             <copy todir="cdrom/dist/Software/core/windows" overwrite="true"> 
    57                 <fileset dir="components/tmp/core"> 
     54            <unzip src="components/core.comp" dest="cdrom/dist/Software/core/windows" overwrite="true"> 
     55                <patternset> 
    5856                    <include name="bin/windows"/> 
    5957                    <include name="server.exe"/> 
     
    6361                    <include name="*.bat"/> 
    6462                    <include name="gli/*.bat"/> 
    65                 </fileset> 
    66             </copy> 
     63                </patternset> 
     64            </unzip> 
    6765 
    6866        <!-- core mac --> 
    6967        <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 
    70             <copy todir="cdrom/dist/Software/core/mac" overwrite="true"> 
    71                 <fileset dir="components/tmp/core"> 
     68            <unzip src="components/core.comp" dest="cdrom/dist/Software/core/mac" overwrite="true"> 
     69                <patternset> 
    7270                    <include name="bin/darwin"/> 
    7371                    <include name="bin/darwin/**/*"/> 
     
    8179                    <include name="*.csh"/> 
    8280                    <include name="*.bash"/> 
    83                 </fileset> 
    84             </copy> 
     81                </patternset> 
     82            </unzip> 
    8583            <!-- delete the httpd manual to save space --> 
    8684            <delete dir="cdrom/dist/Software/core/mac/apache-httpd/darwin/manual"/> 
     
    9088        <!-- imagemagick --> 
    9189        <mkdir dir="cdrom/dist/Software/imagemagick/${rk.os}"/> 
    92         <copy todir="cdrom/dist/Software/imagemagick/${rk.os}" overwrite="true"> 
    93             <fileset dir="components/tmp/imagemagick"/> 
    94         </copy> 
     90        <unzip src="components/imagemagick.comp" dest="cdrom/dist/Software/imagemagick/${rk.os}" overwrite="true"/> 
    9591 
    9692        <!-- ghostscript: windows and mac only --> 
    9793        <if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool> 
    9894            <mkdir dir="cdrom/dist/Software/ghostscript/${rk.os}"/> 
    99             <copy todir="cdrom/dist/Software/ghostscript/${rk.os}" overwrite="true"> 
    100                 <fileset dir="components/tmp/ghostscript"/> 
    101             </copy> 
     95            <unzip src="components/ghostscript.comp" dest="cdrom/dist/Software/ghostscript/${rk.os}" overwrite="true"/> 
    10296        </if> 
    10397 
     
    133127        <!-- windows --> 
    134128        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
    135             <antcall target="get-copy-of-wrapper-source"><param name="todir" value="cdrom/build"/></antcall> 
     129            <copy todir="cdrom/build" overwrite="true"> 
     130                <fileset dir="${rk.home}/shared/windows/wrapper"/> 
     131                <fileset dir="${rk.home}/shared/greenstone2/wrapper" includes="*.bmp"/> 
     132                <fileset dir="${rk.home}/shared/greenstone2/icon" includes="icon.ico"/> 
     133                <fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/> 
     134            </copy> 
    136135            <exec executable="rc" dir="cdrom/build"> 
    137136                <arg line="wrapper.rc"/> 
  • main/trunk/release-kits/kits/rk2/ant-scripts/create-distribution.xml

    r21394 r21521  
    5959 
    6060    </target> 
     61     
     62    <target name="copy-server"> 
     63        <copy file="distributions/web/bin/windows/server.exe" tofile="distributions/web/server.exe"/> 
     64    </target> 
    6165 
    6266    <target name="export-imagemagick-linux-binaries"> 
  • main/trunk/release-kits/shared/core/ant-scripts/init.xml

    r21388 r21521  
    2424        <property name="basedir.local" refid="basedir.path"/> 
    2525 
     26        <!-- size of resource chunks (wrapper) --> 
     27        <property name="resources.chunksize" value="8388608"/> 
     28         
    2629        <!-- current date and time --> 
    2730        <tstamp> 
     
    232235            installConfig="installer/antinstall-config-cdrom.xml" 
    233236            buildFile="installer/build-cdrom.xml" 
    234             antInstallLib="${rk.home}/core/ant-installer/lib" 
     237            antInstallLib="${rk.home}/shared/core/ant-installer/lib" 
    235238            antLib="${ant.home}/lib" 
    236239            validateConfig="true" 
     
    373376        <mkdir dir="${todir}"/> 
    374377        <delete dir="${todir}/perl"/> 
    375         <unzip src="${rk.home}/windows/perl.zip" dest="${todir}"/> 
     378        <unzip src="${rk.home}/shared/windows/perl.zip" dest="${todir}"/> 
    376379    </target> 
    377380 
     
    497500        <!-- windows --> 
    498501        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> 
    499             <exec executable="${rk.home}/windows/7za/7za.exe" dir="components"><arg line="a -t7z -mx=9 ${component}.lzma ${component}.comp"/></exec> 
     502            <exec executable="${rk.home}/shared/windows/7za/7za.exe" dir="components"><arg line="a -t7z -mx=9 ${component}.lzma ${component}.comp"/></exec> 
    500503         
    501504        <!-- linux, mac -->