Merge pull request #680 from gforney/master

bundle scripts: add build step to bundle script for building set_path…
firemodels · Apr 25, 2017 · b4f7b25 · b4f7b25
2 parents 3b81227 + f937a9c
commit b4f7b25
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/Utilities/for_bundle/scripts/BUNDLE_cfast.bat b/Utilities/for_bundle/scripts/BUNDLE_cfast.bat
@@ -10,21 +10,37 @@ set distname=cfast7
 :: VVVVVVVVVVVVVVVVV shouldn't need to change anything below VVVVVVVVVVVVVVV
 
 set CURDIR=%CD%
+
+:: define cfast_root
+
 cd ..\..\..
-set git_root=%CD%
+set cfast_root=%CD%
+
+:: define smv_root
+
+cd ..\smv
+set smv_root=%CD%
 cd %CURDIR%
-set git_drive=c:
 
+set git_drive=c:
 %git_drive%
 
-set DISTDIR=%git_root%\Utilities\for_bundle\scripts\BUNDLEDIR\%installerbase%
-set bundleinfo=%git_root%\Utilities\for_bundle\scripts\bundleinfo
+set DISTDIR=%cfast_root%\Utilities\for_bundle\scripts\BUNDLEDIR\%installerbase%
+set bundleinfo=%cfast_root%\Utilities\for_bundle\scripts\bundleinfo
 
 call Create_Install_Files.bat
 
-copy "%bundleinfo%\wrapup_cfast_install.bat" "%DISTDIR%\wrapup_cfast_install.bat"
-copy "%userprofile%\FIRE-LOCAL\repo_exes\Shortcut.exe"                 "%DISTDIR%\Shortcut.exe"
-copy "%userprofile%\FIRE-LOCAL\repo_exes\set_path.exe"                 "%DISTDIR%\set_path.exe"
+copy "%bundleinfo%\wrapup_cfast_install.bat"           "%DISTDIR%\wrapup_cfast_install.bat"
+
+:: copy Short_cut
+
+::copy "%bundleinfo%\Shortcut.exe"                    "%DISTDIR%\Shortcut.exe"
+copy "%userprofile%\FIRE-LOCAL\repo_exes\Shortcut.exe" "%DISTDIR%\Shortcut.exe"
+
+:: copy set_path
+
+cd "%smv_root%\Build\set_path\ms_win_64
+copy set_path64.exe"                                   "%DISTDIR%\set_path.exe"
 
 cd %DISTDIR%
 wzzip -a -r -P ..\%installerbase%.zip * ..\SMV6 > Nul
@@ -41,8 +57,8 @@ echo Press Setup to begin installation. > %bundleinfo%\main.txt
 if exist %installerbase%.exe erase %installerbase%.exe
 wzipse32 %installerbase%.zip -runasadmin -a %bundleinfo%\about.txt -st"cfast 7 Setup" -d "c:\Program Files\firemodels\%distname%" -c wrapup_cfast_install.bat
 
-echo copying %installerbase%.exe to %git_root%\Utilities\uploads\cftest.exe"
-copy %installerbase%.exe %git_root%\Utilities\uploads\cftest.exe"
+echo copying %installerbase%.exe to %cfast_root%\Utilities\uploads\cftest.exe"
+copy %installerbase%.exe %cfast_root%\Utilities\uploads\cftest.exe"
 
 
 echo.

diff --git a/Utilities/for_bundle/scripts/Create_Install_Files.bat b/Utilities/for_bundle/scripts/Create_Install_Files.bat
@@ -1,7 +1,8 @@
 @echo off
 
-set bindir=%git_root%\Utilities\for_bundle\Bin
-set docdir=%git_root%\Manuals
+set bindir=%cfast_root%\Utilities\for_bundle\Bin
+set docdir=%cfast_root%\Manuals
+set CURDIR2=%CD%
 
 echo.
 echo ***making directories
@@ -61,6 +62,14 @@ call :COPY  %bindir%\upholstered_chair.o      %DISTDIR%\
 call :COPY  %bindir%\wardrobe.o               %DISTDIR%\
 call :COPY  %bindir%\wood_wall.o              %DISTDIR%\
 
+echo.
+echo ***Building set_path
+echo.
+
+cd "%smv_root%\Build\set_path\ms_win_64
+call make_set_path
+cd %CURDIR2%
+
 echo.
 echo ***Copying CFAST example files
 echo.