Merge pull request #45 from michaeltryby/release

Release

Author: michaeltryby

scripts/before-nrtest.cmd

@@ -2,7 +2,7 @@
 ::  before-test.cmd - Stages test and benchmark files for epanet nrtest
 ::
 ::  Date Created: 4/3/2018
-::  Date Updated: 9/18/2019
+::  Date Updated: 10/9/2019
 ::
 ::  Author: Michael E. Tryby
 ::          US EPA - ORD/NRMRL
@@ -14,6 +14,7 @@
 ::  Environment Variables:
 ::    BUILD_HOME - defaults to "build"
 ::    TEST_HOME  - defaults to "nrtests"
+::    PLATFORM
 ::
 ::  Arguments:
 ::    1 - (RELEASE_TAG) release tag for benchmark version (defaults to latest tag)
@@ -26,6 +27,14 @@
 
 ::@echo off
 
+:: determine project directory
+set "CUR_DIR=%CD%"
+set "SCRIPT_HOME=%~dp0"
+cd %SCRIPT_HOME%
+cd ..
+
+setlocal
+
 
 :: check that dependencies are installed
 where curl > nul
@@ -34,12 +43,6 @@ where 7z > nul
 if %ERRORLEVEL% neq 0 ( echo "ERROR: 7zip not installed" & exit /B 1 )
 
 
-:: determine project directory
-set "CUR_DIR=%CD%"
-set "SCRIPT_HOME=%~dp0"
-cd %SCRIPT_HOME%
-cd ..
-
 :: set URL to github repo with test files
 set "EPANET_NRTESTS_URL=https://github.com/michaeltryby/epanet-nrtests"
 
@@ -51,16 +54,7 @@ if [%1] == [] (set "RELEASE_TAG="
 :: check BUILD_HOME and TEST_HOME and apply defaults
 if not defined BUILD_HOME ( set "BUILD_HOME=build" )
 if not defined TEST_HOME ( set "TEST_HOME=nrtests" )
-
-
-:: determine platform from CmakeCache.txt file
-for /F "tokens=*" %%f in ( 'findstr CMAKE_SHARED_LINKER_FLAGS:STRING %BUILD_HOME%\CmakeCache.txt' ) do (
-  for /F "delims=: tokens=3" %%m in ( 'echo %%f' ) do (
-    if "%%m" == "X86" ( set "PLATFORM=win32" ) else if "%%m" == "x64" ( set "PLATFORM=win64" )
-  )
-)
-if not defined PLATFORM ( echo "ERROR: PLATFORM could not be determined" & exit /B 1 )
-
+if not defined PLATFORM ( echo "ERROR: PLATFORM must be defined" & exit /B 1 )
 
 
 echo INFO: Staging files for regression testing
@@ -99,15 +93,19 @@ curl -fsSL -o benchmark.zip %BENCHFILES_URL%
 7z e benchmark.zip -o. manifest.json -r > nul
 
 
+:: set up symlinks for tests directory
+mklink /D .\tests .\epanet-nrtests-%RELEASE_TAG:~1%\public > nul
+
+
+endlocal
+
+
 :: determine REF_BUILD_ID from manifest file
-for /F delims^=^"^ tokens^=4 %%d in ( 'findstr %PLATFORM% manifest.json' ) do (
+for /F delims^=^"^ tokens^=4 %%d in ( 'findstr %PLATFORM% %TEST_HOME%\manifest.json' ) do (
   for /F "tokens=2" %%r in ( 'echo %%d' ) do ( set "REF_BUILD_ID=%%r" )
 )
 if not defined REF_BUILD_ID ( echo "ERROR: REF_BUILD_ID could not be determined" & exit /B 1 )
 
 
-:: set up symlinks for tests directory
-mklink /D .\tests .\epanet-nrtests-%RELEASE_TAG:~1%\public > nul
-
 :: return to users current directory
 cd %CUR_DIR%

scripts/make.cmd

@@ -2,7 +2,7 @@
 ::  make.cmd - builds epanet
 ::
 ::  Date Created: 9/18/2019
-::  Date Updated:
+::  Date Updated: 10/9/2019
 ::
 ::  Author: Michael E. Tryby
 ::          US EPA - ORD/NRMRL
@@ -19,29 +19,36 @@
 ::
 ::  Optional Arguments:
 ::    /g ("GENERATOR") defaults to "Visual Studio 15 2017"
-::    /t builds and runs unit tests
+::    /t builds and runs unit tests (requires Boost)
 ::
 
-::echo off
-setlocal EnableDelayedExpansion
 
+::echo off
 
-:: check for requirements
-where cmake > nul
-if %ERRORLEVEL% NEQ 0 ( echo "ERROR: cmake not installed" & exit /B 1 )
 
+:: set global defaults
+set "BUILD_HOME=build"
+set "TEST_HOME=nrtests"
+set "PLATFORM=win32"
 
 :: determine project directory
 set "CUR_DIR=%CD%"
 set "SCRIPT_HOME=%~dp0"
 cd %SCRIPT_HOME%
 cd ..
 
+:: check for requirements
+where cmake > nul
+if %ERRORLEVEL% NEQ 0 ( echo "ERROR: cmake not installed" & exit /B 1 )
+
+
+setlocal EnableDelayedExpansion
+
 
 echo INFO: Building epanet  ...
 
-:: set defaults
-set "BUILD_HOME=build"
+
+:: set local defaults
 set "GENERATOR=Visual Studio 15 2017"
 set "TESTING=0"
 
@@ -91,5 +98,17 @@ if %TESTING% EQU 1 (
 )
 
 
+endlocal
+
+
+:: determine platform from CmakeCache.txt file
+for /F "tokens=*" %%f in ( 'findstr CMAKE_SHARED_LINKER_FLAGS:STRING %BUILD_HOME%\CmakeCache.txt' ) do (
+  for /F "delims=: tokens=3" %%m in ( 'echo %%f' ) do (
+    if "%%m" == "X86" ( set "PLATFORM=win32" ) else if "%%m" == "x64" ( set "PLATFORM=win64" )
+  )
+)
+if not defined PLATFORM ( echo "ERROR: PLATFORM could not be determined" & exit /B 1 )
+
+
 :: return to users current dir
 cd %CUR_DIR%