Skip to content

Commit 7280955

Browse files
committed
Add beagle dependency and fix exec:exec for BEAST runs
Add explicit beagle dependency (optional in beast-base but required by JPMS module graph). Default exec:exec to beast.base module so BEAST runs without needing beagle native library. BEAUti available via -Dbeast.module=beast.fx -Dbeast.main=beastfx.app.beauti.Beauti.
1 parent 9cb5bfc commit 7280955

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

pom.xml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040

4141
<beast.version>2.8.0-beta1</beast.version>
4242
<javafx.version>25.0.2</javafx.version>
43-
<beast.main>beastfx.app.beauti.Beauti</beast.main>
43+
<beast.module>beast.base</beast.module>
44+
<beast.main>beast.base.minimal.BeastMain</beast.main>
4445
<beast.args/>
4546
<beast.pkg.name>MM</beast.pkg.name>
4647
<beast.pkg.version>1.3.0</beast.pkg.version>
@@ -59,6 +60,13 @@
5960
<version>${beast.version}</version>
6061
</dependency>
6162

63+
<!-- BEAGLE (optional in beast-base, must be explicit for module path) -->
64+
<dependency>
65+
<groupId>io.github.compevol</groupId>
66+
<artifactId>beagle</artifactId>
67+
<version>1.0</version>
68+
</dependency>
69+
6270
<!-- GUI (optional at runtime) -->
6371
<dependency>
6472
<groupId>io.github.compevol</groupId>
@@ -154,17 +162,17 @@
154162
</executions>
155163
</plugin>
156164

157-
<!-- Run BEAUti or BEAST with morph-models on module path:
158-
mvn exec:exec
159-
mvn exec:exec -Dbeast.main=beast.base.minimal.BeastMain -Dbeast.args="examples/M3982.xml" -->
165+
<!-- Run BEAST or BEAUti with morph-models on module path:
166+
mvn exec:exec -Dbeast.args="examples/M3982.xml"
167+
mvn exec:exec -Dbeast.module=beast.fx -Dbeast.main=beastfx.app.beauti.Beauti -->
160168
<plugin>
161169
<groupId>org.codehaus.mojo</groupId>
162170
<artifactId>exec-maven-plugin</artifactId>
163171
<version>3.5.0</version>
164172
<configuration>
165173
<executable>java</executable>
166174
<workingDirectory>${project.basedir}</workingDirectory>
167-
<commandlineArgs>--module-path %classpath -DBEAST_PACKAGE_PATH=${project.build.outputDirectory} -m beast.fx/${beast.main} ${beast.args}</commandlineArgs>
175+
<commandlineArgs>--module-path %classpath -DBEAST_PACKAGE_PATH=${project.build.outputDirectory} -m ${beast.module}/${beast.main} ${beast.args}</commandlineArgs>
168176
</configuration>
169177
</plugin>
170178

0 commit comments

Comments
 (0)