Changeset 17338

Show
Ignore:
Timestamp:
19.09.2008 09:26:37 (11 years ago)
Author:
oranfry
Message:

making the java installation the same for win as it is on linux

Files:
1 modified

Legend:

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

    r17268 r17338  
    77        <antcall target="compile-resources"/> 
    88        <antcall target="compile-wrapper"/> 
    9         <antcall target="link-wrapper-no-java"/> 
    10         <antcall target="link-wrapper-with-java"/> 
     9        <antcall target="link-wrapper"/> 
    1110    </target> 
    1211 
     
    3736                        <srcfiles dir="${wirk3.home}/windows/wrapper" includes="*.rc"/> 
    3837                        <srcfiles dir="${wirk3.home}/greenstone3/wrapper" includes="*.bmp"/> 
    39                         <srcfiles dir="${basedir}/installer" includes="greenstone3.jar"/> 
     38                        <srcfiles dir="${basedir}/installer" includes="Greenstone-${version}-win32.jar"/> 
    4039                    </uptodate> 
    4140                </not> 
     
    5655            <echo>adding greenstone3.jar to the resource script as chunks</echo> 
    5756            <rsplit 
    58                 resource="${basedir}/installer/greenstone-${version}-win32.jar" 
     57                resource="${basedir}/installer/Greenstone-${version}-win32.jar" 
    5958                outputDir="${basedir}/wrapped-installer/build" 
    6059                resourceScript="${basedir}/wrapped-installer/build/wrapper.rc" 
     
    6362                chunkSize="${resources.chunksize}" 
    6463                /> 
    65          
    66             <echo>resource compiling the resource script</echo> 
    67             <exec executable="rc" dir="${basedir}/wrapped-installer/build"> 
    68                 <arg line="wrapper.rc"/> 
    69             </exec> 
    70              
    71             <echo>making a copy of the resource script</echo> 
    72             <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"/> 
    7364             
    7465            <echo>adding ${windows-java.installer} to the copy as chunks</echo> 
     
    7667                resource="${wirk3.home}/windows/wrapper/${windows-java.installer}" 
    7768                outputDir="${basedir}/wrapped-installer/build"                   
    78                 resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc" 
     69                resourceScript="${basedir}/wrapped-installer/build/wrapper.rc" 
    7970                resourceName="JAVA" 
    8071                resourceType="EXE" 
     
    8273                /> 
    8374 
    84             <echo>resource compiling the generated resource script again</echo> 
     75            <echo>resource compiling the generated resource script</echo> 
    8576            <exec executable="rc" dir="${basedir}/wrapped-installer/build"> 
    86                 <arg line="wrapper-with-jre.rc"/> 
     77                <arg line="wrapper.rc"/> 
    8778            </exec> 
    8879             
     
    9788            <arg line="/c -GX /DWINDOWS=yes libsearch4j.cpp /out:libsearch4j.obj"/> 
    9889        </exec> 
    99  
    10090        <exec executable="cl" dir="${basedir}/wrapped-installer/build"> 
    10191            <arg line="/c -GX /DWINDOWS=yes wrapper.cpp /out:wrapper.obj"/> 
    10292        </exec> 
    10393    </target> 
    104      
    105     <target name="link-wrapper-no-java"> 
     94 
     95    <target name="link-wrapper"> 
    10696        <exec executable="link" dir="${basedir}/wrapped-installer/build"> 
    107             <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
    108         </exec> 
    109     </target> 
    110  
    111     <target name="link-wrapper-with-java"> 
    112         <exec executable="link" dir="${basedir}/wrapped-installer/build"> 
    113             <arg line="/OUT:..\greenstone-${version}-win32-with-java.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper-with-jre.res"/> 
     97            <arg line="/OUT:..\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
    11498        </exec> 
    11599    </target>