Merge pull request #900 from lammps/install

Consistency tweaks to various package Install.sh files and related shell scripts

src/Depend.sh

@@ -87,6 +87,7 @@ if (test $1 = "MANYBODY") then
   depend GPU
   depend KOKKOS
   depend OPT
+  depend QEQ
   depend USER-MISC
   depend USER-OMP
 fi
@@ -95,9 +96,8 @@ if (test $1 = "MOLECULE") then
   depend GPU
   depend KOKKOS
   depend USER-MISC
-  depend USER-OMP
   depend USER-FEP
-  depend USER-CGDNA
+  depend USER-OMP
   depend USER-INTEL
 fi
 

src/LATTE/Install.sh

@@ -29,7 +29,7 @@ action () {
 # all package files with no dependencies
 
 for file in *.cpp *.h; do
-  action $file
+  test -f ${file} && action $file
 done
 
 # edit 2 Makefile.package files to include/exclude package info

src/QEQ/Install.sh

+# Install/unInstall package files in LAMMPS
+# mode = 0/1/2 for uninstall/install/update
+
+# this is default Install.sh for all packages
+# if package has an auxiliary library or a file with a dependency,
+# then package dir has its own customized Install.sh
+
+mode=$1
+
+# enforce using portable C locale
+LC_ALL=C
+export LC_ALL
+
+# arg1 = file, arg2 = file it depends on
+
+action () {
+  if (test $mode = 0) then
+    rm -f ../$1
+  elif (! cmp -s $1 ../$1) then
+    if (test -z "$2" || test -e ../$2) then
+      cp $1 ..
+      if (test $mode = 2) then
+        echo "  updating src/$1"
+      fi
+    fi
+  elif (test -n "$2") then
+    if (test ! -e ../$2) then
+      rm -f ../$1
+    fi
+  fi
+}
+
+# all package files with dependencies
+
+action fix_qeq.cpp
+action fix_qeq.h
+action fix_qeq_dynamic.cpp
+action fix_qeq_dynamic.h
+action fix_qeq_fire.cpp pair_comb.h
+action fix_qeq_fire.h pair_comb.h
+action fix_qeq_point.cpp
+action fix_qeq_point.h
+action fix_qeq_shielded.cpp
+action fix_qeq_shielded.h
+action fix_qeq_slater.cpp
+action fix_qeq_slater.h

src/USER-CGSDK/Install.sh

@@ -28,8 +28,8 @@ action () {
 
 # list of files with optional dependcies
 
-action angle_sdk.cpp angle_harmonic.cpp
-action angle_sdk.h angle_harmonic.cpp
+action angle_sdk.cpp
+action angle_sdk.h
 action lj_sdk_common.h
 action pair_lj_sdk.cpp
 action pair_lj_sdk.h