Changeset 16774

Show
Ignore:
Timestamp:
14.08.2008 09:04:15 (11 years ago)
Author:
oranfry
Message:

fixes to wirk2

Location:
release-kits/wirk2
Files:
5 modified

Legend:

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

    r16745 r16774  
    5353 
    5454    <target name="copy-server-to-root"> 
    55         <copy todir="${basedir}/distributions/web" overwrite="true"> 
    56             <fileset dir="${basedir}/bin/windows/server.exe"/> 
    57         </copy> 
    58  
     55        <copy 
     56            todir="${basedir}/distributions/web" 
     57            file="${basedir}/distributions/web/bin/windows/server.exe" 
     58            overwrite="true"/> 
    5959    </target> 
    6060     
  • release-kits/wirk2/ant-scripts/wrap.xml

    r16745 r16774  
    3434                <not> 
    3535                    <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES"> 
    36                         <srcfiles dir="${wirk2.home}/greenstone2/icon" includes="gs2.ico"/> 
     36                        <srcfiles dir="${wirk2.home}/greenstone2/icon" includes="icon.ico"/> 
    3737                        <srcfiles dir="${wirk2.home}/windows/wrapper" includes="${windows-java.installer}"/> 
    3838                        <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/> 
    3939                        <srcfiles dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/> 
    4040                        <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.rc"/> 
    41                         <srcfiles dir="${basedir}/installer" includes="greenstone2.jar"/> 
     41                        <srcfiles dir="${basedir}/installer" includes="greenstone-${version}-win32.jar"/> 
    4242                    </uptodate> 
    4343                </not> 
  • release-kits/wirk2/installer/build.xml

    r16747 r16774  
    6666         
    6767        <!-- delete unneeded files -->       
    68         <echo message="Deleting some extraneous files"/> 
     68        <echo message="Deleting some unneeded files"/> 
    6969        <delete dir="${installDir}/resources/icons"/> 
    7070        <delete file="${installDir}/resources/*.png"/> 
    71          
     71 
     72        <echo message="Setting GSDLHOME in setup.bat"/> 
     73        <rsr 
     74            file="${installDir}/setup.bat" 
     75            pattern="\*\*GSDLHOME\*\*" 
     76            replacement="${installDir}"/> 
     77                     
    7278        <echo message="Finished"/> 
    7379         
     
    94100        <shortcut 
    95101            file="${win32.personal.programs_menu}\Greenstone-@version@\Greenstone2 Server.lnk" 
    96             execute="${installDir}\bin\windows\server.exe" 
     102            execute="${installDir}\server.exe" 
    97103            workingDirectory="${installDir}" 
    98104            iconFile="${installDir}\images\icon.ico" 
  • release-kits/wirk2/src/wirk2.cpp

    r16746 r16774  
    4545     
    4646    //create the command 
    47     command = WIRK2_HOME + "\\packages\\ant\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -Dwirk2.home=" + WIRK2_HOME; 
     47    command = WIRK2_HOME + "\\packages\\ant\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -addressing -Dwirk2.home=" + WIRK2_HOME; 
    4848    //pass on the arguments 
    4949    string a;