diff --git a/bin/mgit b/bin/mgit index 35bd2ca..8411ea0 100755 --- a/bin/mgit +++ b/bin/mgit @@ -26,6 +26,8 @@ echo " and your personal fork as a remote, if you provide the username argument. mgit status see the status of the build area, including dependency issues + mgit list + list the subdirectories of Offline which can be added locally mgit add PACKAGE add the PACKAGE subdirectory mgit rm PACKAGE @@ -73,8 +75,7 @@ mg_test_clean() { # check for unpushed commits local branch=$( mg_branch ) - local test3=$( git diff --shortstat origin/${branch}..HEAD ) - #echo $branch $test3 > s.txt + local test3=$( git log --branches --not --remotes ) if [ -n "$test3" ]; then [ -n "$ret" ] && ret="${ret}," ret="${ret}unpushed commits" @@ -124,13 +125,16 @@ mg_init() { echo "/.gitignore" >> .git/info/sparse-checkout local branch=$( mg_branch ) - if [ -n "$branch" ] ; then + + # if you default to master, it doesn't point to a commit so you can't check it out + local goodbranch=true + [[ -z "$branch" || -z "$(git branch -al $branch)" ]] && goodbranch=false + if [ "$goodbranch" == "true" ] ; then git checkout $branch || exit 1 else git checkout --no-track -b mgit_init_branch mu2e/master || exit 1 fi git read-tree --reset -u HEAD || exit 1 - #git read-tree --empty || exit 1 return 0 @@ -208,6 +212,16 @@ mg_status() { } +# +# list packages you could add +# +mg_list() { + + git ls-files $DD | awk -F '/' '{print $1}' | sort | uniq + +} + + # # add packages # @@ -339,6 +353,9 @@ case "$command" in init) mg_init $@ ;; + list) + mg_list $@ + ;; add) mg_add $@ ;; diff --git a/config/p007 b/config/p007 new file mode 100644 index 0000000..4b4f0a2 --- /dev/null +++ b/config/p007 @@ -0,0 +1,85 @@ + +# the lines starting with two hashes are documentation which can be printed +## 5/18/2021 art v3_09_00, including updates to mu2e_artdaq_core + +# +# use preferred build type, if none requested +# +if [ -z "$MUSE_BUILD" ]; then + export MUSE_BUILD=prof + if [ $MUSE_VERBOSE -gt 0 ]; then + echo "INFO - MUSE_BUILD defaulting to $MUSE_BUILD in $MUSE_ENVSET" + fi +fi + +# +# use preferred compiler, if none requested +# +if [ -z "$MUSE_COMPILER_E" ]; then + export MUSE_COMPILER_E=e20 + if [ $MUSE_VERBOSE -gt 0 ]; then + echo "INFO - MUSE_COMPILER_E defaulting to $MUSE_COMPILER_E in $MUSE_ENVSET" + fi +fi + +# +# use preferred python flag, if none requested +# +if [ -z "$MUSE_PYTHON" ]; then + export MUSE_PYTHON=p392 + if [ $MUSE_VERBOSE -gt 0 ]; then + echo "INFO - MUSE_PYTHON defaulting to $MUSE_PYTHON in $MUSE_ENVSET" + fi +fi + + +# build tools +setup cetpkgsupport v1_14_01 +setup -B cetbuildtools v8_07_01 +setup -B valgrind v3_17_0 +setup -B cmake v3_20_0 + +# art +# these three lines must be coordinated +setup -B art_root_io v1_08_00 -q${MUSE_BUILD}:+${MUSE_COMPILER_E} +export MUSE_ART=s108 +setup -B gallery v1_18_01 -q+${MUSE_BUILD}:+${MUSE_COMPILER_E} + + +# +# geant4 +# +GFLAGS=+${MUSE_BUILD}:+${MUSE_COMPILER_E} +if [ -z "$MUSE_G4ST" ]; then + GFLAGS=${GFLAGS}:+mt +fi +if [ -n "$MUSE_G4VG" ]; then + GFLAGS=${GFLAGS}:+vg +fi +if [ "$MUSE_G4VIS" == "qt" ]; then + GFLAGS=${GFLAGS}:+qt +fi + +setup -B geant4 v4_10_7_p01c -q${GFLAGS} + +# +# everything else +# + +setup -B xerces_c v3_2_3 -q +${MUSE_BUILD}:+${MUSE_COMPILER_E} +setup -B mu2e_artdaq_core v1_05_09_01 -q +${MUSE_BUILD}:+${MUSE_COMPILER_E}:+${MUSE_ART} +setup -B heppdt v03_04_02 -q +${MUSE_BUILD}:+${MUSE_COMPILER_E} +setup -B BTrk v1_02_31 -q +${MUSE_BUILD}:+${MUSE_COMPILER_E}:+${MUSE_PYTHON} +setup -B KinKal v00_01_06a -q +${MUSE_BUILD}:+${MUSE_COMPILER_E}:+${MUSE_PYTHON} +setup -B cry v1_7n -q +${MUSE_BUILD}:+${MUSE_COMPILER_E} +setup -B gsl v2_6a +setup curl v7_64_1 +setup cryptopp v08_02_00 -q +${MUSE_BUILD}:+${MUSE_COMPILER_E} +setup -B scons v3_1_2a -q +${MUSE_PYTHON} +setup -B gdb v10_1 + + +# Local Variables: +# mode: sh +# End: +# vi:syntax=sh