Changeset 19586 for release-kits


Ignore:
Timestamp:
05/25/09 14:34:16 (12 years ago)
Author:
oranfry
Message:

grouped code for creating cdrom components

Location:
release-kits/wirk2/ant-scripts
Files:
1 added
4 edited

Legend:

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

    r19324 r19586  
    3333    <import file="create-installer.xml"/>
    3434    <import file="wrap.xml"/>
     35    <import file="create-cdrom-components.xml"/>
    3536
    3637    <!-- THE MAIN TARGET -->
     
    4142        <antcall target="create-installer"/>
    4243        <antcall target="wrap"/>
     44        <antcall target="create-cdrom-components"/>
    4345    </target>
    4446
  • release-kits/wirk2/ant-scripts/create-components.xml

    r19537 r19586  
    88        <antcall target="prepare-components"/>
    99        <antcall target="compress-components"/>
    10         <antcall target="produce-cd-components"/>
    1110    </target>
    1211   
     
    8685        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 ghostscript.lzma ghostscript.comp"/></exec>
    8786    </target>
    88 
    89     <!--
    90         cd components
    91         produce components for cdrom distributions, to be picked up and used by cdrk2 release kit
    92         pull out windows only files
    93     -->
    94     <target name="produce-cd-components">
    95         <delete dir="components/tmp/cdrom"/>
    96         <mkdir dir="components/tmp/cdrom"/>
    97 
    98         <!-- core -->
    99         <mkdir dir="components/tmp/cdrom/core/windows"/>
    100         <copy todir="components/tmp/cdrom/core/windows" overwrite="true">
    101             <fileset dir="components/tmp/core">
    102                 <include name="bin/windows"/>
    103                 <include name="bin/windows/**/*"/>
    104                 <include name="*.bat"/>
    105             </fileset>
    106         </copy>
    107 
    108         <!-- imagemagick -->
    109         <mkdir dir="components/tmp/cdrom/imagemagick/windows"/>
    110         <copy todir="components/tmp/cdrom/imagemagick/windows" overwrite="true">
    111             <fileset dir="components/tmp/imagemagick"/>
    112         </copy>
    113 
    114         <!-- ghostscript -->
    115         <mkdir dir="components/tmp/cdrom/ghostscript/windows"/>
    116         <copy todir="components/tmp/cdrom/ghostscript/windows" overwrite="true">
    117             <fileset dir="components/tmp/ghostscript"/>
    118         </copy>
    119 
    120     </target>
    121        
     87           
    12288</project>
  • release-kits/wirk2/ant-scripts/create-installer.xml

    r19510 r19586  
    66        <antcall target="make-installer-files-concrete"><param name="java.os" value="windows"/></antcall> <!-- from init -->
    77        <antcall target="compile-binary-installer"/> <!-- from init -->
    8         <antcall target="compile-cdrom-installer"/> <!-- from init -->
    98    </target>
    109
  • release-kits/wirk2/ant-scripts/wrap.xml

    r19539 r19586  
    1212    <target name="copy-files-for-wrapping">
    1313        <!--create a directory to build the wrapped installer in -->
    14         <mkdir dir="${basedir}/wrapped-installer/build"/>
     14        <mkdir dir="${basedir}/wrapped-installer"/>
    1515       
    1616        <!-- copy source files -->
    17         <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"  overwrite="true"/>
    18         <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/core/search4j/libsearch4j.cpp" overwrite="true"/>
    19         <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/core/search4j/libsearch4j.h" overwrite="true"/>
     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"/>
    2020
    2121    </target>
     
    2323    <target name="tweak-files-for-wrapping">
    2424        <echo>Substitute concrete values of things into source files</echo>
    25         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp">
     25        <rsr file="${basedir}/wrapped-installer/wrapper.cpp">
    2626            <job pattern="@java.installer@" replacement="${windows-java.installer}"/>
    2727            <job pattern="@java.min.version@" replacement="${java.min.version}"/>
     
    3636           
    3737            <echo>getting the template resource script</echo>
    38             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
     38            <copy todir="${basedir}/wrapped-installer" file="${wirk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
    3939           
    4040            <echo>copying the small resource files into place</echo>
    41             <copy todir="${basedir}/wrapped-installer/build" overwrite="true">
     41            <copy todir="${basedir}/wrapped-installer" overwrite="true">
    4242                <fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
    4343                <fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
     
    4545            </copy>
    4646           
     47            <echo>adding ${windows-java.installer} to the copy as chunks</echo>
     48            <rsplit
     49                resource="${wirk2.home}/windows/wrapper/${windows-java.installer}"
     50                outputDir="${basedir}/wrapped-installer"                   
     51                resourceScript="${basedir}/wrapped-installer/wrapper.rc"
     52                resourceName="JAVA"
     53                resourceType="EXE"
     54                chunkSize="${resources.chunksize}"/>
     55               
    4756            <echo>adding greenstone2.jar to the resource script as chunks</echo>
    4857            <rsplit
    4958                resource="${basedir}/installer/Greenstone-${version}-win32.jar"
    50                 outputDir="${basedir}/wrapped-installer/build"
    51                 resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
     59                outputDir="${basedir}/wrapped-installer"
     60                resourceScript="${basedir}/wrapped-installer/wrapper.rc"
    5261                resourceName="JAR"
    5362                resourceType="JAR"
    5463                chunkSize="${resources.chunksize}"
    5564                />
    56            
    57             <echo>adding ${windows-java.installer} to the copy as chunks</echo>
    58             <rsplit
    59                 resource="${wirk2.home}/windows/wrapper/${windows-java.installer}"
    60                 outputDir="${basedir}/wrapped-installer/build"                 
    61                 resourceScript="${basedir}/wrapped-installer/build/wrapper.rc"
    62                 resourceName="JAVA"
    63                 resourceType="EXE"
    64                 chunkSize="${resources.chunksize}"/>
    65            
    66             <echo>resource compiling the generated resource script</echo>
    67             <exec executable="rc" dir="${basedir}/wrapped-installer/build">
     65               
     66            <echo>resource compiling the resource script</echo>
     67            <exec executable="rc" dir="${basedir}/wrapped-installer">
    6868                <arg line="wrapper.rc"/>
    6969            </exec>
     
    7272
    7373    <target name="compile-wrapper">
    74         <exec executable="cl" dir="${basedir}/wrapped-installer/build">
     74        <exec executable="cl" dir="${basedir}/wrapped-installer">
    7575            <arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/>
    7676        </exec>
    7777
    78         <exec executable="cl" dir="${basedir}/wrapped-installer/build">
     78        <exec executable="cl" dir="${basedir}/wrapped-installer">
    7979            <arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/>
    8080        </exec>
     
    8282   
    8383    <target name="link-wrapper">
    84         <exec executable="link" dir="${basedir}/wrapped-installer/build">
    85             <arg line="/OUT:..\..\products\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
     84        <mkdir dir="products"/>
     85        <exec executable="link" dir="${basedir}/wrapped-installer">
     86            <arg line="/OUT:..\products\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
    8687        </exec>
    8788    </target>
    8889
    89     <target name="archive-cdrom-components-and-installer">
    90         <mkdir dir="products"/>
    91         <tar destfile="products/cdrom-components-${version}-linux.tar.gz" compression="gzip">
    92             <tarfileset dir="components/tmp"><include name="cdrom/**/*"/></tarfileset>
    93             <tarfileset dir="wrapped-installer"><include name="cdrom-windows.exe"/></tarfileset>
    94         </tar>
    95     </target>
    96 
    9790</project>
Note: See TracChangeset for help on using the changeset viewer.