X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=49fd37eb8a826798ae9ca5b12ce04b44c453520f;hb=d26d84a079b512973f50703ff2367a62da9efc2e;hp=19b41e5b413b1ffc0905e5a1e7b8d11b7679c095;hpb=d1d1ca77ce184928fc3b5a1a80e056f867fae73e;p=jalview.git

diff --git a/build.xml b/build.xml
index 19b41e5..49fd37e 100755
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -62,8 +62,12 @@
         <include name="*.jar"/>
       </fileset> -->
       </path>
+  	
     <!-- Jalview Version String displayed by application on startup and used to check for updates -->
     <property name="JALVIEW_VERSION" value="DEVELOPMENT" />
+  	
+    <property name="INSTALLATION" value="Source" />
+  	
     <!-- 2.4 (VAMSAS)" -->
     <!-- Include debugging information in javac true or false -->
     <property name="javac.debug" value="true" />
@@ -175,8 +179,9 @@
     <properties file="${outputDir}/.build_properties">
       <header>
           ---Jalview Build Details---
-        </header>
+        </header>    	
       <property name="VERSION" value="${JALVIEW_VERSION}" />
+      <property name="INSTALLATION" value="${INSTALLATION}" />
       <property name="BUILD_DATE" value="${build.date}" />
     </properties>
   </target>
@@ -344,9 +349,16 @@
             <include name="*.jar" />
             <include name="*_*.jar" />
             <exclude name="jalview.jar" />
+          	<exclude name="*jnilib.jar"/>
           </fileset>
+      	</resources>
+        <resources os="Mac OS X">
           <property name="jalview.version" value="${JALVIEW_VERSION}" />
+        	<fileset dir="${packageDir}">
+        		<include name="*quaqua*.jnilib.jar"/>
+        	</fileset>
         </resources>
+      	
         <application_desc main_class="jalview.bin.Jalview">
         </application_desc>
         <security>
@@ -734,6 +746,20 @@
   </signjar>
   <!-- bizarre bug causes JmolApplet to always get signed, even if excluded from above. so copy explicitly -->
   <copy file="appletlib/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true" />
+	<!-- finally, replace any launchApp servlet tags with a version specification -->
+	<replace value="http://www.jalview.org/services/launchApp?version=${JALVIEW_VERSION}&quot;">
+		<replacetoken><![CDATA[http://www.jalview.org/services/launchApp"]]></replacetoken>
+		<fileset dir="${packageDir}/examples">
+			<include name="**/*.html"/>
+		</fileset>
+	</replace>
+	<replace value="http://www.jalview.org/services/launchApp?version=${JALVIEW_VERSION}'">
+		<replacetoken><![CDATA[http://www.jalview.org/services/launchApp']]></replacetoken>
+		<fileset dir="${packageDir}/examples">
+			<include name="**/*.html"/>
+		</fileset>
+	</replace>
+
 </target>
 <target name="sourcedoc" description="Create jalview source documentation pages" depends="init">
   <javadoc destdir="${javadocDir}">