Changeset 20089

Timestamp:

2009-07-27T16:00:54+12:00 (14 years ago)

Author:

kjdon

Message:

several changes. added fix-executable-permissions targets. configure-java-version is now called from prepare-tomcat not at startup. Don't need to copy xercesImpl.jar or xml-apis.jar into tomcats lib folder.

File:

• greenstone3/trunk/build.xml (modified) (8 diffs)

greenstone3/trunk/build.xml

@@ -498 +498 @@
   <!-- ========== Web app Targets ================================ -->
   
-  <target name="prepare-web" depends="init,configure-java-version">
+  <target name="prepare-web" depends="init">
     <mkdir dir="${web.home}/applet"/>
     <mkdir dir="${web.home}/logs"/>
@@ -556 +556 @@
     <echo>deactivating xalan.jar</echo>
     <delete file="${web.lib}/xalan.jar"/>
+    <!-- should we be deleting common/endorsed/xalan.jar on mac?? -->
   </target>
 
@@ -648 +649 @@
   
   <!-- this target downloads and installs Tomcat -->
-  <!-- we download tomcat and the compat module - its needed for 1.4, and doesn't seem to harm 1.5 -->
-  <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal">
+  <!-- we download tomcat (version 6 for Java 1.5 and later, version 5 for Java 1.4 plus the 1.4 compatibility package). -->
+  <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal"
+    description="downloads the appropriate version of Tomcat (Tomcat 5 if using Java 1.4, Tomcat 6 if using Java 1.5 or higher). If you want to change which version of Java you are using between 1.4 and 1.5/6 then you need to run prepare-tomcat">
     <if>
       <bool>
@@ -694 +696 @@
       </echo>
 
+      <!-- this is not strictly a prepare tomcat thing, but if one changes
+      Java, then they need to change tomcat as well, so might as well call 
+      it here -->
+      <antcall target="configure-java-version"/>
       <else>
         <echo>Tomcat has been prepared, will not prepare</echo>
@@ -727 +733 @@
   </target>
   
-  <target name="start-tomcat" description="Startup only Tomcat" depends="init,configure-java-version" if="tomcat.islocal">
+  <target name="start-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal">
     <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
     <property name="tomcat.path" refid="local.tomcat.path"/>
@@ -1009 +1015 @@
   <target name="compile-core" depends="init" 
     description="Compile only the Greenstone core">
-    <if>
-      <!-- Rather than test for tomcat 6, testing here for NOT tomcat 5 
-      (so that it may hopefully still serve when it becomes tomcat 7) -->
-      <bool><not><equals arg1="5" arg2="${tomcat.version.major}"/></not></bool>
-      <copy file="${web.lib}/xercesImpl.jar" todir="${catalina.home}/lib"/>
-      <copy file="${web.lib}/xml-apis.jar" todir="${catalina.home}/lib"/>
-    </if>
     <mkdir dir="${build.home}"/>
     <javac srcdir="${src.home}"
@@ -1682 +1681 @@
   </target>
 
+<!-- ========== Some distribution targets ======================== -->
   <target name="remove-source">
     <delete includeEmptyDirs="true">
@@ -1727 +1727 @@
   </target>
 
+  <!-- fix up executable permissions for binary release -->
+  <target name="fix-execute-permissions">
+    <echo>Setting binaries to executable</echo>
+    <chmod dir="." includes="*.sh" perm="775"/>
+    <chmod dir="bin/script" includes="*" perm="775"/>
+    <chmod dir="bin" includes="*" perm="775"/>
+    <!-- if linux -->
+    <chmod dir="gs2build/bin/linux" includes="*" perm="775"/>
+    <!-- /if -->
+    <!-- if mac -->
+    <chmod dir="gs2build/bin/darwin" includes="*" perm="775"/>
+    <!-- /if -->
+    <chmod dir="gs2build/bin/script" includes="**/*" perm="775"/>
+    <chmod dir="gli" includes="*.sh" perm="775"/>
+    <chmod file="packages/ant/bin/ant" perm="775"/>
+  </target>
+  
+  <!-- fix up executable permissions for source code release -->
+  <target name="fix-execute-permissions-source">
+    <chmod dir="gs2build" includes="**/configure" perm="775"/>
+    <chmod dir="gs2build/common-src/packages/gdbm/gdbm-1.8.3" includes="mkinstalldirs" perm="775"/>
+    <chmod file="src/packages/javagdbm/configure" perm="775"/>
+    <chmod file="src/packages/search4j/configure" perm="775"/>
+    
+  </target>
+
+
   <!-- ============= tweaks for making compilation static ========== -->  
   <target name="tweak-makefiles" depends="init" if="compile.static">