Skip to content

Commit bfda24e

Browse files
committed
add BEAUti exec:exec and move fxtemplates to JPMS-safe path
Move fxtemplates to beast.morph.models.fx/fxtemplates/ to avoid JPMS split-package conflict with beast-fx. Add exec-maven-plugin to beast-morph-models-fx for running BEAUti with morph-models on the module path. Add beast.main and beast.args default properties.
1 parent 577418e commit bfda24e

4 files changed

Lines changed: 17 additions & 1 deletion

File tree

beast-morph-models-fx/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,20 @@
4141

4242
<build>
4343
<plugins>
44+
<!-- Run BEAUti with morph-models on module path:
45+
mvn -pl beast-morph-models-fx exec:exec
46+
mvn -pl beast-morph-models-fx exec:exec -Dbeast.main=beast.base.minimal.BeastMain -Dbeast.args="examples/M3982.xml" -->
47+
<plugin>
48+
<groupId>org.codehaus.mojo</groupId>
49+
<artifactId>exec-maven-plugin</artifactId>
50+
<version>3.5.0</version>
51+
<configuration>
52+
<executable>java</executable>
53+
<workingDirectory>${maven.multiModuleProjectDirectory}</workingDirectory>
54+
<commandlineArgs>--module-path %classpath -m beast.fx/${beast.main} ${beast.args}</commandlineArgs>
55+
</configuration>
56+
</plugin>
57+
4458
<!-- Assemble BEAST package ZIP -->
4559
<plugin>
4660
<groupId>org.apache.maven.plugins</groupId>

beast-morph-models-fx/src/assembly/beast-package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<fileSets>
3232
<!-- fxtemplates/ -->
3333
<fileSet>
34-
<directory>${project.basedir}/src/main/resources/fxtemplates</directory>
34+
<directory>${project.basedir}/src/main/resources/beast.morph.models.fx/fxtemplates</directory>
3535
<outputDirectory>/fxtemplates</outputDirectory>
3636
</fileSet>
3737
<!-- examples/ from project root (excluding legacy directories) -->

beast-morph-models-fx/src/main/resources/fxtemplates/morph-models.xml renamed to beast-morph-models-fx/src/main/resources/beast.morph.models.fx/fxtemplates/morph-models.xml

File renamed without changes.

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
<beast.version>2.8.0-SNAPSHOT</beast.version>
4848
<javafx.version>25.0.2</javafx.version>
4949
<junit.version>5.8.2</junit.version>
50+
<beast.main>beastfx.app.beauti.Beauti</beast.main>
51+
<beast.args/>
5052
<beast.pkg.name>MM</beast.pkg.name>
5153
<beast.pkg.version>1.3.0</beast.pkg.version>
5254
</properties>

0 commit comments

Comments
 (0)