From 17cc2102fb96957754b28880343aae5544be87e2 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Sat, 2 Nov 2019 03:50:23 +0900
Subject: [PATCH] Update for NEMSCompsetRun on jet, bugfix for calling
 ccpp_prebuild.py in distclean phase (#12)

* tests/rtgen: update to run NEMSCompsetRun on xjet

* src/incmake/component_CCPP.mk: bugfix, correct path for calling ccpp_prebuild.py in distclean phase
---
 src/incmake/component_CCPP.mk | 11 ++++++-----
 tests/rtgen                   |  5 +----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/incmake/component_CCPP.mk b/src/incmake/component_CCPP.mk
index 00cb6956..b71e5934 100644
--- a/src/incmake/component_CCPP.mk
+++ b/src/incmake/component_CCPP.mk
@@ -58,12 +58,13 @@ $(ccpp_mk): configure
 
 # Rule for cleaning intermediate files
 distclean_CCPP: clean_CCPP
-	set -x                                                          ; \
+	set -xue                                                        ; \
+	export PATH_CCPP="$(CCPP_SRCDIR)"                               ; \
 	cd $(ROOTDIR)                                                   ; \
-	./ccpp/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) --clean ; \
-	cd "$(CCPP_SRCDIR)"                                             ; \
-	rm -rf "$(CCPP_SRCDIR)/lib"                                     ; \
-	rm -rf "$(CCPP_SRCDIR)/include"                                 ; \
+	$$PATH_CCPP/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) --clean ; \
+	cd $$PATH_CCPP                                                  ; \
+	rm -rf "$(CCPP_BINDIR)/lib"                                     ; \
+	rm -rf "$(CCPP_BINDIR)/include"                                 ; \
 	rm -f $(ccpp_mk)
 
 clean_CCPP:
diff --git a/tests/rtgen b/tests/rtgen
index f1b1b0d2..ea0db17c 100755
--- a/tests/rtgen
+++ b/tests/rtgen
@@ -929,12 +929,9 @@ class RTGen(TestGen):
             out.write('module load emc-utils/1.0.0 ; export have_qoutql=YES\n')
         elif 'jet' in here.name:
             out.write('module load hpss\n')
-            out.write('module use /lfs3/projects/hwrf-vd/soft/modulefiles\n')
-            out.write('module load rocoto/1.3.0rc2\n')
+            out.write('module load rocoto/1.3.1\n')
             out.write('module use /misc/contrib/emc-utils/modulefiles\n')
             out.write('module load emc-utils/1.1.0\n')
-            #if produtil.fileop.find_exe('sbatch',raise_missing=False):
-            #    out.write('module load slurm\n')
             out.write('have_qoutql=YES\n')
         elif here.name == 'hera':
             out.write('module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles/\n')