Changeset 18497

Show
Ignore:
Timestamp:
11.02.2009 14:53:14 (11 years ago)
Author:
oranfry
Message:

changing release kits to put all products into a products directory

Location:
release-kits/wirk2/ant-scripts
Files:
2 modified

Legend:

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

    r18066 r18497  
    2626        <unzip src="${basedir}/compiled/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/compiled/common-src/packages/windows/stlport"/> 
    2727        <unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/> 
    28         <untar src="${basedir}/compiled/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/compiled/common-src/packages/sqlite"/> 
     28        <untar src="${basedir}/compiled/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/compiled/common-src/packages/sqlite" compression="gzip"/> 
    2929    </target> 
    3030 
  • release-kits/wirk2/ant-scripts/wrap.xml

    r17951 r18497  
    3232 
    3333    <target name="compile-resources"> 
     34        <!-- 
    3435        <if> 
    3536            <bool> 
     
    4243                        <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.rc"/> 
    4344                        <srcfiles dir="${wirk2.home}/language-strings" includes="*.properties"/> 
    44                         <srcfiles dir="${basedir}/installer" includes="greenstone-${version}-win32.jar"/> 
     45                        <srcfiles dir="${basedir}/installer" includes="Greenstone-${version}-win32.jar"/> 
    4546                    </uptodate> 
    4647                </not> 
    4748            </bool> 
     49        --> 
    4850             
    4951            <echo>Compiling resources</echo> 
     
    6163            <echo>adding greenstone2.jar to the resource script as chunks</echo> 
    6264            <rsplit 
    63                 resource="${basedir}/installer/greenstone-${version}-win32.jar" 
     65                resource="${basedir}/installer/Greenstone-${version}-win32.jar" 
    6466                outputDir="${basedir}/wrapped-installer/build" 
    6567                resourceScript="${basedir}/wrapped-installer/build/wrapper.rc" 
     
    8385            </exec> 
    8486             
     87        <!-- 
    8588            <else> 
    8689                <echo>Resourses are up-to-date, will not compile</echo> 
    8790            </else> 
    8891        </if> 
     92        --> 
    8993    </target> 
    9094 
     
    101105    <target name="link-wrapper"> 
    102106        <exec executable="link" dir="${basedir}/wrapped-installer/build"> 
    103             <arg line="/OUT:..\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
     107            <arg line="/OUT:..\..\products\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/> 
    104108        </exec> 
    105109    </target>