add SimpleRandomTree template + prep for BEAST v2.5.0 release

build.xml

@@ -17,7 +17,7 @@
 	<property name="srcBeast2" location="${beast2path}/src" />
 	<property name="beast2classpath" location="${beast2path}/build" />
 	<property name="Add_on_dir" value="${release_dir}/add-on" />
-	<property name="version" value="1.7.0" />
+	<property name="version" value="1.8.0" />
 
     <import file="${beast2path}/build.xml" />
 

src/beast/math/distributions/MixtureDistribution.java

@@ -1,11 +1,11 @@
 package beast.math.distributions;
 
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.sun.org.glassfish.gmbal.Description;
-
+import beast.core.Description;
 import beast.core.Distribution;
 import beast.core.Input;
 import beast.core.Input.Validate;

templates/extras.xml

@@ -12,6 +12,22 @@
 			<connect srcID="MultiMonophyleticConstraint.$(n)" targetID="prior" inputName="distribution" if="isInitializing"/>
         </subtemplate>
 
+
+        <subtemplate id='SimpleRandomTree' class='beast.evolution.tree.SimpleRandomTree' mainid='SimpleRandomTree.t:$(n)'
+        	suppressInputs="
+        	beast.evolution.tree.SimpleRandomTree.weights,
+	        beast.evolution.tree.SimpleRandomTree.taxa,
+	        beast.evolution.tree.SimpleRandomTree.estimate,
+        	beast.evolution.tree.SimpleRandomTree.trait,
+        	beast.evolution.tree.SimpleRandomTree.taxonset,
+        	beast.evolution.tree.SimpleRandomTree.nodetype,
+        	beast.evolution.tree.SimpleRandomTree.initial">
+<![CDATA[
+            <tree spec='beast.evolution.tree.SimpleRandomTree' id='SimpleRandomTree.t:$(n)' estimate='false' initial="@Tree.t:$(n)">
+                <taxa idref='data'/>
+            </tree>
+]]>
+        </subtemplate>
     </mergewith>
 </beast>
 

version.xml

@@ -1,13 +1,13 @@
-<addon name='BEASTLabs' version='1.7.0'>
-	<depends on='beast2' atleast='2.4.3'/>
-    <addonapp description="BEAST model spreadsheet"
+<package name='BEASTLabs' version='1.8.0'>
+	<depends on='beast2' atleast='2.5.0'/>
+    <packageapp description="BEAST model spreadsheet"
               class="beast.app.draw.SpreadSheet"
               args=""
               icon=""
             />
-    <addonapp description="View parametric distributions"
+    <packageapp description="View parametric distributions"
               class="beast.app.beauti.DistributionViewer"
               args=""
               icon=""
             />
-</addon>
+</package>