build!: various cleanups #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

baltzell merged 30 commits into development from one-version-num

May 9, 2025

build-coatjava.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,10 +4,11 @@ set -e
  
    set -u

    set -o pipefail

    usage='''build-coatjava.sh [-h] [--help] [--quiet] [--spotbugs] [--nomaps] [--unittests]

    usage='''build-coatjava.sh [-h] [--help] [--quiet] [--clean] [--spotbugs] [--nomaps] [--unittests]

     - all other arguments will be passed to `mvn`, e.g., -T4 will build with 4 parallel threads'''

    quiet="no"

    cleanBuild="no"

    runSpotBugs="no"

    downloadMaps="yes"

    runUnitTests="no"

    @@ -20,6 +21,7 @@ do
  
        --nomaps)    downloadMaps="no"  ;;

        --unittests) runUnitTests="yes" ;;

        --quiet)     quiet="yes"        ;;

        --clean)     cleanBuild="yes"   ;;

        -h|--help)

          echo "$usage"

          exit 2

    @@ -28,14 +30,18 @@ do
  
      esac

    done

    top="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"

    src_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"

    prefix_dir=$src_dir/coatjava

    # working directory should be the source code directory

    cd $src_dir

    wget='wget'

    mvn="mvn --settings $top/maven-settings.xml"

    mvn="mvn --settings $src_dir/maven-settings.xml"

    if [ "$quiet" == "yes" ]

    then

        wget='wget --progress=dot:mega'

        mvn="mvn -q -B --settings $top/maven-settings.xml"

        mvn="mvn -q -B --settings $src_dir/maven-settings.xml"

    fi

    mvn+=" ${mvnArgs[*]:-}"

    @@ -63,7 +69,7 @@ download () {
  
    # download the default field maps, as defined in libexec/env.sh:

    # (and duplicated in etc/services/reconstruction.yaml):

    source `dirname $0`/libexec/env.sh

    source libexec/env.sh

    if [ $downloadMaps == "yes" ]; then

      echo 'Retrieving field maps ...'

      webDir=https://clasweb.jlab.org/clas12offline/magfield

    @@ -83,24 +89,32 @@ if [ $downloadMaps == "yes" ]; then
  
      cd -

    fi

    rm -rf coatjava

    mkdir -p coatjava

    cp -r bin coatjava/

    cp -r etc coatjava/

    cp -r libexec coatjava/

    # always clean the installation prefix

    rm -rf $prefix_dir

    # clean up any cache copies

    if [ $cleanBuild == "yes" ]; then

      $mvn clean

      echo '''DONE CLEANING.

      Now re-run without `--clean` to build.'''

      exit

    fi

    # start new installation tree

    mkdir -p $prefix_dir

    cp -r bin $prefix_dir/

    cp -r etc $prefix_dir/

    cp -r libexec $prefix_dir/

    # create schema directories for partial reconstruction outputs

    which python3 >& /dev/null && python=python3 || python=python

    $python etc/bankdefs/util/bankSplit.py coatjava/etc/bankdefs/hipo4 || exit 1

    mkdir -p coatjava/lib/clas

    mkdir -p coatjava/lib/utils

    mkdir -p coatjava/lib/services

    $python etc/bankdefs/util/bankSplit.py $prefix_dir/etc/bankdefs/hipo4 || exit 1

    mkdir -p $prefix_dir/lib/clas

    mkdir -p $prefix_dir/lib/utils

    mkdir -p $prefix_dir/lib/services

    # FIXME:  this is still needed by one of the tests

    cp external-dependencies/jclara-4.3-SNAPSHOT.jar coatjava/lib/utils

    ### clean up any cache copies ###

    cd common-tools/coat-lib; $mvn clean; cd -

    cp external-dependencies/jclara-4.3-SNAPSHOT.jar $prefix_dir/lib/utils

    unset CLAS12DIR

    if [ $runUnitTests == "yes" ]; then

    @@ -119,12 +133,7 @@ if [ $runSpotBugs == "yes" ]; then
  
    	if [ $? != 0 ] ; then echo "spotbugs failure" ; exit 1 ; fi

    fi

    cd common-tools/coat-lib

    $mvn package

    if [ $? != 0 ] ; then echo "mvn package failure" ; exit 1 ; fi

    cd -

    cp common-tools/coat-lib/target/coat-libs-*-SNAPSHOT.jar coatjava/lib/clas/

    cp reconstruction/*/target/clas12detector-*-SNAPSHOT*.jar coatjava/lib/services/

    cp common-tools/coat-lib/target/coat-libs-*-SNAPSHOT.jar $prefix_dir/lib/clas/

    cp reconstruction/*/target/clas12detector-*-SNAPSHOT*.jar $prefix_dir/lib/services/

    echo "COATJAVA SUCCESSFULLY BUILT !"

common-tools/README.md

This file was deleted.

common-tools/build.sh

This file was deleted.

common-tools/clas-reco/pom.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -24,19 +24,19 @@
  
        <dependency>

          <groupId>cnuphys</groupId>

          <artifactId>magfield</artifactId>

          <version>2.0-SNAPSHOT</version>

          <version>12.0.6t-SNAPSHOT</version>

        </dependency>

        <dependency>

          <groupId>cnuphys</groupId>

          <artifactId>swimmer</artifactId>

          <version>2.0-SNAPSHOT</version>

          <version>12.0.6t-SNAPSHOT</version>

        </dependency>

        <dependency>

          <groupId>cnuphys</groupId>

          <artifactId>snr</artifactId>

          <version>2.0-SNAPSHOT</version>

          <version>12.0.6t-SNAPSHOT</version>

        </dependency>

        <dependency>

common-tools/cnuphys/magfield/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
         <modelVersion>4.0.0</modelVersion>
         <groupId>cnuphys</groupId>
         <artifactId>magfield</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>12.0.6t-SNAPSHOT</version>
         <packaging>jar</packaging>
         <parent>
@@ Expand Down @@

common-tools/cnuphys/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
       <modelVersion>4.0.0</modelVersion>
       <groupId>cnuphys</groupId>
       <artifactId>clas12</artifactId>
-      <version>2.0-SNAPSHOT</version>
+      <version>12.0.6t-SNAPSHOT</version>
       <packaging>pom</packaging>
       <parent>
         <groupId>cnuphys</groupId>
@@ Expand Down @@

common-tools/cnuphys/snr/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
         <modelVersion>4.0.0</modelVersion>
         <groupId>cnuphys</groupId>
         <artifactId>snr</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>12.0.6t-SNAPSHOT</version>
         <packaging>jar</packaging>
         <parent>
@@ Expand Down @@

common-tools/cnuphys/splot/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
         <modelVersion>4.0.0</modelVersion>
         <groupId>cnuphys</groupId>
         <artifactId>splot</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>12.0.6t-SNAPSHOT</version>
         <packaging>jar</packaging>
         <parent>
@@ Expand Down @@

common-tools/cnuphys/swimmer/pom.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,7 +3,7 @@
  
        <modelVersion>4.0.0</modelVersion>

        <groupId>cnuphys</groupId>

        <artifactId>swimmer</artifactId>

        <version>2.0-SNAPSHOT</version>

        <version>12.0.6t-SNAPSHOT</version>

        <packaging>jar</packaging>

        <parent>

    @@ -17,13 +17,13 @@
  
          <dependency>

            <groupId>cnuphys</groupId>

            <artifactId>magfield</artifactId>

            <version>2.0-SNAPSHOT</version>

            <version>12.0.6t-SNAPSHOT</version>

          </dependency>

          <dependency>

            <groupId>cnuphys</groupId>

            <artifactId>splot</artifactId>

            <version>2.0-SNAPSHOT</version>

            <version>12.0.6t-SNAPSHOT</version>

          </dependency>

          <dependency>

common-tools/coat-lib/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,20 +6,19 @@ @@
       <version>12.0.6t-SNAPSHOT</version>
       <packaging>pom</packaging>
+      <parent>
+        <groupId>org.jlab.clas</groupId>
+        <artifactId>clas12rec</artifactId>
+        <relativePath>../../parent/pom.xml</relativePath>
+        <version>12.0.6t-SNAPSHOT</version>
+      </parent>
       <repositories>
         <repository>
-          <id>local-build</id>
-          <url>https://clasweb.jlab.org/.clas12maven</url>
+          <id>freehep-repo-public</id>
+          <url>https://clasweb.jlab.org/.clas12maven/</url>
+          <!--<url>https://srs.slac.stanford.edu/nexus/content/groups/freehep-maven2-public/</url>-->
         </repository>
-        <repository>
-          <id>jnp-build</id>
-          <url>https://clasweb.jlab.org/.jhep/maven</url>
-      </repository>
-        <repository>
-         <id>freehep-repo-public</id>
-         <url>https://clasweb.jlab.org/.clas12maven/</url>
-         <!--<url>https://srs.slac.stanford.edu/nexus/content/groups/freehep-maven2-public/</url>-->
-      </repository>
       </repositories>
       <dependencies>
@@ Expand Down Expand Up / @@ -72,7 +71,7 @@ @@
             <artifactId>j4ml-clas12</artifactId>
             <version>0.9-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.jama</groupId>
           <artifactId>jamapack</artifactId>
@@ Expand Down @@

common-tools/parent/pom.xml

This file was deleted.

common-tools/pom.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,12 +21,13 @@ @@
         <module>clas-jcsg</module>
         <module>clas-detector</module>
         <module>cnuphys</module>
-        <module>clas-reco</module>
+        <module>clas-reco</module>
         <module>swim-tools</module>
-        <module>clas-analysis</module>
+        <module>clas-analysis</module>
         <module>clas-math</module>
         <module>clara-io</module>
         <module>clas-tracking</module>
+        <module>coat-lib</module>
       </modules>
     </project>

install-clara

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,7 +3,7 @@
  
    # Default versions:

    grapes=2.17

    clara=5.0.2

    coatjava=11.1.1

    coatjava=12.0.6t

    # Abort on any non-zero exit codes:

    set -e

    @@ -105,7 +105,7 @@ if compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
  
    then

        coatjava=$(cd $coatjava && pwd)

        echo -e "\nUsing local COATJAVA installation:\n\t$coatjava"

    elif ! [[ "$coatjava" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]

    elif ! [[ "$coatjava" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)t?$ ]] # must be semver, or semver+"t"

    then

        echo -e "\n\nWARNING:  COATJAVA doesn't look like a local installation nor version number:  $coatjava"

    fi

reconstruction/alert/pom.xml

-Original file line number
+Diff line change
@@ -1,12 +1,10 @@
     <?xml version="1.0" encoding="UTF-8"?>
-    <project xmlns="http://maven.apache.org/POM/4.0.0"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <modelVersion>4.0.0</modelVersion>
         <groupId>org.jlab.clas12.detector</groupId>
         <artifactId>clas12detector-alert</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>12.0.6t-SNAPSHOT</version>
         <packaging>jar</packaging>
         <parent>
@@ Expand Down @@

reconstruction/band/pom.xml

-Original file line number
+Diff line change
@@ -1,12 +1,10 @@
     <?xml version="1.0" encoding="UTF-8"?>
-    <project xmlns="http://maven.apache.org/POM/4.0.0"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
         <modelVersion>4.0.0</modelVersion>
         <groupId>org.jlab.clas12.detector</groupId>
         <artifactId>clas12detector-band</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>12.0.6t-SNAPSHOT</version>
         <packaging>jar</packaging>
       <parent>
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build!: various cleanups #515

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!