[Obo-svn-commit] SF.net SVN: obo: [359] phenote/trunk

[<mg...@us...>]

Revision: 359
          http://svn.sourceforge.net/obo/?rev=359&view=rev
Author:   mgibson
Date:     2007-02-06 11:15:49 -0800 (Tue, 06 Feb 2007)

Log Message:
-----------
-> 1.1, new build option copy-version-jnlps

Modified Paths:
--------------
    phenote/trunk/build.xml
    phenote/trunk/doc/phenote-website/phenote-zfin.jnlp
    phenote/trunk/src/java/phenote/main/PhenoteVersion.java

Modified: phenote/trunk/build.xml
===================================================================
--- phenote/trunk/build.xml	2007-02-01 23:46:01 UTC (rev 358)
+++ phenote/trunk/build.xml	2007-02-06 19:15:49 UTC (rev 359)
@@ -386,7 +386,7 @@
 <!-- todo do all jars not just phenote - take out -signed -->
 <!-- depends on sym link phenote-webstart and env var PHENOTE_VERSION -->
     <!-- target name="build-webstart" depends="build-sign-jars,webstart"/ -->
-    <target name="build-webstart" depends="build-all,jar"/>
+    <target name="build-webstart" depends="build-all,jar,webstart"/>
 
     <!-- target name="build-sign-jars" depends="build-all,jar,sign-jars"/ -->
 
@@ -414,17 +414,19 @@
     </target>
     
 
-    <target name="copy-jnlps">
-      <echo message="Env Var PHENOTE VERSION is set to ${env.PHENOTE_VERSION}" />
-      <copy todir="phenote-webstart/${env.PHENOTE_VERSION}">
-        <fileset file="doc/phenote-website/*.jnlp"/>
-      </copy>
+    <target name="copy-jnlps" depends="copy-version-jnlps">
       <copy todir="phenote-webstart/latest">
         <fileset file="doc/phenote-website/*.jnlp"/>
       </copy>
     </target>
-    
 
+    <target name="copy-version-jnlps">
+      <echo message="Env Var PHENOTE VERSION is set to ${env.PHENOTE_VERSION}" />
+      <copy todir="phenote-webstart/${env.PHENOTE_VERSION}">
+        <fileset file="doc/phenote-website/*.jnlp"/>
+      </copy>
+    </target>    
+
     <target name="webstart-jars" depends="build-all,jar,copy-webstart-jars,sign-webstart-jars"/> 
 
     <target name="copy-webstart-jars">

Modified: phenote/trunk/doc/phenote-website/phenote-zfin.jnlp
===================================================================
--- phenote/trunk/doc/phenote-website/phenote-zfin.jnlp	2007-02-01 23:46:01 UTC (rev 358)
+++ phenote/trunk/doc/phenote-website/phenote-zfin.jnlp	2007-02-06 19:15:49 UTC (rev 359)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jnlp
 spec="1.0+"
-codebase="http://toy.lbl.gov:9010/phenote/1.0/"
+codebase="http://toy.lbl.gov:9010/phenote/1.1/"
 href="phenote-zfin.jnlp">
 <information>
-	<title>Phenote 1.0</title>
+	<title>Phenote 1.1</title>
 	<vendor>BBOP</vendor>
 	<description>Phenote standalone app via webstart</description>
  	 <!-- Declares that the application can run without

Modified: phenote/trunk/src/java/phenote/main/PhenoteVersion.java
===================================================================
--- phenote/trunk/src/java/phenote/main/PhenoteVersion.java	2007-02-01 23:46:01 UTC (rev 358)
+++ phenote/trunk/src/java/phenote/main/PhenoteVersion.java	2007-02-06 19:15:49 UTC (rev 359)
@@ -6,7 +6,7 @@
   
   //private static final float MAJOR_VERSION_NUM = 0.8f;
   //private static final float SUB_VERSION_NUM = .3f;
-  private static final String VERSION = "1.0.4"; // ??
+  private static final String VERSION = "1.1"; // ??
   // type is "dev" or "release" 
   //private static final String type = " dev"; // "release"
   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.