Changeset 20084

Show
Ignore:
Timestamp:
27.07.2009 10:56:38 (10 years ago)
Author:
oranfry
Message:

changes after upgrade to tomcat6 and made corrected support for the server.exe.location property

Location:
release-kits
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/greenstone3/installer/build.xml

    r20060 r20084  
    8585        <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/> 
    8686        <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/> 
     87        <chmod file="${installDir}/packages/ant/bin/ant" perm="775"/> 
    8788        <!-- 
    8889        source is not included for now 
     
    163164 
    164165        <echo>Changing tomcat ports tomcat's server.xml</echo> 
    165         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/> 
     166        <copy file="${installDir}/resources/tomcat/server_tomcat6.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/> 
    166167        <rsr file="${installDir}/packages/tomcat/conf/server.xml"> 
    167168            <job pattern="@port@" replacement="${tomcat.port}"/> 
  • release-kits/sork2/ant-scripts/build.xml

    r19901 r20084  
    5656            <export srcurl="${svn.root}/other-projects/trunk/winbin/bin" destPath="distributions/Greenstone-${version}-source-distribution/bin/windows"/> 
    5757        </svn> 
    58         <get src="http://greenstone.org/release-snapshots/server.exe" dest="distributions/Greenstone-${version}-source-distribution/bin/windows/server.exe"/> 
     58        <get src="${server.exe.location}" dest="distributions/Greenstone-${version}-source-distribution/bin/windows/server.exe"/> 
    5959         
    6060        <delete dir="distributions/Greenstone-${version}-source-distribution/bin/windows/imagemagick"/>