Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions build-coatjava.sh
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,6 @@ cp -r libexec $prefix_dir/
which python3 >& /dev/null && python=python3 || python=python
$python etc/bankdefs/util/bankSplit.py $prefix_dir/etc/bankdefs/hipo4 || exit 1

# use maven to copy a CLARA jar to a separate directory:
mvn org.apache.maven.plugins:maven-dependency-plugin:3.10.0:copy \
-Dartifact=org.jlab.coda:jclara:6.0-SNAPSHOT:jar -DoutputDirectory=$prefix_dir/lib/utils -DstripVersion=false

# build (and test)
unset CLAS12DIR
if $runUnitTests; then
Expand Down Expand Up @@ -404,7 +400,8 @@ for pom in $(find reconstruction -name pom.xml); do
install_jars $pom $prefix_dir/lib/services
done
install_jars common-tools/djl-runtime/pom.xml $prefix_dir/lib/services
install_jars common-tools/coat-libs/pom.xml $prefix_dir/lib/clas 'coat-libs-*.jar'
install_jars common-tools/clara-io/pom.xml $prefix_dir/lib/utils 'jclara-*.jar'
install_jars common-tools/coat-libs/pom.xml $prefix_dir/lib/clas 'coat-libs-*.jar'
echo "installed coatjava to: $prefix_dir"

# install clara
Expand Down
25 changes: 25 additions & 0 deletions common-tools/clara-io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,29 @@

</dependencies>

<!-- copy the CLARA jar for runtime usage -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-jclara</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib/utils</outputDirectory>
<includeGroupIds>org.jlab.coda</includeGroupIds>
<includeArtifactIds>jclara</includeArtifactIds>
<includeTypes>jar</includeTypes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
1 change: 0 additions & 1 deletion common-tools/djl-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.11.0</version>
<executions>
<execution>
<id>copy-djl-runtime</id>
Expand Down
Loading