From 312d3d4b2e4f4954aeb752de2362ca88f3d86a16 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 27 Oct 2009 16:04:33 -0500 Subject: [svn-r17753] Remove .NET references from windows text files and batch files --- release_docs/INSTALL_Windows.txt | 89 ++--------- release_docs/INSTALL_Windows_From_Command_Line.txt | 18 +-- release_docs/INSTALL_Windows_Short_NET.TXT | 171 +-------------------- release_docs/INSTALL_Windows_Short_VS2005.TXT | 2 +- windows/hdf5bt.BAT | 18 +-- windows/hdf5build.BAT | 28 ++-- windows/hdf5check.BAT | 11 +- 7 files changed, 51 insertions(+), 286 deletions(-) diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt index 33b812b..5b03ef4 100644 --- a/release_docs/INSTALL_Windows.txt +++ b/release_docs/INSTALL_Windows.txt @@ -35,10 +35,9 @@ Contents: Preconditions: 1. Installed Microsoft Visual Studio. This document is written for Visual - Studio 2005, although we also support Visual Studio .NET 2003 and Visual - Studio 2008 as well. Most of the instructions are the same, although some - features are unsupported in Visual Studio .NET. For simple Visual Studio - .NET instructions, see the document INSTALL_Windows_NET.TXT. + Studio 2005, although we also support Visual Studio 2008 as well. Most + of the instructions are the same. We no longer support building HDF5 + using Microsoft Visual Studio .NET 2003. 2. (Optional) Installed Intel Compiler 9.1 or 10.1 if you want to build HDF5 Fortran libraries. @@ -68,24 +67,24 @@ Preconditions: c:\ (any drive) MyHDFstuff\ (any folder name) - 5. Download the hdf5-1.8.3 source code package and use 7zip or WinZip to + 5. Download the hdf5-1.8.4 source code package and use 7zip or WinZip to extract the HDF5 package into c:\MyHDFstuff. This creates a directory - called 'hdf5-1.8.3' under MyHDFstuff which contains several files and - directories. Rename "hdf5-1.8.3" to "hdf5". + called 'hdf5-1.8.4' under MyHDFstuff which contains several files and + directories. Rename "hdf5-1.8.4" to "hdf5". 6. HDF5 provide options to do in-memory compression within HDF5 library. Currently, two external compression libraries Zlib and Szip can be used with HDF5. 6.1 HDF5 uses Zlib version 1.2.3 for compression and Zlib is NOT - distributed with HDF5 library in 1.8.3 release. To use Zlib library, + distributed with HDF5 library in 1.8.4 release. To use Zlib library, you have to install your own Zlib DLL library or go to ftp://ftp.hdfgroup.org/lib-external/zlib/1.2/bin/windows to download the Zlib library. 6.2 HDF5 uses Szip version 2.1 for compression and Szip compression - software is provided with HDF5 products in 1.8.3 release. To use + software is provided with HDF5 products in 1.8.4 release. To use Szip 2.1 library, you can download Szip source codes and binaries from ftp://ftp.hdfgroup.org/lib-external/szip/2.1/bin/windows @@ -164,11 +163,8 @@ Notes: directory, run copy_hdf.bat first and then open all.sln under hdf5/windows/proj/all to start building process. - 2. Visual Studio 6.0 will not be supported in HDF5 1.8 or later release. - - 2. Users who prefer to use Visual Studio .NET can follow instructions in - INSTALL_Windows_Short_Net.txt. Note, however, HDF5 Fortran product - will not be supported in HDF5 1.8 release with Visual Studio .NET. + 2. Visual Studio 6.0 is no longer supported in HDF5 1.8 or later releases. + Visual Studio .NET is no longer support in HDF5 1.8.4 or later releases. 3. For users who want to quickly build HDF5 library or do not want to know HDF5 building and installation details, please read the @@ -940,7 +936,7 @@ project, you may choose one of the following two methods. 3. Choose the build configuration you would like to modify in the drop down menu labeled "Configuration:" - 4. Choose the "Linker" tab, anc select "General". + 4. Choose the "Linker" tab, and select "General". 5. In a text-area labeled with "Additional Library Directories:", add HDF5, Zlib, and Szip library files directories. For example: @@ -1123,7 +1119,6 @@ Notes: 1. For Intel Compiler users, Intel fortran Compiler 9.1 and 10.1 are 2. The Compaq Fortran Compiler is no longer supported for HDF5 1.8. 3. Intel Fortran 9.1 works only under Visual Studio 2005 environments. - Building Fortran libraries under Visual Studio .NET is unsupported. Visual Studio 2008 is supported only with Intel Fortran 10.1. 4. Parallel builds should be disabled. To do so: Go to Tools > @@ -1393,52 +1388,8 @@ Notes: 1. For Intel Compiler users, Intel fortran Compiler 9.1 and 10.1 are Notes: In Visual Studio 2005, the Single-threaded runtime libraries have been depreciated, and Multi-threaded is built by default. Therefore, no extra work needs to be done to build Multi-threaded libraries in Visual Studio - 2005. This section applies only to Visual Studio .NET - - Preconditions and Section I also apply to this section. Users who - want to build Multi-threaded version of HDF5 library, please read - those two sections carefully before go to the following part. - - -In Visual Studio .NET, users have the option of building multi-threaded -libraries by manipulating the project settings. Otherwise, the build process -is very much the same. Therefore, follow the instructions below, and refer -to the earlier sections of this document for details on building and testing. - - -1. Open the solution file - - Refer to previous sections to open the appropriate solution file, - depending on whether you are building with or without Fortran libraries. - -2. Change Project Settings - - a) In Visual Studio, go to "Projects->Properties". - - b) Make sure in the "Configuration" box, "Release" is selected. - - c) Select all of the static project file in the main window by holding - the "Ctrl" key while clicking the project file name. - - d) In the "Properties" window, choose "C/C++", and then "Code - Generation". - - e) Under "Run-time Library", "Single-Threaded" should appear. If it is - blank inside this box, check if you highlight some DLL project files. - - d) Change "Single-Threaded" to "Multithreaded". - - e) In the "Configuration" box, change to "Debug", keeping the static - projects selected. - - f) Under "Run-time Library", change "Debug Single-Threaded" to "Debug - Multithreaded". - -3. Build as Normal - - Refer to previous sections to build and test the HDF5 libraries - and tools. - + 2005. + ======================================================================== Section VIII: How To Build And Test HDF5 With Thread-Safe Feature @@ -1620,10 +1571,7 @@ to the earlier sections of this document for details on building and testing. Section IX: How to build HDF5 for 64-bit Windows ======================================================================== -HDF5 can be built for 64-bit Windows in Visual Studio 2005 or 2008. Visual -Studio .NET has very primative 64-bit support, but it is very difficult to -set up, and debugging is not supported. Therefore, we recommend all users -switch to Visual Studio 2005 or 2008 for 64-bit builds. +HDF5 can be built for 64-bit Windows in Visual Studio 2005 or 2008. Notes: @@ -1680,14 +1628,9 @@ some minor changes. Therefore, follow the build instructions above, with the following considerations: 1. Only Visual Studio 2005 and 2008 is currently supported on Windows Vista. - This is because Microsoft has ended their support for and .NET. - - 2. Building Fortran libraries has not been tested, and is therefore also - unsupported. You may attempt to build Fortran libraries following the - instructions above, but they should be considered experimental and used - for testing only. + This is because Microsoft has ended their support for .NET. - 3. Elevated security permissions are required to test the HDF5 libraries. + 2. Elevated security permissions are required to test the HDF5 libraries. This is because DLLs are installed in the system directory. To enable elevated security: diff --git a/release_docs/INSTALL_Windows_From_Command_Line.txt b/release_docs/INSTALL_Windows_From_Command_Line.txt index 053ae72..ede2133 100755 --- a/release_docs/INSTALL_Windows_From_Command_Line.txt +++ b/release_docs/INSTALL_Windows_From_Command_Line.txt @@ -4,12 +4,13 @@ ************************************************************************ Note: This instruction is written for users who would like to build HDF5 libraries and tools from the HDF5 source code package on command - line. + line. We no longer support building HDF5 using Microsoft Visual + Studio .NET 2003. Currently, we support: 1. Building and testing HDF5 C/C++/Fortran libraries on command line with - Microsoft Visual Studio .NET, 2005 or 2008 for 32- or 64-bit Windows. + Microsoft Visual Studio 2005 or 2008 for 32- or 64-bit Windows. For all other Windows development tools, HDF5 should be built in the development environment. Please refer to INSTALL_Windows.txt @@ -42,8 +43,7 @@ notes in INSTALL_Windows.txt before starting below procedures. C:\Program Files\Microsoft Visual Studio 8\Common7\Tools\ - If you are using Visual Studio .NET, replace "vs80comntools" with - "vs71comntools". For Visual Studio 2008, use "vs90comntools" + If you are using Visual Studio 2008, use "vs90comntools" 1.2 Run batch file copy_hdf.bat. @@ -81,13 +81,12 @@ notes in INSTALL_Windows.txt before starting below procedures. from command line. hdf5bt file takes the following options: - /vs7 Build HDF5 using Visual Studio .NET 2003 - Note: Default is Visual Studio 2005 + /vs8 Build HDF5 using Visual Studio 2005 /vs9 Build HDF5 using Visual Studio 2008 Note: Default is Visual Studio 2005 /fort Build and test HDF5 with Fortran libraries + /ivf91 Build HDF5 Fortran using Intel Visual Fortran 9.1 /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1 - Note: Default is Intel Visual Fortran 9.1 /useenv Build HDF5 using compiler settings defined in the environment, rather than the IDE. /? Help information @@ -112,13 +111,12 @@ notes in INSTALL_Windows.txt before starting below procedures. tools from command line. hdf55build takes the following options: - /vs7 Build HDF5 using Visual Studio .NET 2003 - Note: Default is Visual Studio 2005 + /vs8 Build HDF5 using Visual Studio 2005 /vs9 Build HDF5 using Visual Studio 2008 Note: Default is Visual Studio 2005 /fort Build HDF5 with Fortran libraries + /ivf91 Build HDF5 Fortran using Intel Visual Fortran 9.1 /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1 - Note: Default is Intel Visual Fortran 9.1 /useenv Build HDF5 using compiler settings defined in the environment, rather than the IDE. /? Help information diff --git a/release_docs/INSTALL_Windows_Short_NET.TXT b/release_docs/INSTALL_Windows_Short_NET.TXT index 1f2aa74..db144d1 100755 --- a/release_docs/INSTALL_Windows_Short_NET.TXT +++ b/release_docs/INSTALL_Windows_Short_NET.TXT @@ -3,176 +3,7 @@ * with Windows XP (Short Version) * ************************************************************************ -Notes: This short instruction is written for users who want to quickly - build HDF5 library and tools from the HDF5 source code package - with Microsoft Visual Studio .NET 2003 but do not want to know - HDF5 building and installation details on Windows XP. - - Visual Studio .NET 2003 is NOT supported on Windows Vista, as Microsoft - has ended their support. Also, we do not support building 64-bit - libraries or Fortran libraries with Visual Studio .NET 2003. If you - need any of these features, please upgrade to Visual STudio 2005. - - For detailed HDF5 build and install information, or if you have - trouble following any steps in the instructions, please refer to - INSTALL_Windows.txt for further information. - - For users who would like to build and test HDF5 package from the - command line, please refer to - INSATLL_Windows_From_Command_Line.txt. Note, however, that building - from the command line requires Visual Studio 2005. - -WARNINGS: - -Please read CAREFULLY about HDF5 build and install preconditions and -notes in INSTALL_Windows.txt before starting below procedures. - - -======================================================================== - Preconditions -======================================================================== - - 1. Set up path for external libraries and headers - - Skip this part if you don't want to use ANY compression features - provided by HDF5. Please do read Section V in INSTALL_Windows.txt. - - You have to read this part even if you want to only use Zlib - or Szip. You also need to read Section V in INSTALL_Windows.txt. - - Invoke Microsoft Visual C++ .Net and go to "Tools" and select - "Options". In the left pane of "Option" window poped up, - choose and expand "Projects", Click on "VC++ Directories". - In the right pane, Find the box "Show directories for", choose - "Include files", if you can not find your Zlib and Szip - header path - (for example, c:\zlib123\include, c:\szip\include) - from the directory list, add the header path - (c:\zlib123\include, c:\szip\include) to the - included directories. - - Find the box "Show directories for", choose "Library files", - If you cannot find your Zlib and Szip library path - (for example, c:\zlib123\dll, c:\szip\dll) - from the directory list, add the library path - (c:\zlib123\dll, c:\szip\dll) to the library directories. - -======================================================================== - Building HDF5 C/C++ Libraries with VS .NET -======================================================================== - - 1. Run batch file copy_hdf.bat - - Go to c:\MyHDFstuff\hdf5\windows and run copy_hdf.bat. This process will - copy all the necessary batch files, windows specific source codes and - text files saved under c:\MyHDFstuff\hdf5\windows directory to the - corresponding directories under hdf5. - - 2. Invoke Microsoft Visual Studio compiler - - Invoke Microsoft Visual Studio. From the main menu, go to "File" and - select the "Open Solution" option. Then open the - c:\MyHDFstuff\hdf5\windows_vnet\proj\all\all.dsw workspace. - - You should find Windows project files listed as "all", "big", etc. on the - left. - - 3. (Optional) Disable HDF5 C++ and High level C++ - - In HDF5 1.8, C++ and HL C++ libraries are built by default. To opt-out, - you must explicitly disable them. - - 4.1 Skip this step if you do want to build HDF5 High-Level C++ libraries - - Go to "Project" and select "Project Dependencies". Select "all", and - disable all of the following projects: - - hdf5_hl_cpp - hdf5_hl_cppdll - hl_test_table_cpp - hl_test_table_cppdll - - 4.2 Skip this step if you do want to build HDF5 High-Level libraries - - Go to "Project" and select "Project Dependencies". Select "all", and - disable all of the project files listed in the previous step, as well - as the following projects: - - hdf5_hl - hdf5_hldll - hl_test_image - hl_test_imagedll - hl_test_lite - hl_test_litedll - hl_test_table - hl_test_tabledll - hl_test_ds - hl_test_dsdll - hl_test_packet - hl_test_packetdll - - Click on "OK", From the main menu, choose "Build"-> "Build" or - "Rebuild ALL" to build both release and debug version of HDF5 - Libraries. - - - 4. Select "Build", then Select "Configuration Manager". - - 5.1 To build debug static libraries, debug multithreaded DLLs, and tests: - - In "Active Solution Configuration", select "Debug". Select "Close". - Select "Build" -> "Build Solution" or "Rebuild Solution" to build debug - version of project "all". - - 5.2 To build release static libraries, multithreaded DLLs and tests: - - In "Active Solution Configuration", select "Release". Select "Close". - Select "Build" -> "Build Solution" or "Rebuild Solution" to build release - version of project "all". - - Both debug and release versions must be built. - - Warning messages can be ignored. - -======================================================================== - Testing HDF5 C/C++ Libraries with VS .NET -======================================================================== - -HDF5 libraries and tools should be tested to make sure that they were -built correctly. c:\MyHDFstuff\hdf5\hdf5check.bat was provided to test -HDF5 libraries and tools. - -hdf5check.bat has the following options: - - hdf5check test HDF5 C library and tools only - - hdf5check enablecpp test HDF5 C/C++ libraries and tools - - -Invoke a command prompt window and run hdf5check with appropriate option. -Users are encouraged to pipe the test output into a file. You should find -no "*FAILED*" marks. - -If you want to test HDF5 libraries and tools one by one, please refer to -Section II, step 2 in INSTALL_Windows.txt. - - -======================================================================== - Installing HDF5 C/C++ Libraries -======================================================================== - -Run the batch file c:\MyHDFstuff\hdf5\installhdf5lib.bat to install -all HDF5 libraries and tools into c:\MyHDFstuff\hdf5\hdf5lib directory. - -======================================================================== - Building HDF5 Examples and Applications -======================================================================== - -Building HDF5 Examples is Optional. Please read Section II, step 4 and -the following part in INSTALL_Windows.txt for detailed information. - - - +Notes: We no longer support building HDF5 using Microsoft Visual Studio .NET 2003. ************************************************************************ Need further assistance, send email to help@hdfgroup.org diff --git a/release_docs/INSTALL_Windows_Short_VS2005.TXT b/release_docs/INSTALL_Windows_Short_VS2005.TXT index b668581..48e473d 100755 --- a/release_docs/INSTALL_Windows_Short_VS2005.TXT +++ b/release_docs/INSTALL_Windows_Short_VS2005.TXT @@ -139,7 +139,7 @@ notes in INSTALL_Windows.txt before starting below procedures. Warning messages can be ignored. ======================================================================== - Testing HDF5 C/C++ Libraries with VS .NET + Testing HDF5 C/C++ Libraries ======================================================================== HDF5 libraries and tools should be tested to make sure that they were 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 ) ) -- cgit v0.12