Merge pull request #3494 from gforney/development

fixes to some bundle scripts (so they will run on a mac when the mac is not accessible from blaze)

Former-commit-id: 0544836e05c567e98eda082cbd35fd0daac0a3a2 [formerly 87aab48c85e83c04f3f088e00b9a1f8c6d7460cc]
Former-commit-id: 385a5931523d3e55432c084eb9e5e535954ec2be
Former-commit-id: fa0e500

FDS_Compilation/Scripts/BUILDfdsmpilinux64.bat

@@ -24,5 +24,7 @@ set fdsdir=%linux_svn_root%/FDS_Compilation/mpi_intel_linux_64
 set scriptdir=%linux_svn_root%/FDS_Compilation/Scripts
 
 plink %svn_logon% %scriptdir%/MAKE_fds_onhost.sh %target% %fdsdir% %linux_hostname%
+plink %linux_logon% %scriptdir%/MAKEfdsweb.sh %linux_svn_root% mpi_intel_linux_64
+
 
 pause

FDS_Compilation/Scripts/BUILDfdsmpilinux64db.bat

@@ -23,6 +23,7 @@ set target=mpi_intel_linux_64_db
 set fdsdir=%linux_svn_root%/FDS_Compilation/mpi_intel_linux_64_db
 set scriptdir=%linux_svn_root%/FDS_Compilation/Scripts
 
-plink %svn_logon% %scriptdir%/MAKE_fds_onhost.sh %target% %fdsdir% %linux_hostname%
+plink %linux_logon% %scriptdir%/MAKEfdsweb.sh %linux_svn_root% mpi_intel_linux_64_db
+
 
 pause

FDS_Compilation/Scripts/BUILDfdsmpiosx64.bat

@@ -23,6 +23,7 @@ set target=mpi_intel_osx_64
 set fdsdir=%linux_svn_root%/FDS_Compilation/mpi_intel_osx_64
 set scriptdir=%linux_svn_root%/FDS_Compilation/Scripts
 
-plink %svn_logon% %scriptdir%/MAKE_fds_onhost.sh %target% %fdsdir% %osx_hostname%
+plink %osx_logon% %scriptdir%/MAKEfdsweb.sh %linux_svn_root% mpi_intel_osx_64
+
 
 pause

FDS_Compilation/Scripts/BUILDfdsmpiosx64db.bat

@@ -23,6 +23,6 @@ set target=mpi_intel_osx_64_db
 set fdsdir=%linux_svn_root%/FDS_Compilation/mpi_intel_osx_64_db
 set scriptdir=%linux_svn_root%/FDS_Compilation/Scripts
 
-plink %svn_logon% %scriptdir%/MAKE_fds_onhost.sh %target% %fdsdir% %osx_hostname%
+plink %osx_logon% %scriptdir%/MAKEfdsweb.sh %linux_svn_root% mpi_intel_osx_64_db
 
 pause

FDS_Compilation/Scripts/BUILDfdsosx64.bat

@@ -23,6 +23,6 @@ set target=intel_osx_64
 set fdsdir=%linux_svn_root%/FDS_Compilation/intel_osx_64
 set scriptdir=%linux_svn_root%/FDS_Compilation/Scripts
 
-plink %svn_logon% %scriptdir%/MAKE_fds_onhost.sh %target% %fdsdir% %osx_hostname%
+plink %osx_logon% %scriptdir%/MAKE_fds_onhost.sh %target% %fdsdir% %osx_hostname%
 
 pause

FDS_Compilation/Scripts/BUILDfdsosx64dv.bat

@@ -23,6 +23,6 @@ set target=intel_osx_64_dv
 set fdsdir=%linux_svn_root%/FDS_Compilation/intel_osx_64_dv
 set scriptdir=%linux_svn_root%/FDS_Compilation/Scripts
 
-plink %svn_logon% %scriptdir%/MAKE_fds_onhost.sh %target% %fdsdir% %osx_hostname%
+plink %osx_logon% %scriptdir%/MAKE_fds_onhost.sh %target% %fdsdir% %osx_hostname%
 
 pause

FDS_Compilation/Scripts/MAKEfdsweb.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+SVNROOT=~/$1
+DIR=$2
+cd $SVNROOT/FDS_Compilation/$DIR
+rm -f *.o *.mod *.i90
+./make_fds.sh

FDS_Compilation/Scripts/Update_FDS_latest_svn.bat

@@ -33,6 +33,6 @@ plink %svn_logon% %scriptdir%/UPDATE_latest_fds_onhost.csh  %linux_fdsdir% %linu
 
 echo.
 echo Updating %linux_fdsdir% in the OSX repository on %osx_hostname% to the latest revision
-plink %svn_logon% %scriptdir%/UPDATE_latest_fds_onhost.csh  %linux_fdsdir% %osx_hostname%
+plink %osx_logon% %scriptdir%/UPDATE_latest_fds_onhost.csh  %linux_fdsdir% %osx_hostname%
 
 pause

FDS_Compilation/Scripts/ssh_command.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+host=$1
+dir=$2
+command=$3
+arg=$4
+#ssh -q $host bash -lc $dir/$command $arg
+ssh -q $host $dir/$command $arg

Utilities/Scripts/BUNDLE_osx64.bat

@@ -19,16 +19,16 @@ Rem location of batch files used to set up Intel compilation environment
 call %envfile%
 
 set bundledir=FDS_%fds_version%-SMV_%smv_version%_osx64
-plink %svn_logon% %linux_svn_root%/Utilities/Scripts/BUNDLE_osx64.csh %linux_svn_root% %bundledir% %osx_hostname% %fds_edition%  %fds_version% %smv_version% %fdssmv_major_version%
+plink %osx_logon% %linux_svn_root%/Utilities/Scripts/BUNDLE_osx64.csh %linux_svn_root% %bundledir% %osx_hostname% %fds_edition%  %fds_version% %smv_version% %fdssmv_major_version%
 
 set manifest=%svn_root%\Utilities\uploads\manifest_osx_64.html
 echo Downloading manifest
 erase %manifest%
-pscp %svn_logon%:manifest_osx_64.html %manifest%
+pscp %osx_logon%:manifest_osx_64.html %manifest%
 start explorer %manifest%
 
 echo Downloading compressed archive to:
 echo   %svn_root%\Utilities\uploads\%bundledir%.sh
-pscp %svn_logon%:%linux_svn_root%/Utilities/uploads/%bundledir%.sh %svn_root%/Utilities/uploads/.
+pscp %osx_logon%:%linux_svn_root%/Utilities/uploads/%bundledir%.sh %svn_root%/Utilities/uploads/.
 
 pause

Utilities/Scripts/INSTALL_osx64.bat

@@ -21,5 +21,5 @@ call %envfile%
 
 set exe=FDS_%fds_version%-SMV_%smv_version%_%platform%.sh
 
-plink %svn_logon% %linux_svn_root%/SMV/scripts/ssh_command2.sh %osx_hostname% %linux_svn_root%/Utilities/uploads %exe% y
+plink %osx_logon% %linux_svn_root%/SMV/scripts/ssh_command2.sh %osx_hostname% %linux_svn_root%/Utilities/uploads %exe% y
 pause

Utilities/Scripts/ZIP_FDS_Intel_OSX_64.bat

@@ -27,12 +27,12 @@ mkdir %fdsrootdir%
 
 echo.
 echo moving 64 bit OSX fds files to an interim directory
-plink %svn_logon% %scriptdir%/bundle_osx_64.csh %linux_svn_root% %linux_svn_root%
+plink %osx_logon% %scriptdir%/bundle_osx_64.csh %linux_svn_root% %linux_svn_root%
 
 echo.
 echo downloading 64 bit OSX fds files
-pscp %svn_logon%:%scriptdir%/uploads/fds_intel_osx_64 %fdsrootdir%\fds_intel_osx_64
-Rem pscp %svn_logon%:%scriptdir%/uploads/fds_mpi_intel_osx_64 %fdsrootdir%\fds_mpi_intel_osx_64
+pscp %osx_logon%:%scriptdir%/uploads/fds_intel_osx_64 %fdsrootdir%\fds_intel_osx_64
+Rem pscp %osx_logon%:%scriptdir%/uploads/fds_mpi_intel_osx_64 %fdsrootdir%\fds_mpi_intel_osx_64
 
 echo.
 echo winzipping distribution directory