Merge pull request #4089 from gforney/development

cleanup some build scripts Former-commit-id: 874deca1ebf073329d40f4950805d16ab8f04a4f [formerly 0d1f5d191d677465c7c7093f5b87d22f667dc1cf] Former-commit-id: da0a7f9169999327139602874e65055940fb1132 Former-commit-id: 28edbe9
firemodels · Jul 13, 2016 · 12e9ab0 · 12e9ab0
2 parents 62445c6 + 7079740
commit 12e9ab0
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 7 deletions.
diff --git a/FDS_Compilation/Scripts/BUILDfds.bat b/FDS_Compilation/Scripts/BUILDfds.bat
@@ -52,17 +52,16 @@ if "%platform%" == "linux" (
     plink %linux_logon% %linux_svn_root%/SMV/scripts/run_command.sh FDS_Compilation/%mpi%intel_linux_64%type% clean_fds.sh
   )
   plink %linux_logon% %linux_svn_root%/SMV/scripts/run_command.sh FDS_Compilation/%mpi%intel_linux_64%type% make_fds.sh
+  pause
   goto eof
 )
 if "%platform%" == "osx" (
   if "%buildtype%" == "release" (
     plink %osx_logon% %linux_svn_root%/SMV/scripts/run_command.sh FDS_Compilation/%mpi%intel_osx_64%type% clean_fds.sh
   )
   plink %osx_logon% %linux_svn_root%/SMV/scripts/run_command.sh FDS_Compilation/%mpi%intel_osx_64%type% make_fds.sh
+  pause
   goto eof
 )
 
 :eof
-echo.
-echo compilation complete
-pause
diff --git a/Utilities/Scripts/BUILDutilprog.bat b/Utilities/Scripts/BUILDutilprog.bat
@@ -32,15 +32,14 @@ if "%platform%" == "windows" (
   goto eof
 )
 if "%platform%" == "linux" (
-  plink %linux_logon% %linux_svn_root%/SMV/scripts/run_command.sh Utilities/%prog%/intel_linux_64 make_%prog%.sh 
+  plink %linux_logon% %linux_svn_root%/SMV/scripts/run_command.sh Utilities/%prog%/intel_linux_64 make_%prog%.sh
+  pause
   goto eof
 )
 if "%platform%" == "osx" (
   plink %osx_logon% %linux_svn_root%/SMV/scripts/run_command.sh Utilities/%prog%/intel_osx_64 make_%prog%.sh
+  pause
   goto eof
 )
 
 :eof
-echo.
-echo compilation complete
-pause
diff --git a/Utilities/Scripts/UPDATE_latest_fds_onhost.csh b/Utilities/Scripts/UPDATE_latest_fds_onhost.csh
@@ -6,3 +6,4 @@ set      host=$2
 echo Updating the GIT repository $directory on $host to the latest revision
 echo
 ssh -q $host \( cd \~/$directory \; git checkout development \; git remote update \; git merge origin/development \; git merge firemodels/development  \)
+ssh -q $host \( cd \~/$directory \; git describe --dirty  \)
diff --git a/Utilities/Scripts/UPDATE_thishost.sh b/Utilities/Scripts/UPDATE_thishost.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+directory=$1
+host=$2
+
+echo Updating the GIT repository $directory on $host to the latest revision
+echo
+cd ~/$directory
+git checkout development
+git remote update
+git merge origin/development
+git merge firemodels/development 
+git describe --dirty 
diff --git a/Utilities/Scripts/clean_repo_sourcebuild.sh b/Utilities/Scripts/clean_repo_sourcebuild.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+CURDIR=`pwd`
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+GITROOT=$SCRIPTDIR/../..
+cd $GITROOT
+GITROOT=`pwd`
+
+cd $GITROOT/FDS_Source
+git clean -dxf
+cd $GITROOT/FDS_Compilation
+git clean -dxf
+
+cd $GITROOT/SMV/source
+git clean -dxf
+cd $GITROOT/SMV/Build
+git clean -dxf
+
+cd $CURDIR