summaryrefslogtreecommitdiffstats
path: root/windows
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2009-10-27 21:37:26 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2009-10-27 21:37:26 (GMT)
commit597739142f65d71f1ccf9eeeda6568b147e506b5 (patch)
treeb8794d6a67f14ad26a055afe0f98991e0172a6c9 /windows
parent3df83b192dbac78e5cb90a8933c24476cbc4b214 (diff)
downloadhdf5-597739142f65d71f1ccf9eeeda6568b147e506b5.zip
hdf5-597739142f65d71f1ccf9eeeda6568b147e506b5.tar.gz
hdf5-597739142f65d71f1ccf9eeeda6568b147e506b5.tar.bz2
[svn-r17758] Remove .NET references from windows text files and batch files
Diffstat (limited to 'windows')
-rwxr-xr-xwindows/hdf5bt.BAT14
-rwxr-xr-xwindows/hdf5build.BAT28
-rwxr-xr-xwindows/hdf5check.BAT11
3 files changed, 27 insertions, 26 deletions
diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index 0d5d6e8..c0b58a5 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -16,8 +16,9 @@ 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 . /vs8 Build HDF5 using Visual Studio 2005
rem . /vs9 Build HDF5 using Visual Studio 2008
-rem . /vs8 Note: Default is Visual Studio 2005
+rem . Note: Default is Visual Studio 2005
rem . /fort Build and test HDF5 with Fortran libraries
rem . /useenv Build HDF5 using compiler settings defined
rem . in the environment, rather than the IDE.
@@ -61,8 +62,9 @@ rem Print a help message
echo.
echo Usage: %~nx0 [OPTION]
echo.
+ echo. /vs8 Build HDF5 using Visual Studio 2005
echo. /vs9 Build HDF5 using Visual Studio 2008
- echo. /vs8 Note: Default is Visual Studio 2005
+ echo. Note: Default is Visual Studio 2005
echo. /fort Build and test HDF5 with Fortran libraries
echo. /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
echo. /ivf91 Note: Default is Intel Visual Fortran 9.1
@@ -77,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
diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT
index 598a0df..aee44b6 100755
--- a/windows/hdf5build.BAT
+++ b/windows/hdf5build.BAT
@@ -16,8 +16,9 @@ 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 . /vs8 Build HDF5 using Visual Studio 2005
rem . /vs9 Build HDF5 using Visual Studio 2008
-rem . /vs8 Note: Default is Visual Studio 2005
+rem . Note: Default is Visual Studio 2005
rem . /fort Build HDF5 with Fortran libraries
rem . /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
rem . /ivf91 Note: Default is Intel Visual Fortran 9.1
@@ -56,8 +57,9 @@ rem Print a help message
echo.
echo.Usage: %~nx0 [OPTION]
echo.
+ echo. /vs8 Build HDF5 using Visual Studio 2005
echo. /vs9 Build HDF5 using Visual Studio 2008
- echo. /vs8 Note: Default is Visual Studio 2005
+ echo. Note: Default is Visual Studio 2005
echo. /fort Build HDF5 with Fortran libraries using the
echo. Intel Fortran version specified, or 9.1 by default
echo. /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
@@ -73,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
@@ -293,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
)
)
@@ -366,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 ffa53f0..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 1 (
+ if not errorlevel 0 (
+ set /a nerrors=!nerrors!+1
+ ) else if errorlevel 1 (
set /a nerrors=!nerrors!+1
)
)