Changeset 20084

Timestamp:

2009-07-27T10:56:38+12:00 (15 years ago)

Author:

oranfry

Message:

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

Location:

release-kits

Files:

• shared/greenstone3/installer/build.xml (modified) (2 diffs)
• sork2/ant-scripts/build.xml (modified) (1 diff)

release-kits/shared/greenstone3/installer/build.xml

@@ -85 +85 @@
         <chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/>
         <chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
+        <chmod file="${installDir}/packages/ant/bin/ant" perm="775"/>
         <!--
         source is not included for now
@@ -163 +164 @@
 
         <echo>Changing tomcat ports tomcat's server.xml</echo>
-        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
+        <copy file="${installDir}/resources/tomcat/server_tomcat6.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
         <rsr file="${installDir}/packages/tomcat/conf/server.xml">
             <job pattern="@port@" replacement="${tomcat.port}"/>

release-kits/sork2/ant-scripts/build.xml

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