diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2009-10-27 21:04:33 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2009-10-27 21:04:33 (GMT) |
commit | 312d3d4b2e4f4954aeb752de2362ca88f3d86a16 (patch) | |
tree | 5232aa9f790db65273df56a0f46b36639b63a4f3 /windows | |
parent | 5fd05738364305c62b9ce9b380b62a5abcd68323 (diff) | |
download | hdf5-312d3d4b2e4f4954aeb752de2362ca88f3d86a16.zip hdf5-312d3d4b2e4f4954aeb752de2362ca88f3d86a16.tar.gz hdf5-312d3d4b2e4f4954aeb752de2362ca88f3d86a16.tar.bz2 |
[svn-r17753] Remove .NET references from windows text files and batch files
Diffstat (limited to 'windows')
-rwxr-xr-x | windows/hdf5bt.BAT | 18 | ||||
-rwxr-xr-x | windows/hdf5build.BAT | 28 | ||||
-rwxr-xr-x | windows/hdf5check.BAT | 11 |
3 files changed, 25 insertions, 32 deletions
diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT index b32a1bb..e72880c 100755 --- a/windows/hdf5bt.BAT +++ b/windows/hdf5bt.BAT @@ -16,8 +16,7 @@ rem access to either file, you may request a copy from help@hdfgroup.org. rem File Name: hdf5bt.bat
rem This batch file is used to build and test HDF5 Libraries and Tools.
rem This batch file takes the following options:
-rem . /vs7 Build HDF5 using Visual Studio .NET 2003
-rem . /vs8 Note: Default is Visual Studio 2005
+rem . /vs8 Build HDF5 using Visual Studio 2005
rem . /vs9 Build HDF5 using Visual Studio 2008
rem . Note: Default is Visual Studio 2005
rem . /fort Build and test HDF5 with Fortran libraries
@@ -63,8 +62,7 @@ rem Print a help message echo.
echo Usage: %~nx0 [OPTION]
echo.
- echo. /vs7 Build HDF5 using Visual Studio .NET 2003
- echo. /vs8 Note: Default is Visual Studio 2005
+ echo. /vs8 Build HDF5 using Visual Studio 2005
echo. /vs9 Build HDF5 using Visual Studio 2008
echo. Note: Default is Visual Studio 2005
echo. /fort Build and test HDF5 with Fortran libraries
@@ -81,13 +79,7 @@ rem Parse through the parameters sent to file, and set appropriate variables :parse_params
for %%a in (%*) do (
- if "%%a"=="/vs7" (
- rem Visual Studio .NET not supported
- rem Set errorlevel 1 and send to help
- call :help
- exit /b 1
-
- ) else if "%%a"=="/vs8" (
+ if "%%a"=="/vs8" (
rem Use Visual Studio 2005 to build
set hdf5_vs2005=true
@@ -227,8 +219,8 @@ rem This is where the magic happens :main
call :parse_params %*
- if %errorlevel% neq 0 (
- if %errorlevel% equ 1 (
+ if not errorlevel 0 (
+ if errorlevel 1 (
rem This isn't an error case-- this means /? was specified. Simply
rem quit.
goto end
diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT index 564b702..2b35265 100755 --- a/windows/hdf5build.BAT +++ b/windows/hdf5build.BAT @@ -16,8 +16,7 @@ rem access to either file, you may request a copy from helphdfgroup.org. rem File Name: hdf5build.bat
rem This batch file is used to build HDF5 Libraries and Tools.
rem This batch file takes the following options:
-rem . /vs7 Build HDF5 using Visual Studio .NET 2003
-rem . /vs8 Note: Default is Visual Studio 2005
+rem . /vs8 Build HDF5 using Visual Studio 2005
rem . /vs9 Build HDF5 using Visual Studio 2008
rem . Note: Default is Visual Studio 2005
rem . /fort Build HDF5 with Fortran libraries
@@ -58,8 +57,7 @@ rem Print a help message echo.
echo.Usage: %~nx0 [OPTION]
echo.
- echo. /vs7 Build HDF5 using Visual Studio .NET 2003
- echo. /vs8 Note: Default is Visual Studio 2005
+ echo. /vs8 Build HDF5 using Visual Studio 2005
echo. /vs9 Build HDF5 using Visual Studio 2008
echo. Note: Default is Visual Studio 2005
echo. /fort Build HDF5 with Fortran libraries using the
@@ -77,13 +75,7 @@ rem Parse through the parameters sent to file, and set appropriate variables :parse_params
for %%a in (%*) do (
- if "%%a"=="/vs7" (
- rem Visual Studio .NET 2003 not supported
- rem Set errorlevel 1 and send to help
- call :help
- exit /b 1
-
- ) else if "%%a"=="/vs8" (
+ if "%%a"=="/vs8" (
rem Use Visual Studio 2005
set hdf5_vs2005=true
@@ -297,16 +289,15 @@ rem Build the HDF5 libraries. By default, C and C++ libraries are built. rem Build both debug and release versions
for %%a in (debug release) DO (
echo.Building %hdf5_platform% %%a libraries...
- rem Only add hdf5_platform if not using Visual Studio .NET, because it doesn't like the syntax
- if defined hdf5_vnet (
- devenv %hdf5_sln% %ccflags% /rebuild %%a
- ) else (
- devenv %hdf5_sln% %ccflags% /rebuild "%%a|%hdf5_platform%"
- )
+ devenv %hdf5_sln% %ccflags% /rebuild "%%a|%hdf5_platform%"
if not errorlevel 0 (
set /a nerrors=!nerrors!+1
echo. Building %%a FAILED
exit /b 1
+ ) else if errorlevel 1 (
+ set /a nerrors=!nerrors!+1
+ echo. Building %%a FAILED
+ exit /b 1
)
)
@@ -370,6 +361,9 @@ rem This is where the magic happens if not errorlevel 0 (
echo.Error building HDF5 libraries!
goto error
+ ) else if errorlevel 1 (
+ echo.Error building HDF5 libraries!
+ goto error
)
if "%nerrors%"=="0" (
diff --git a/windows/hdf5check.BAT b/windows/hdf5check.BAT index dc0bb70..c955241 100755 --- a/windows/hdf5check.BAT +++ b/windows/hdf5check.BAT @@ -82,7 +82,12 @@ rem %2 - "dll" or nothing rem Only add our parameters for batch scripts.
call !hdf5_test_%%a_test:.bat= %1 %2!
rem Exit early if test fails.
- if errorlevel 1 (
+ if not errorlevel 0 (
+ set /a nerrors=!nerrors!+1
+ echo. Testing %%a ^(%1 %2^) FAILED
+ echo.**==**==**==**==**==**==**==**==**==**
+ exit /b 1
+ ) else if errorlevel 1 (
set /a nerrors=!nerrors!+1
echo. Testing %%a ^(%1 %2^) FAILED
echo.**==**==**==**==**==**==**==**==**==**
@@ -127,7 +132,9 @@ rem on it for sending parameters. --SJW 9/6/07 for %%a in (debug release) do (
set hdf5_config=%%a %%b
call :run_tests !hdf5_config:nodll=!
- if !errorlevel! neq 0 (
+ if not errorlevel 0 (
+ set /a nerrors=!nerrors!+1
+ ) else if errorlevel 1 (
set /a nerrors=!nerrors!+1
)
)
|