Changeset 19958

Show
Ignore:
Timestamp:
06.07.2009 14:50:41 (10 years ago)
Author:
oranfry
Message:

changes to wirk3 for the 3.04 release

Location:
release-kits/wirk3/ant-scripts
Files:
4 modified

Legend:

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

    r19936 r19958  
    99            <target name="prepare"/> 
    1010            <target name="install"/> 
     11            <target name="distclean"/> 
    1112            <target name="dist-tidy"/> 
    1213            <propertyset refid="forward.properties"/> 
  • release-kits/wirk3/ant-scripts/create-components.xml

    r19936 r19958  
    8282        <mkdir dir="components/tmp/imagemagick"/> 
    8383        <copy todir="components/tmp/imagemagick" overwrite="true"> 
    84             <fileset dir="distributions/web/gs2build/bin/windows/"> 
    85                 <include name="imagemagick/**/*"/> 
     84            <fileset dir="distributions/web"> 
     85                <include name="gs2build/bin/windows/imagemagick/**/*"/> 
    8686            </fileset> 
    8787        </copy> 
     
    100100        <mkdir dir="components/tmp/ghostscript"/> 
    101101        <copy todir="components/tmp/ghostscript" overwrite="true"> 
    102             <fileset dir="distributions/web/gs2build/bin/windows/"> 
    103                 <include name="ghostscript/**/*"/> 
     102            <fileset dir="distributions/web"> 
     103                <include name="gs2build/bin/windows/ghostscript/**/*"/> 
    104104            </fileset> 
    105105        </copy> 
     
    116116        <mkdir dir="components/tmp/sourcecode"/> 
    117117        <copy todir="components/tmp/sourcecode" overwrite="true"> 
    118                 <fileset dir="distributions/web"> 
    119                     <include name="src/**/*"/> 
    120                     <include name="gs2build/common-src/**/*"/> 
    121                     <include name="gs2build/build-src/**/*"/> 
    122                     <include name="gs2build/runtime-src/**/*"/> 
    123                 </fileset> 
     118            <fileset dir="distributions/web"> 
     119                <include name="src/**/*"/> 
     120                <include name="gs2build/common-src/**/*"/> 
     121                <include name="gs2build/build-src/**/*"/> 
     122                <include name="gs2build/runtime-src/**/*"/> 
     123            </fileset> 
    124124        </copy> 
    125125 
     
    137137 
    138138        <copy todir="components/tmp/ant" overwrite="true"> 
    139             <fileset dir="distributions/web/packages"> 
    140                 <include name="ant/**/*"/> 
     139            <fileset dir="distributions/web"> 
     140                <include name="packages/ant/**/*"/> 
    141141            </fileset> 
    142142        </copy> 
     
    153153        <mkdir dir="components/tmp/tomcat"/> 
    154154        <copy todir="components/tmp/tomcat" overwrite="true"> 
    155             <fileset dir="distributions/web/packages"> 
    156                 <include name="tomcat/**/*"/> 
     155            <fileset dir="distributions/web"> 
     156                <include name="packages/tomcat/**/*"/> 
    157157            </fileset> 
    158158        </copy> 
  • release-kits/wirk3/ant-scripts/create-installer.xml

    r19935 r19958  
    88    </target> 
    99 
    10     <target name="copy-installer-files" depends="copy-main-installer-files"> <!-- from init --> 
     10    <target name="copy-installer-files" depends="copy-main-installer-files,copy-greenstone3-installer-files"> <!-- from init --> 
    1111 
    1212        <!-- some canned resources for the installer --> 
  • release-kits/wirk3/ant-scripts/wrap.xml

    r19669 r19958  
    1212    <target name="copy-files-for-wrapping"> 
    1313        <echo>Copying wrapper source files</echo> 
    14         <mkdir dir="${basedir}/wrapped-installer/build"/> 
    15         <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/windows/wrapper/wrapper.cpp"/> 
    16         <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/core/search4j/libsearch4j.cpp"/> 
    17         <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/core/search4j/libsearch4j.h"/> 
     14        <mkdir dir="${basedir}/wrapped-installer"/> 
     15        <copy todir="${basedir}/wrapped-installer" file="${wirk3.home}/windows/wrapper/wrapper.cpp"/> 
     16        <copy todir="${basedir}/wrapped-installer" file="${wirk3.home}/core/search4j/libsearch4j.cpp"/> 
     17        <copy todir="${basedir}/wrapped-installer" file="${wirk3.home}/core/search4j/libsearch4j.h"/> 
    1818    </target> 
    1919     
    2020    <target name="tweak-files-for-wrapping"> 
    2121        <echo>Substituting concrete values into source files</echo> 
    22         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    23         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/> 
    24         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${windows-java.extracted}"/> 
    25         <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 
     22        <rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/> 
     23        <rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/> 
     24        <rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@java.extracted@" replacement="${windows-java.extracted}"/> 
     25        <rsr file="${basedir}/wrapped-installer/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/> 
    2626    </target> 
    2727 
     
    3030            <bool> 
    3131                <not> 
    32                     <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES"> 
     32                    <uptodate targetfile="${basedir}/wrapped-installer/wrapper.RES"> 
    3333                        <srcfiles dir="${wirk3.home}/greenstone3/icon" includes="icon.ico"/> 
    3434                        <srcfiles dir="${wirk3.home}/windows/wrapper" includes="${windows-java.installer}"/> 
     
    4444             
    4545            <echo>getting the template resource script</echo> 
    46             <copy todir="${basedir}/wrapped-installer/build" file="${wirk3.home}/windows/wrapper/wrapper.rc" overwrite="true"/> 
     46            <copy todir="${basedir}/wrapped-installer" file="${wirk3.home}/windows/wrapper/wrapper.rc" overwrite="true"/> 
    4747             
    4848            <echo>copying the small resource files into place</echo> 
    49             <copy todir="${basedir}/wrapped-installer/build"> 
     49            <copy todir="${basedir}/wrapped-installer"> 
    5050                <fileset dir="${wirk3.home}/windows/wrapper" includes="*.bmp"/> 
    5151                <fileset dir="${wirk3.home}/greenstone3/wrapper" includes="*.bmp"/> 
     
    5656            <rsplit 
    5757                resource="${basedir}/installer/Greenstone-${version}-win32.jar" 
    58                 outputDir="${basedir}/wrapped-installer/build" 
    59                 resourceScript="${basedir}/wrapped-installer/build/wrapper.rc" 
     58                outputDir="${basedir}/wrapped-installer" 
     59                resourceScript="${basedir}/wrapped-installer/wrapper.rc" 
    6060                resourceName="JAR" 
    6161                resourceType="JAR" 
     
    6666            <rsplit 
    6767                resource="${wirk3.home}/windows/wrapper/${windows-java.installer}" 
    68                 outputDir="${basedir}/wrapped-installer/build"                   
    69                 resourceScript="${basedir}/wrapped-installer/build/wrapper.rc" 
     68                outputDir="${basedir}/wrapped-installer"                     
     69                resourceScript="${basedir}/wrapped-installer/wrapper.rc" 
    7070                resourceName="JAVA" 
    7171                resourceType="EXE" 
     
    7474 
    7575            <echo>resource compiling the generated resource script</echo> 
    76             <exec executable="rc" dir="${basedir}/wrapped-installer/build"> 
     76            <exec executable="rc" dir="${basedir}/wrapped-installer"> 
    7777                <arg line="wrapper.rc"/> 
    7878            </exec> 
     
    8585 
    8686    <target name="compile-wrapper"> 
    87         <exec executable="cl" dir="${basedir}/wrapped-installer/build"> 
     87        <exec executable="cl" dir="${basedir}/wrapped-installer"> 
    8888            <arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/> 
    8989        </exec> 
    90         <exec executable="cl" dir="${basedir}/wrapped-installer/build"> 
     90        <exec executable="cl" dir="${basedir}/wrapped-installer"> 
    9191            <arg line="/c -GX /DWINDOWS=yes /DWEB wrapper.cpp /out:wrapper.obj"/> 
    9292        </exec> 
     
    9494 
    9595    <target name="link-wrapper"> 
    96         <exec executable="link" dir="${basedir}/wrapped-installer/build"> 
    97             <arg line="/OUT:..\..\products\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
     96        <mkdir dir="products"/> 
     97        <exec executable="link" dir="${basedir}/wrapped-installer"> 
     98            <arg line="/OUT:..\products\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
    9899        </exec> 
    99100    </target>