[svn-r20081] Update USING file for changes to examples batch files and added missing instructions.

2011-02-11 12:53:15 -05:00
parent c371688afe
commit fbaf56d32d
7 changed files with 102 additions and 155 deletions
--- a/release_docs/USING_Windows.txt
+++ b/release_docs/USING_Windows.txt
@@ -67,26 +67,61 @@ Preconditions:

      Szip compression feature inside HDF5 is enabled by default.

-   8. Set up path for libraries and headers
+   8. Define the following environment variables:
+
+        HDF5_EXT_ZLIB
+        HDF5_EXT_SZIP
+
+      In this section, Zlib and Szip compression packages are assumed to be 
+      used.  Please read Section V as well as this section if you do not want 
+      to use compression feature inside HDF5.
+
+      To define these environment variables:
+
+      Click "Start", click "Control Panel", and then double-click "System".  
+      On the "Advanced" tab, click "Environment Variables".
+
+      If you are logged on as administrator to the local computer AND want to 
+      let all other users use these two environment variables, click "New" 
+      under "System Variables" box; otherwise, click "New" under "User 
+      Variables" box.
+
+      In the New Variable window, set "Variable name" as HDF5_EXT_ZLIB and 
+      "Variable value" as zlib1.lib, then click OK.
+
+      Similarly, you can set:
+
+      HDF5_EXT_SZIP environment variable as szip.lib
+
+      Notes:
+
+         a. You will have to close and reopen running programs for the new 
+            environment variable settings to take effect.
+
+         b. c:\zlib\zlib1.dll and c:\szip\dll\szip.dll should be copied 
+            into a location that the application can find.
+
+   9. Set up path for libraries and headers

      Invoke Microsoft Visual Studio and go to "Tools" and select "Options", 
      find "Projects", and then "VC++ Directories".
      
-      8.1 If you are building on 64-bit Windows, find the "Platform" dropdown
+      9.1 If you are building on 64-bit Windows, find the "Platform" dropdown
          and select "x64".

-      8.2 Find the box "Show directories for", choose "Include files", if you 
+      9.2 Find the box "Show directories for", choose "Include files", if you 
          can not find your HDF5 header path (for example, 
          c:\MyHDFstuff\include) from the directory list, add the 
          header path (c:\MyHDFstuff\include) to the included 
          directories.

-      8.3 Find the box "Show directories for", choose "Library files".  If you 
+      9.3 Find the box "Show directories for", choose "Library files".  If you 
          cannot find your HDF5 library path (for example, 
-          c:\MyHDFstuff\dll) from the directory list, add the library 
-          path (c:\MyHDFstuff\dll) to the library directories.
+          c:\MyHDFstuff\dll for dynamic-shared and c:\MyHDFstuff\lib for static) 
+          from the directory list, add the library 
+          path (c:\MyHDFstuff\dll or c:\MyHDFstuff\lib) to the library directories.
          
-      8.4 If building Fortran applications, you will also need to setup the path
+      9.4 If building Fortran applications, you will also need to setup the path
          for the Intel Fortran compiler.  Please see Section VI.

 Notes:
@@ -98,6 +133,8 @@ Notes:
   2. For Fortran users, Intel Fortran Compiler 10.1 is currently supported
      -- please see Section VI. Intel Compiler 11.1 can be used but the project files
      must be upgraded within the Visual Studio IDE. 
+      
+   3. The szip and zlib dlls must be in the PATH for using the tools (including static).
     

 ========================================================================
@@ -186,19 +223,13 @@ To build and test HDF5 C examples:

   2. Select "Build", and "Configuration Manager".

-       2.1 To build debug versions of C examples:
-       
-          In "Active Solution Configuration", select "Debug". Select "Close". 
-          Select "Build" -> "Build Solution" or "Rebuild Solution" to build 
-          debug version of project "allexamples".
-
-       2.2 To build release versions of C examples.
+      To build release versions of C examples.
       
          In "Active Solution Configuration", select "Release". Select "Close". 
          Select "Build" -> "Build Solution" or "Rebuild Solution" to build 
          release version of project "allexamples".

-      When the debug or release build is done, there should be the following 
+      When the release build is done, there should be the following 
      subdirectories in c:\MyHDFstuff\hdf5examples\examples\

          attributetest
@@ -220,26 +251,20 @@ To build and test HDF5 C examples:

   3. Invoke a command prompt window and run the batch file InstallExamples.bat 
      which resides in the top level directory (c:\MyHDFstuff\hdf5examples).  This file 
-      creates 4 new directories, examplesREL, examplesRELDLL, examplesDBG, and 
-      examplesDBGDLL, in the c:\MyHDFstuff\hdf5examples\examples directory and places 
-      all the executables in it.  If one of the release or debug versions of the examples is not 
-      built before this step is done, messages about files not found can be
-      ignored.
+      creates new directories, examplesREL, examplesRELDLL in the 
+      c:\MyHDFstuff\hdf5examples\examples directory and places 
+      all the executables in it.

   4. We provide a batch file named testExamples.bat and an expected examples 
      tests output file named testExamples_exp_output.txt in 
      c:\MyHDFstuff\hdf5\examples directory for you to test HDF5 C examples.

-      testExamples.bat batch file has 4 options:
+      testExamples.bat batch file has options:

         testExamples release     -- for release version

         testExamples release dll -- for release DLL version

-         testExamples debug       -- for debug version
-
-         testExamples debug dll   -- for debug DLL version
-
      Invoke a command prompt and run testExamples.bat with appropriate options.
      You should get "All HDF5 C examples tests passed." when the C examples are
      built successfully.  Otherwise, the difference between the expected 
@@ -256,19 +281,13 @@ To build and test HDF5 C++ examples:

   2. Select "Build", and "Configuration Manager".

-       2.1 To build release versions of C examples.
+       To build release versions of C examples.
       
          In "Active Solution Configuration", select "Release". Select "Close". 
          Select "Build" -> "Build Solution" or "Rebuild Solution" to build 
          release version of project "allcppexamples".

-       2.2 To build debug versions of C examples:
-       
-          In "Active Solution Configuration", select "Debug". Select "Close". 
-          Select "Build" -> "Build Solution" or "Rebuild Solution" to build 
-          debug version of project "allcppexamples".
-
-   When the debug build or release build is done, there should be the following 
+   When the release build is done, there should be the following 
   subdirectories in c:\MyHDFstuff\hdf5examples\c++\examples\

          chunks
@@ -288,27 +307,21 @@ To build and test HDF5 C++ examples:

   3. Invoke a command prompt window and run the batch file 
      InstallcppExamples.bat which resides in the top level directory
-      (c:\MyHDFstuff\hdf5examples).  This file creates 4 new directories,
-      cppexamplesREL, cppexamplesRELDLL, cppexamplesDBG, and cppexamplesDBGDLL, 
-      in the c:\MyHDFstuff\hdf5examples\c++\examples directory and places all 
-      the executables in it.  If one of the release or debug versions of the 
-      examples is not built before this step is done, messages about files not 
-      found can be ignored.
+      (c:\MyHDFstuff\hdf5examples).  This file creates new directories,
+      cppexamplesREL, cppexamplesRELDLL in the 
+      c:\MyHDFstuff\hdf5examples\c++\examples directory and places all 
+      the executables in it.

   4. We provide a batch file named testcppExamples.bat in
      c:\MyHDFstuff\hdf5examples\c++\examples directory for you to test HDF5 C++ 
      examples.

-      testcppExamples.bat batch file has 4 options:
+      testcppExamples.bat batch file has options:

         testcppExamples release     -- for release version

         testcppExamples release dll -- for release DLL version

-         testcppExamples debug       -- for debug version
-
-         testcppExamples debug dll   -- for debug DLL version
-
      Invoke a command prompt and run testcppExamples.bat with appropriate 
      options.  You should get "All HDF5 C++ examples tests passed." when the 
      C++ examples are built successfully.  Otherwise, the difference between 
@@ -326,19 +339,13 @@ To build and test HDF5 High Level C examples:

   2. Select "Build", and "Configuration Manager".

-       2.1 To build debug versions of C examples:
-       
-          In "Active Solution Configuration", select "Debug". Select "Close". 
-          Select "Build" -> "Build Solution" or "Rebuild Solution" to build 
-          debug version of project "allhlcexamples".
-
-       2.2 To build release versions of C examples.
+       To build release versions of C examples.
       
          In "Active Solution Configuration", select "Release". Select "Close". 
          Select "Build" -> "Build Solution" or "Rebuild Solution" to build 
          release version of project "allhlcexamples".

-      When the debug or release build is done, binaries will be built in the
+      When the release build is done, binaries will be built in the
      following subdirectories of c:\MyHDFstuff\hdf5\examples\

          ex_image[1-2](dll)
@@ -349,18 +356,15 @@ To build and test HDF5 High Level C examples:

   3. Invoke a command prompt and run the batch file Install_hlcexamples.bat 
      which resides in the top level directory (c:\MyHDFstuff\hdf5examples).  This file 
-      creates 4 new directories, HLCexamplesRELEASE, HLCexamplesRELEASEDLL, 
-      HLCexamplesDEBUG, and HLCexamplesDEBUGDLL, in the 
+      creates new directories, HLCexamplesRELEASE, HLCexamplesRELEASEDLL in the 
      c:\MyHDFstuff\hdf5examples\hl\examples directory and places all the executables in
-      it. If one of the release or debug versions of the examples is not 
-      built before this step is done, messages about files not found can be
-      ignored.
+      it.

   4. We provide a batch file named test_hl_cexamples.bat in 
      c:\MyHDFstuff\hdf5examples\hl\examples directory for you to test HDF5 high level C
      examples.

-      test_hl_cexamples.bat batch file has 4 options:
+      test_hl_cexamples.bat batch file has options:

         Options                        purpose

@@ -368,10 +372,6 @@ To build and test HDF5 High Level C examples:

         test_hl_cexamples release dll  -- for release DLL version

-         test_hl_cexamples debug        -- for debug version
-
-         test_hl_cexamples debug dll    -- for debug DLL version
-
      Invoke a command prompt window and run test_hl_cexamples with
      appropriate options.

--- a/windows/InstallExamples.bat
+++ b/windows/InstallExamples.bat
@@ -23,96 +23,76 @@ cd examples

 mkdir examplesREL
 mkdir examplesRELDLL
-mkdir examplesDBG
-mkdir examplesDBGDLL

 cd attributetest
-copy debug\attributetest.exe ..\examplesDBG\
 copy release\attributetest.exe ..\examplesREL\
 cd ..

 cd attributetestdll
-copy debug\attributetestdll.exe ..\examplesDBGDLL\
-copy release\attributetestdll.exe ..\examplesRELDLL\
+opy release\attributetestdll.exe ..\examplesRELDLL\
 cd ..

 cd chunkread
-copy debug\chunkread.exe ..\examplesDBG\
 copy release\chunkread.exe ..\examplesREL\
 cd ..

 cd chunkreaddll
-copy debug\chunkreaddll.exe ..\examplesDBGDLL\
 copy release\chunkreaddll.exe ..\examplesRELDLL\
 cd ..

 cd compoundtest
-copy debug\compoundtest.exe ..\examplesDBG\
 copy release\compoundtest.exe ..\examplesREL\
 cd ..

 cd compoundtestdll
-copy debug\compoundtestdll.exe ..\examplesDBGDLL\
 copy release\compoundtestdll.exe ..\examplesRELDLL\
 cd ..

 cd extendwritetest
-copy debug\extendwritetest.exe ..\examplesDBG\
 copy release\extendwritetest.exe ..\examplesREL\
 cd ..

 cd extendwritetestdll
-copy debug\extendwritetestdll.exe ..\examplesDBGDLL\
 copy release\extendwritetestdll.exe ..\examplesRELDLL\
 cd ..

 cd grouptest
-copy debug\grouptest.exe ..\examplesDBG\
 copy release\grouptest.exe ..\examplesREL\
 cd ..

 cd grouptestdll
-copy debug\grouptestdll.exe ..\examplesDBGDLL\
 copy release\grouptestdll.exe ..\examplesRELDLL\
 cd ..

 cd intermgrouptest
-copy debug\intermgrouptest.exe ..\examplesDBG\
 copy release\intermgrouptest.exe ..\examplesREL\
 cd ..

 cd intermgrouptestdll
-copy debug\intermgrouptestdll.exe ..\examplesDBGDLL\
 copy release\intermgrouptestdll.exe ..\examplesRELDLL\
 cd ..

 cd readtest
-copy debug\readtest.exe ..\examplesDBG\
 copy release\readtest.exe ..\examplesREL\
 cd ..

 cd readtestdll
-copy debug\readtestdll.exe ..\examplesDBGDLL\
 copy release\readtestdll.exe ..\examplesRELDLL\
 cd ..

 cd selectest
-copy debug\selectest.exe ..\examplesDBG\
 copy release\selectest.exe ..\examplesREL\
 cd ..

 cd selectestdll
-copy debug\selectestdll.exe ..\examplesDBGDLL\
 copy release\selectestdll.exe ..\examplesRELDLL\
 cd ..

 cd writetest
-copy debug\writetest.exe ..\examplesDBG\
 copy release\writetest.exe ..\examplesREL\
 cd ..

 cd writetestdll
-copy debug\writetestdll.exe ..\examplesDBGDLL\
 copy release\writetestdll.exe ..\examplesRELDLL\
 cd ..

--- a/windows/InstallcppExamples.BAT
+++ b/windows/InstallcppExamples.BAT
@@ -23,76 +23,60 @@ cd c++\examples

 mkdir cppexamplesREL
 mkdir cppexamplesRELDLL
-mkdir cppexamplesDBG
-mkdir cppexamplesDBGDLL

 cd chunkstest
-copy debug\chunkstest.exe ..\cppexamplesDBG\
 copy release\chunkstest.exe ..\cppexamplesREL\
 cd ..

 cd chunkstestdll
-copy debug\chunkstestdll.exe ..\cppexamplesDBGDLL\
 copy release\chunkstestdll.exe ..\cppexamplesRELDLL\
 cd ..

 cd compoundtest
-copy debug\compoundtest.exe ..\cppexamplesDBG\
 copy release\compoundtest.exe ..\cppexamplesREL\
 cd ..

 cd compoundtestdll
-copy debug\compoundtestdll.exe ..\cppexamplesDBGDLL\
 copy release\compoundtestdll.exe ..\cppexamplesRELDLL\
 cd ..

 cd createtest
-copy debug\createtest.exe ..\cppexamplesDBG\
 copy release\createtest.exe ..\cppexamplesREL\
 cd ..

 cd createtestdll
-copy debug\createtestdll.exe ..\cppexamplesDBGDLL\
 copy release\createtestdll.exe ..\cppexamplesRELDLL\
 cd ..

 cd extend_dstest
-copy debug\extend_dstest.exe ..\cppexamplesDBG\
 copy release\extend_dstest.exe ..\cppexamplesREL\
 cd ..

 cd extend_dstestdll
-copy debug\extend_dstestdll.exe ..\cppexamplesDBGDLL\
 copy release\extend_dstestdll.exe ..\cppexamplesRELDLL\
 cd ..

 cd h5grouptest
-copy debug\h5grouptest.exe ..\cppexamplesDBG\
 copy release\h5grouptest.exe ..\cppexamplesREL\
 cd ..

 cd h5grouptestdll
-copy debug\h5grouptestdll.exe ..\cppexamplesDBGDLL\
 copy release\h5grouptestdll.exe ..\cppexamplesRELDLL\
 cd ..

 cd readdatatest
-copy debug\readdatatest.exe ..\cppexamplesDBG\
 copy release\readdatatest.exe ..\cppexamplesREL\
 cd ..

 cd readdatatestdll
-copy debug\readdatatestdll.exe ..\cppexamplesDBGDLL\
 copy release\readdatatestdll.exe ..\cppexamplesRELDLL\
 cd ..

 cd writedatatest
-copy debug\writedatatest.exe ..\cppexamplesDBG\
 copy release\writedatatest.exe ..\cppexamplesREL\
 cd ..

 cd writedatatestdll
-copy debug\writedatatestdll.exe ..\cppexamplesDBGDLL\
 copy release\writedatatestdll.exe ..\cppexamplesRELDLL\
 cd ..

--- a/windows/Installf90Examples.BAT
+++ b/windows/Installf90Examples.BAT
@@ -24,146 +24,116 @@ cd fortran\examples

 mkdir f90examplesREL
 mkdir f90examplesRELDLL
-mkdir f90examplesDBG
-mkdir f90examplesDBGDLL

 cd attreexampletest
-copy debug\attreexampletest.exe ..\f90examplesDBG\
 copy release\attreexampletest.exe ..\f90examplesREL\
 cd ..

 cd attreexampletestdll
-copy debug\attreexampletestdll.exe ..\f90examplesDBGDLL\
 copy release\attreexampletestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd compoundtest
-copy debug\compoundtest.exe ..\f90examplesDBG\
 copy release\compoundtest.exe ..\f90examplesREL\
 cd ..

 cd compoundtestdll
-copy debug\compoundtestdll.exe ..\f90examplesDBGDLL\
 copy release\compoundtestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd dsetexampletest
-copy debug\dsetexampletest.exe ..\f90examplesDBG\
 copy release\dsetexampletest.exe ..\f90examplesREL\
 cd ..

 cd dsetexampletestdll
-copy debug\dsetexampletestdll.exe ..\f90examplesDBGDLL\
 copy release\dsetexampletestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd fileexampletest
-copy debug\fileexampletest.exe ..\f90examplesDBG\
 copy release\fileexampletest.exe ..\f90examplesREL\
 cd ..

 cd fileexampletestdll
-copy debug\fileexampletestdll.exe ..\f90examplesDBGDLL\
 copy release\fileexampletestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd groupexampletest
-copy debug\groupexampletest.exe ..\f90examplesDBG\
 copy release\groupexampletest.exe ..\f90examplesREL\
 cd ..

 cd groupexampletestdll
-copy debug\groupexampletestdll.exe ..\f90examplesDBGDLL\
 copy release\groupexampletestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd grpdsetexampletest
-copy debug\grpdsetexampletest.exe ..\f90examplesDBG\
 copy release\grpdsetexampletest.exe ..\f90examplesREL\
 cd ..

 cd grpdsetexampletestdll
-copy debug\grpdsetexampletestdll.exe ..\f90examplesDBGDLL\
 copy release\grpdsetexampletestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd grpittest
-copy debug\grpittest.exe ..\f90examplesDBG\
 copy release\grpittest.exe ..\f90examplesREL\
 cd ..

 cd grpittestdll
-copy debug\grpittestdll.exe ..\f90examplesDBGDLL\
 copy release\grpittestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd grpsexampletest
-copy debug\grpsexampletest.exe ..\f90examplesDBG\
 copy release\grpsexampletest.exe ..\f90examplesREL\
 cd ..

 cd grpsexampletestdll
-copy debug\grpsexampletestdll.exe ..\f90examplesDBGDLL\
 copy release\grpsexampletestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd hyperslabtest
-copy debug\hyperslabtest.exe ..\f90examplesDBG\
 copy release\hyperslabtest.exe ..\f90examplesREL\
 cd ..

 cd hyperslabtestdll
-copy debug\hyperslabtestdll.exe ..\f90examplesDBGDLL\
 copy release\hyperslabtestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd mountexampletest
-copy debug\mountexampletest.exe ..\f90examplesDBG\
 copy release\mountexampletest.exe ..\f90examplesREL\
 cd ..

 cd mountexampletestdll
-copy debug\mountexampletestdll.exe ..\f90examplesDBGDLL\
 copy release\mountexampletestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd refobjexampletest
-copy debug\refobjexampletest.exe ..\f90examplesDBG\
 copy release\refobjexampletest.exe ..\f90examplesREL\
 cd ..

 cd refobjexampletestdll
-copy debug\refobjexampletestdll.exe ..\f90examplesDBGDLL\
 copy release\refobjexampletestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd refregexampletest
-copy debug\refregexampletest.exe ..\f90examplesDBG\
 copy release\refregexampletest.exe ..\f90examplesREL\
 cd ..

 cd refregexampletestdll
-copy debug\refregexampletestdll.exe ..\f90examplesDBGDLL\
 copy release\refregexampletestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd rwdsetexampletest
-copy debug\rwdsetexampletest.exe ..\f90examplesDBG\
 copy release\rwdsetexampletest.exe ..\f90examplesREL\
 cd ..

 cd rwdsetexampletestdll
-copy debug\rwdsetexampletestdll.exe ..\f90examplesDBGDLL\
 copy release\rwdsetexampletestdll.exe ..\f90examplesRELDLL\
 cd ..

 cd selecteletest
-copy debug\selecteletest.exe ..\f90examplesDBG\
 copy release\selecteletest.exe ..\f90examplesREL\
 cd ..

 cd selecteletestdll
-copy debug\selecteletestdll.exe ..\f90examplesDBGDLL\
 copy release\selecteletestdll.exe ..\f90examplesRELDLL\
 cd ..

--- a/windows/hdf5build_examples.BAT
+++ b/windows/hdf5build_examples.BAT
@@ -43,7 +43,7 @@ pushd %~dp0

 set nerrors=0
 if "%1"=="/?" goto help
-set blddebug=debug
+set blddebug=
 set bldrelease=release
 goto main

@@ -55,7 +55,7 @@ rem Print a help message
    echo.Usage: %~nx0 [OPTION]
    echo.
    echo.   /fort             Build HDF5 examples, including Fortran
-    echo.   /nodebug          Note: Default is to build debug and release versions
+    echo.   /debug            Note: Default is to build release only versions
    echo.   /useenv           Build HDF5 examples using compiler settings defined
    echo.                     in the environment, rather than the IDE.
    echo.   /?                Help information
@@ -71,9 +71,9 @@ rem Parse through the parameters sent to file, and set appropriate variables
            rem Enable Fortran
            set hdf5_enablefortran=true
            
-        ) else if "%%a"=="/nodebug" (
+        ) else if "%%a"=="/debug" (
            rem Enable Fortran
-            set blddebug=
+            set blddebug=debug
            
        ) else if "%%a"=="/useenv" (
            rem Pass /useenv flag to devenv
@@ -98,35 +98,54 @@ rem Setup our environment
    echo.Setting up environment
    
    rem Setup Visual Studio environment.  By default, use the Visual Studio 
-    rem 2005 environment.
+    rem 2008 environment.
+    
+    rem Make sure PROCESSOR_ARCHITECURE is set to either x86 or AMD64
+    if "%PROCESSOR_ARCHITECTURE%"=="x86" (
+        set hdf5_platform=Win32
+    ) else if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
+        set hdf5_platform=x64
+    ) else (
+        echo.Error: Environment variable PROCESSOR_ARCHITECTURE should contain
+        echo.either x86 or AMD64
+        exit /b 1
+    )
    
    set ccflags=
    
-    rem Currently VS2005 is the only compiler supported.  --SJW 9/26/07
-    echo.Using Visual Studio 2005
+    rem Currently VS2008 is the only compiler supported.
+    echo.Using Visual Studio 2008
    
    if not defined hdf5_enablefortran (
-        if defined vs80comntools (
-            rem This sets the Visual Studio path and environment variables
-            call "%vs80comntools%\vsvars32.bat"
+        if defined vs90comntools (
+            rem This sets the Visual Studio 2008 path and environment variables
+            if %hdf5_platform%==Win32 (
+                call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86
+            ) else (
+                call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86_amd64
+            )
+
        ) else (
-            echo.Error: Cannot setup Visual Studio 2005 environment.  Please
-            echo.make sure VS80COMNTOOLS is defined in the environment.
+            echo.Error: Cannot setup Visual Studio 2008 environment.  Please
+            echo.make sure VS90COMNTOOLS is defined in the environment.
            exit /b 1
        )
        
    ) else (
-        echo.with Intel Visual Fortran 9.1
+        echo.with Intel Visual Fortran 10.1
        
-        if defined ifort_compiler91 (
-            rem This sets the Intel Fortran 9.1 environment, as well as
+        if defined ifort_compiler10 (
+            rem This sets the Intel Fortran 10.1 environment, as well as
            rem setting the appropriate Visual Studio environment
            
-            rem Assume 32-bit environment
-            call "%ifort_compiler91%\IA32\Bin\ifortvars.bat"
+            if %hdf5_platform%==Win32 (
+                call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
+            ) else (
+                call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
+            )
        ) else (
-            echo.Error: Cannot setup Intel Fortran 9.1 environment.  Please
-            echo.make sure IFORT_COMPILER91 is defined in the environment.
+            echo.Error: Cannot setup Intel Fortran 10.1 environment.  Please
+            echo.make sure IFORT_COMPILER10 is defined in the environment.
            exit /b 1
        )
    )
--- a/windows/install_hlcexamples.BAT
+++ b/windows/install_hlcexamples.BAT
@@ -30,8 +30,6 @@ rem Simply create the needed directories
 :makedirs
    mkdir %exdir%\HLCexamplesRELEASE
    mkdir %exdir%\HLCexamplesRELEASEDLL
-    mkdir %exdir%\HLCexamplesDEBUG
-    mkdir %exdir%\HLCexamplesDEBUGDLL
    exit /b

 rem This function actally copies the file over, first making sure it exists.  If not, we increment nerrors
@@ -61,7 +59,7 @@ rem     %2 - destination to copy to
    call :makedirs
    
    rem copy the files
-    for %%a in (DEBUG RELEASE) do (
+    for %%a in (RELEASE) do (
        for %%b in (DLL static) do (
            set ver=%%b
            set ver=!ver:static=!
--- a/windows/install_hlf90examples.BAT
+++ b/windows/install_hlf90examples.BAT
@@ -23,16 +23,12 @@ cd hl/fortran/examples

 mkdir HLf90examplesRELEASE
 mkdir HLf90examplesRELEASEDLL
-mkdir HLf90examplesDEBUG
-mkdir HLf90examplesDEBUGDLL

 cd ex_lite
-copy debug\ex_lite.exe ..\HLf90examplesDEBUG\
 copy release\ex_lite.exe ..\HLf90examplesRELEASE\
 cd ..

 cd ex_litedll
-copy debug\ex_litedll.exe ..\HLf90examplesDEBUGDLL\
 copy release\ex_litedll.exe ..\HLf90examplesRELEASEDLL\
 cd ..