Skip to content

Commit

Permalink
orc beast 2.7 compatability
Browse files Browse the repository at this point in the history
  • Loading branch information
jordandouglas committed Jul 28, 2022
1 parent a66b035 commit d871ba3
Show file tree
Hide file tree
Showing 71 changed files with 2,269 additions and 3,355 deletions.
15 changes: 15 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=17
15 changes: 10 additions & 5 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>

<!-- set global properties for this build -->
<property name="versionORC" value="1.0.3" />
<property name="versionORC" value="1.1.0" />
<property name="srcORC" location="src" />
<property name="docORC" location="doc" />
<property name="buildORC" location="build" />
Expand All @@ -27,16 +27,15 @@

<path id="classpath">
<pathelement path="${buildORC}"/>
<fileset dir="${libBeast2}" includes="junit-4.8.2.jar"/>
<fileset dir="${libBeast2}" includes="junit/junit-platform-console-standalone-1.8.2.jar"/>
<fileset dir="${libBeast2}" includes="jam.jar"/>
<fileset dir="${libBeast2}" includes="commons-math3-3.1.1.jar"/>
<fileset dir="${libBeast2}" includes="commons-math3-3.6.1.jar"/>
<pathelement path="${beast2classpath}"/>
<fileset dir="${beast2path}/lib" includes="jam.jar"/>
<fileset dir="${beast2path}/lib" includes="beagle.jar"/>
<fileset dir="${beast2path}/lib" includes="fest.jar"/>
<fileset dir="${beast2path}/lib" includes="colt.jar"/>
<pathelement path="../BEASTLabs/build"/>
<pathelement path="../starbeast3/build"/>
<pathelement path="../BeastFX/build"/>
</path>


Expand Down Expand Up @@ -191,6 +190,7 @@
<mkdir dir="${Add_on_dir}/doc" />
<mkdir dir="${Add_on_dir}/examples" />
<mkdir dir="${Add_on_dir}/templates" />
<mkdir dir="${Add_on_dir}/fxtemplates" />

<copy todir="${Add_on_dir}">
<fileset file="version.xml"/>
Expand All @@ -216,6 +216,11 @@
</copy>


<copy todir="${Add_on_dir}/fxtemplates">
<fileset file="fxtemplates/*.xml" />
</copy>


<jar jarfile="${distORC}/ORC.addon.v${versionORC}.zip">
<fileset dir="${Add_on_dir}">
<include name="**/*" />
Expand Down
662 changes: 0 additions & 662 deletions examples/Broughton.xml

This file was deleted.

643 changes: 0 additions & 643 deletions examples/Dornburg.xml

This file was deleted.

511 changes: 0 additions & 511 deletions examples/Simulated.xml

This file was deleted.

268 changes: 268 additions & 0 deletions examples/beetles.xml

Large diffs are not rendered by default.

256 changes: 256 additions & 0 deletions examples/caterpillars.xml

Large diffs are not rendered by default.

269 changes: 269 additions & 0 deletions examples/fishes.xml

Large diffs are not rendered by default.

277 changes: 0 additions & 277 deletions examples/test/Broughton.log

This file was deleted.

134 changes: 0 additions & 134 deletions examples/test/Broughton.trees

This file was deleted.

Loading

0 comments on commit d871ba3

Please sign in to comment.