[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Wed Nov 22 17:23:55 EST 2006
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv19867/xmls

Modified Files:
	seahawkBuild.xml 
Log Message:
Changes to improve Seahawk Unit Test generality
moby-live/Java/xmls seahawkBuild.xml,1.2,1.3
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml	2006/10/26 01:32:06	1.2
+++ /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml	2006/11/22 22:23:55	1.3
@@ -8,51 +8,61 @@
   <property name="seahawk.auto.classname" value="ca.ucalgary.seahawk.gui.test.SeahawkTestCase"/>
   <!-- What to call the jar file for the standalone SeaHawk app -->
   <property name="seahawk.jarname" value="seahawk"/>
+  <property name="seahawk.manifest" value="${scratch.dir}/SEAHAWK_MANIFEST.MF"/>
   <property name="seahawk_splash.app" value="ca/ucalgary/seahawk/gui/SeahawkSplasher*.class"/>
   <property name="seahawk_splash.image" value="ca/ucalgary/seahawk/resources/images/seahawk_splash.jpg"/>
-<!--
-  <property name="jarmaker.virgin_jvm" location="/export/data/programs/jdk1.5.0_06/bin/java"/>
-<path id="seahawk.build.classpath">
-  <path refid="build.classpath"/>
-  <path refid="samples.build.classpath"/>
-  <fileset dir="${build.lib}">
-    <include name="${dashboard.config.jar}"/>
-  </fileset>
-</path>
 
-  <property name="seahawk.manifest" value="${scratch.dir}/SEAHAWK_MANIFEST.MF"/>
-  <target name="seahawk_manifest"
-	  description="(Internal) Create archive manifest, identifying build and default main class">
-    <echo message="Creating JAR manifest with ${seahawk.class} as main class"
-	  level="info"/>
-    <manifest file="${seahawk.manifest}">
-	<attribute name="Built-By" value="${user.name}"/>
-	<attribute name="Main-Class" value="${seahawk.class}"/>
-	<section name="common">
-	<attribute name="Implementation-Title" value="Seahawk: A Browser for MOBY-S Web Services"/>
-	<attribute name="Implementation-Version" value="${version}"/>
-	<attribute name="Implementation-Vendor"
-                   value="University of Calgary, Sun Center of Excellence for Visual Genomics"/>
-	</section>
-    </manifest>
+  <property name="jarmaker.dir" location="${build.dir}/jarmaker"/>
+  <property name="jarmaker.fullname" value="ca.ucalgary.seahawk.util.MinJarMaker"/>
+  <property name="jarmaker.name" value="MinJarMaker"/>
+  <property name="jarmaker.path" value="ca/ucalgary/seahawk/util"/>
+  <property name="jarmaker.classPathProperty" value="jarmaker.class.path"/>
+  <!-- Because we may be using the automated tests to build the minimal jar
+	(instead of the real main app), we need to explicitly tell the jar
+	maker ("Minnow") that the main class for the application manifest is not the one it is running -->
+  <property name="jarmaker.manifestMainClassProperty" value="minnow.manifest.main.class"/>
+  <!-- The following should be the path to a JRE install with nothing but the
+	default libraries, so that we don't miss classes in the jar making because
+	they're part of our system's custom Java. -->
+  <property name="jarmaker.virgin_jvm" location="/export/data/programs/jdk1.5.0_06/bin/java"/>
+  
+  <path id="seahawk.build.classpath">
+    <path refid="build.classpath"/>
+    <pathelement location="${src.main}"/>
+    <fileset dir="${build.lib}">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+
+  <property name="scp" refid="seahawk.build.classpath"/>
+
+  <target name="make_maker">
+    <echo message="Making sure minimal jar maker is up to date" level="info"/>
+    <mkdir dir="${jarmaker.dir}/${jarmaker.path}"/>
+    <javac srcdir="${src.main}"
+           includes="${jarmaker.path}/${jarmaker.name}.java"
+           destdir="${jarmaker.dir}">
+    </javac>
   </target>
 
-  <target name="seahawk-jar" depends="compile, make_maker" description="(User) Builds the Seahawk MOBY interface as a standalone JAR">
+  <property name="build.clients.absolute" location="${build.clients}"/>
+  <target name="seahawk-jar" depends="compile, make_maker" description="(User) Builds the Seahawk MOBY-S interface as a standalone JAR">
+    <echo message="Building seahawk standalone JAR to ${build.clients.absolute}"/>
+    <echo message="Note that the test cases run will hijack your desktop for a few minutes, please don't try to do anything else!" level="info"/>
     <java dir="${jarmaker.dir}" jvm="${jarmaker.virgin_jvm}" classname="${jarmaker.fullname}" fork="true" maxmemory="64m">
       <classpath>
 	<pathelement path="${jarmaker.dir}"/>
       </classpath>
-	<jvmarg value="-D${jarmaker.classPathProperty}=${build.dir}:${src.dir}"/>
+	<jvmarg value="-D${jarmaker.classPathProperty}=${scp}"/>
 	<jvmarg value="-D${jarmaker.manifestMainClassProperty}=${seahawk.classname}"/>
-	<arg value="${application.dir}/${seahawk.jarname}.jar"/>
+	<arg value="${build.clients.absolute}/${seahawk.jarname}.jar"/>
 	<arg value="${seahawk.auto.classname}"/>
-	<arg value="${url}"/>
     </java>
 
-  </target>-->
+  </target>
 
   <target name="seahawk" depends="compile" description="(User) Run the Seahawk MOBY client interface as a standalone application">
-      <java classname="${seahawk.classname}" classpath="${src.main}" classpathref="build.classpath" fork="true">
+      <java classname="${seahawk.classname}" classpathref="seahawk.build.classpath" fork="true">
 	<jvmarg value="-Dmoby.debug=1"/>
 	<jvmarg value="-Dcom.sun.management.jmxremote=1"/>
     </java>