Changeset 21318 for main/trunk

Timestamp:

2009-12-09T15:53:34+13:00 (14 years ago)

Author:

oranfry

Message:

bug fixes

Location:

main/trunk/release-kits/rk2/ant-scripts

Files:

• compile.xml (modified) (2 diffs)
• components.xml (modified) (1 diff)

main/trunk/release-kits/rk2/ant-scripts/compile.xml

@@ -85 +85 @@
     <target name="run-configure">
         <!-- linux -->
-        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
             <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true">
                 <arg line="--enable-apache-httpd"/>
@@ -92 +92 @@
 
         <!-- mac -->
-        <else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+        <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
             <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure">
                 <arg value="--enable-apache-httpd"/>

main/trunk/release-kits/rk2/ant-scripts/components.xml

@@ -42 +42 @@
             <patternset refid="greenstone2.imagemagick.component"/>
             <patternset refid="greenstone2.ghostscript.component"/>
-            <patternset refid="greenstone2.tomcat.component"/>
         </invert>
         </patternset>