9 files changed, 4 insertions, 446 deletions
diff --git a/windows/batch_intelc/convert_to_icproj.BAT b/windows/batch_intelc/convert_to_icproj.BAT
deleted file mode 100755
index f76a981..0000000
--- a/windows/batch_intelc/convert_to_icproj.BAT
+++ /dev/null
@@ -1,41 +0,0 @@
-@REM Copyright by The HDF Group.
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5.  The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from help@hdfgroup.org.
-
-
-@REM File Name: convert_to_icproj.bat
-@REM Purpose: Convert Visual C++ 6.0 project format to Visual Studio .net project format.
-@REM Written By: Fang GUO
-@REM Date: May 27, 2005
-@REM Update: June 7, 2005
-@REM Purpose: Convert Visual C++ 7.0 project format to Intel C++ project format
-
-::@ECHO OFF
-
-type nul >convert_intel.log
-echo.
-echo START Converting files in .vcproj to .icproj 
-echo.
-
-::Clean up if .icproj exists
-for /R  %CD%\windows\ %%i in (*.icproj) do (
-del %%i
-)
-
-::Start Converting
-for /R %CD%\windows %%i in (*.vcproj) do (
-ICProjConvert80 %%i /IC >>convert_intel.log
-)
-
-echo.
-echo END Converting files in .vcproj to .icproj 
-echo.
-\ No newline at end of file
diff --git a/windows/batch_intelc/hdf5bt_intelc.BAT b/windows/batch_intelc/hdf5bt_intelc.BAT
deleted file mode 100755
index e991795..0000000
--- a/windows/batch_intelc/hdf5bt_intelc.BAT
+++ /dev/null
@@ -1,41 +0,0 @@
-@REM Copyright by The HDF Group.
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5.  The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from help@hdfgroup.org.
-
-
-@REM File Name : hdf5bt_intelc.bat
-@REM Purpose   : Building and Testing HDF5 with INTEL C++ Compiler
-@REM Written By: Fang GUO
-@REM Date      : May 27, 2005
-@REM Update    : June 7, 2005
-
-@REM This batch file is used to build and test HDF5 Libraries and Tools.
-@REM There are 2options for this batch file:
-@REM   1. hdf5bt_intelc                -- Build and test HDF5 tools and c library
-@REM   2. hdf5bt_intelc enablecpp      -- Build and test HDF5 tools and c/c++ library
-
-@ECHO OFF
-
-type nul > hdf5_results_intelc.txt
-echo ***************************************************************************** >> hdf5_results_intelc.txt
-echo                         Build and Test HDF5 Library and Tools >> hdf5_results_intelc.txt
-echo ***************************************************************************** >> hdf5_results_intelc.txt
-
-call hdf5build_intelc %1
-more build_results_intelc.txt >> hdf5_results_intelc.txt
-del build_results_intelc.txt
-
-echo Checking building results with Intel C++ Compiler
-echo.
-call hdf5check %1
-more check_results.txt >> hdf5_results_intelc.txt
-del check_results.txt
diff --git a/windows/batch_intelc/hdf5build_intelc.BAT b/windows/batch_intelc/hdf5build_intelc.BAT
deleted file mode 100755
index 33218cd..0000000
--- a/windows/batch_intelc/hdf5build_intelc.BAT
+++ /dev/null
@@ -1,121 +0,0 @@
-@REM Copyright by The HDF Group.
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5.  The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from help@hdfgroup.org.
-
-
-@REM File Name : hdf5build_inelc.bat
-@REM Purpose   : Building HDF5 with INTEL C++ Compiler
-@REM Written By: Fang GUO
-@REM Date      : May 27, 2005
-@REM Update    : June 7, 2005
-
-@REM There are 2 options for this batch file:
-@REM   1. hdf5build_intelc               -- Build HDF5 tools and c library
-@REM   2. hdf5build_intelc enablecpp      -- Build HDF5 tools and c/c++ library
-@echo off
-
-if "%1"=="/?" GOTO HELP
-if not %1.==. (
-	if not "%1"=="/?" (
-				if not "%1"=="enablecpp" goto WRONG
-	)
-)
-
-type nul > build_results_intelc.txt
-type nul > all_debug.log
-type nul > all_release.log
-type nul > h5tinit.log
-
-call convert_to_vcproj
-call convert_to_icproj
-
-echo ***************************************************************************** >> build_results_intelc.txt
-echo                         Build H5Tinit.exe >> build_results_intelc.txt
-echo ***************************************************************************** >> build_results_intelc.txt
-
-cd windows\misc\typegen
-devenv typegen.sln /rebuild Debug /IntelSpecific Intel >> ..\..\..\h5tinit.log
-cd ..\..\..\
-more h5tinit.log >> build_results_intelc.txt
-del h5tinit.log
-cd src
-h5tinit.exe > h5tinit.c
-cd ..\
-
-if %1.==. GOTO BUILDC
-if "%1"=="enablecpp" GOTO BUILDCPP
-
-:BUILDC
-
-echo Start Building HDF5 C libraries ...
-
-echo ***************************************************************************** >> build_results_intelc.txt
-echo                         Build HDF5 C Library and Tools >> build_results_intelc.txt
-echo ***************************************************************************** >> build_results_intelc.txt
-
-cd windows\proj\all
-devenv all.sln /rebuild debug /IntelSpecific Intel >> ..\..\..\all_debug.log
-devenv all.sln /rebuild release /IntelSpecific Intel >> ..\..\..\all_release.log 
-cd ..\..\..\
-more all_debug.log >> build_results_intelc.txt
-more all_release.log >> build_results_intelc.txt
-del all_debug.log
-del all_release.log
-echo. 
-echo. End Building HDF5 C Libraries!
-GOTO END
-
-:BUILDCPP
-echo.
-echo. Start Building HDF5 C/C++ libraries Using Intel ...
-echo ***************************************************************************** >> build_results_intelc.txt
-echo                         Build HDF5 C/C++ Libraries and Tools >> build_results_intelc.txt
-echo ***************************************************************************** >> build_results_intelc.txt
-
-cd windows\proj\all
-devenv all.sln /rebuild debug /IntelSpecific Intel >> ..\..\..\all_debug.log
-
-for %%i in (hdf5_cpp hdf5_hl_cpp testhdf5_cpp dsets_cpp hl_test_table_cpp) do (
-devenv all.sln /build debug /project %%i /IntelSpecific Intel>>..\..\..\all_debug.log
-devenv all.sln /build debug /project %%idll /IntelSpecific Intel>>..\..\..\all_debug.log
-)
-
-devenv all.sln /rebuild release /IntelSpecific Intel >> ..\..\..\all_release.log
-for %%i in (hdf5_cpp hdf5_hl_cpp testhdf5_cpp dsets_cpp hl_test_table_cpp) do (
-devenv all.sln /build release /project %%i /IntelSpecific Intel>>..\..\..\all_release.log
-devenv all.sln /build release /project %%idll /IntelSpecific Intel>>..\..\..\all_release.log
-)
-
-cd ..\..\..\
-
-more all_debug.log >> build_results_intelc.txt
-more all_release.log >> build_results_intelc.txt
-del all_debug.log
-del all_release.log
-echo.
-echo. End Building C++ Libraries
-GOTO END
-
-:WRONG
-echo.
-echo. The syntax of the command is incorrect.
-
-:HELP
-echo.
-echo. Please use one of the following options!
-echo.
-echo.    hdf5build_intelc                   Build HDF5 C Library and Tools
-echo.    hdf5build_intelc enablecpp         Build HDF5 C/C++ Libraries and Tools
-echo.    hdf5build_intelc /?                Help information
-echo.
-
-:END
diff --git a/windows/batch_net/convert.js b/windows/batch_net/convert.js
deleted file mode 100755
index c2e65fe..0000000
--- a/windows/batch_net/convert.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Provided by: Microsoft
-   URL: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vclrfupgradingvisualcprojectstovisualstudionetinbatchmode.asp
-*/
-var vcProj = new ActiveXObject("VisualStudio.VCProjectEngine.7.1");
-var objFile = new ActiveXObject("Scripting.FileSystemObject");
-var objArgs = WScript.Arguments;
-
-// check the arguments to be sure it's right
-if (objArgs.Count() < 2)
-{
-   WScript.Echo("VC6 or 5 DSP Project File Conversion");
-   WScript.Echo("Opens specified .dsp and converts to VC7.1 Format.");
-   WScript.Echo("Will create project file with .vcproj extension");
-   WScript.Echo("\n\tusage: <full path\project.dsp> <full path\project.vcproj>");
-   WScript.Quit(1);
-}
-
-WScript.Echo("\nConverting: "+ objArgs.Item(0));
-// If there is a file name of the .vcproj extension, do not convert
-var vcProject = vcProj.LoadProject(objArgs.Item(0));
-if (!objFile.FileExists(vcProject.ProjectFile))
-{
-   // specify name and location of new project file
-   vcProject.ProjectFile = objArgs.Item(1);
-
-   // call the project engine to save this off. 
-   // when no name is shown, it will create one with the .vcproj name
-   vcProject.Save();
-   WScript.Echo("New Project Name: "+vcProject.ProjectFile+"\n");
-}
-else
-{
-   WScript.Echo("ERROR!: "+vcProject.ProjectFile+" already exists!\n");
-}
diff --git a/windows/batch_net/convert_to_vcproj.bat b/windows/batch_net/convert_to_vcproj.bat
deleted file mode 100755
index e20c509..0000000
--- a/windows/batch_net/convert_to_vcproj.bat
+++ /dev/null
@@ -1,43 +0,0 @@
-@REM Copyright by The HDF Group.
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5.  The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from help@hdfgroup.org.
-
-@REM File Name: convert_to_vcproj.bat
-@REM Purpose: Convert Visual C++ 6.0 project format to Visual Studio .net project format.
-@REM Written By: Fang GUO
-@REM Date: May 27, 2005
-@REM Update: June 7, 2005
-
-::@echo off
-
-type nul > convert.log
-echo.>>convert.log
-echo This batch file will convert all .dsp files in HDF5 C,  >> convert.log
-echo C++ and Fortran library to .vcproj  format >> convert.log
-
-CScript //H:CScript //Nologo
-
-echo.
-echo. START converting files .dsp to .vcproj
-echo.
-
-for /R  %CD%\windows\ %%i in (*.vcproj) do (
-del %%i
-)
-
-for /R  %CD%\windows\ %%i in (*.dsp) do (
-convert.js %%i %%~pi%%~ni.vcproj >> convert.log
-)
-
-echo.
-echo. END converting files .dsp to .vcproj
-echo.
diff --git a/windows/batch_net/hdf5bt_net.bat b/windows/batch_net/hdf5bt_net.bat
deleted file mode 100755
index 307db65..0000000
--- a/windows/batch_net/hdf5bt_net.bat
+++ /dev/null
@@ -1,37 +0,0 @@
-@REM Copyright by The HDF Group.
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5.  The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from help@hdfgroup.org.
-
-@REM File Name : hdf5bt_net.bat
-@REM Purpose   : Building and Testing HDF5 with MSVS .NET
-@REM Written By: Fang GUO
-@REM Date      : May 27, 2005
-@REM Update    : June 7, 2005
-
-@REM There are 2 options for this batch file:
-@REM   1. hdf5bt                -- Build and test HDF5 tools and c library
-@REM   2. hdf5bt enablecpp      -- Build and test HDF5 tools and c/c++ library
-
-@ECHO OFF
-
-type nul > hdf5_results_net.txt
-echo ***************************************************************************** >> hdf5_results_net.txt
-echo                         Build and Test HDF5 Library and Tools >> hdf5_results_net.txt
-echo ***************************************************************************** >> hdf5_results_net.txt
-
-call hdf5build_net %1
-more build_results_net.txt >> hdf5_results_net.txt
-del build_results_net.txt
-
-call hdf5check %1
-more check_results.txt >> hdf5_results_net.txt
-del check_results.txt
diff --git a/windows/batch_net/hdf5build_net.bat b/windows/batch_net/hdf5build_net.bat
deleted file mode 100755
index e108e39..0000000
--- a/windows/batch_net/hdf5build_net.bat
+++ /dev/null
@@ -1,114 +0,0 @@
-@REM Copyright by The HDF Group.
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5.  The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from help@hdfgroup.org.
-
-::  File Name : hdf5build_net.bat
-::  Purpose   : Building HDF5 with MSVS .NET
-::  Written By: Fang GUO
-::  Date      : May 27, 2005
-::  Update    : June 7, 2005
-
-::  There are 2 options for this batch file:
-::    1. hdf5build_net                -- Build HDF5 tools and c library
-::    2. hdf5build_net enablecpp      -- Build HDF5 tools and c/c++ library
-@echo off
-
-if "%1"=="/?" GOTO HELP
-if not %1.==. (
-	if not "%1"=="/?" (
-				if not "%1"=="enablecpp" goto WRONG
-	)
-)
-   
-call convert_to_vcproj
-type nul > build_results_net.txt
-type nul > all_debug.log
-type nul >all_release.log
-echo ***************************************************************************** >> build_results_net.txt
-echo                         Build H5Tinit.exe >> build_results_net.txt
-echo ***************************************************************************** >> build_results_net.txt
-
-cd windows\misc\typegen
-devenv typegen.sln /rebuild Debug /project h5tinit /out ..\..\..\h5tinit.log
-cd ..\..\..\
-more h5tinit.log >> build_results_net.txt
-del h5tinit.log
-
-cd src
-h5tinit.exe > h5tinit.c
-cd ..\
-
-
-@ECHO OFF
-if %1.==. GOTO BUILDC
-if %1==enablecpp GOTO BUILDCPP
-
-:BUILDC
-
-echo ***************************************************************************** >> build_results_net.txt
-echo                         Build HDF5 C Library and Tools >> build_results_net.txt
-echo ***************************************************************************** >> build_results_net.txt
-
-echo Starting Building HDF5 C Libraries!
-
-cd windows\proj\all
-devenv all.sln /rebuild debug >> ..\..\..\all_debug.log
-devenv all.sln /rebuild release >> ..\..\..\all_release.log
-cd ..\..\..\
-more all_debug.log >> build_results_net.txt
-more all_release.log >> build_results_net.txt
-del all_debug.log
-del all_release.log
-GOTO END
-
-:BUILDCPP
-echo ***************************************************************************** >> build_results_net.txt
-echo                         Build HDF5 C/C++ Libraries and Tools >> build_results_net.txt
-echo ***************************************************************************** >> build_results_net.txt
-
-echo Starting Building HDF5 C and C++ Libraries!
-
-cd windows\proj\all
-devenv all.sln /rebuild debug >> ..\..\..\all_debug.log
-for %%i in (hdf5_cpp hdf5_hl_cpp testhdf5_cpp dsets_cpp hl_test_table_cpp) do (
-devenv all.sln /build debug /project %%i >>..\..\..\all_debug.log
-devenv all.sln /build debug /project %%idll >>..\..\..\all_debug.log
-)
-
-devenv all.sln /rebuild release >>  ..\..\..\all_release.log
-for %%i in (hdf5_cpp hdf5_hl_cpp testhdf5_cpp dsets_cpp hl_test_table_cpp) do (
-devenv all.sln /build release /project %%i >>..\..\..\all_release.log
-devenv all.sln /build release /project %%idll >>..\..\..\all_release.log
-
-)
-
-cd ..\..\..\
-
-more all_debug.log >> build_results_net.txt
-more all_release.log >> build_results_net.txt
-del all_debug.log
-del all_release.log
-GOTO END
-
-:WRONG
-echo.
-echo. The syntax of the command is incorrect.
-
-:HELP
-echo.
-echo Please use one of the following options!
-echo.
-echo.    hdf5build_net                   Build HDF5 C Library and Tools
-echo.    hdf5build_net enablecpp         Build HDF5 C/C++ Libraries and Tools
-echo.    hdf5build /?                    Help information
-echo.
-:END
diff --git a/windows/copy_hdf.bat b/windows/copy_hdf.bat
index 74f58eb..2b3199d 100755
--- a/windows/copy_hdf.bat
+++ b/windows/copy_hdf.bat
@@ -23,18 +23,4 @@ copy src\H5pubconf.h ..\src
 copy fortran\src\H5f90i_gen.h ..\fortran\src
 copy fortran\src\H5fortran_types.f90 ..\fortran\src
 xcopy /e/i/Y *.bat ..\
-copy batch_net\convert.js ..\batch_net\
 copy examples\testExamples_exp_output.txt ..\examples
-
-cd ../batch_net
-copy *.* ..\
-
-cd ../batch_intelc
-copy *.* ..\
-@echo off
-cd ..
-rmdir /s/q batch_net
-rmdir /s/q batch_intelc
-
-cd windows
-
diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT
index f91c7cf..4d35cdf 100755
--- a/windows/hdf5bt.BAT
+++ b/windows/hdf5bt.BAT
@@ -140,8 +140,11 @@ goto :eof
 :: Cleanup our environment
 :cleanup
 
-set bt_results=
 set build_results=
+
+:: Don't unset bt_results if it is being used by autotest_hdf5.bat
+if "x%hdf5_auto_results%"=="x" set bt_results=
+
 popd
 
 if defined hdf5_debug pause