From 63e111fb51afbbca5a5252a3a030b90633474936 Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Wed, 16 Jan 2008 09:26:40 -0500 Subject: [PATCH] [svn-r14433] Purpose: Fix reference in the Windows batch-build script Description: In the Windows command line build script, there was a reference to the "typegen" project, which generates h5detect before HDF5 is built. Now, we integrate h5detect into the overall build process, and typegen has been removed. This checkin removes the reference in the batch script. This fixes bugzilla bug 1021. --- windows/hdf5build.BAT | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT index 8369fcf746..71f079c640 100755 --- a/windows/hdf5build.BAT +++ b/windows/hdf5build.BAT @@ -92,14 +92,12 @@ rem Setup our environment echo.Setting up environment - rem By default, use all.sln and typegen.sln, unless hdf5_enablefortran is set + rem By default, use all.sln, unless hdf5_enablefortran is set if defined hdf5_enablefortran ( echo.Building Fortran projects enabled set hdf5_sln="%CD%\windows\proj\all_fortran\all_fortran.sln" - set hdf5_tinit_sln="%CD%\windows\misc\typegen\typegen_fortran.sln" ) else ( set hdf5_sln="%CD%\windows\proj\all\all.sln" - set hdf5_tinit_sln="%CD%\windows\misc\typegen\typegen.sln" ) @@ -147,21 +145,6 @@ rem Setup our environment exit /b 0 -rem Build H5tinit.exe and generate h4tinit.c -:h5tinit - - echo.Generating H5tint.c - - echo.***************************************************************************** - echo. Build H5Tinit.exe - echo.***************************************************************************** - echo. - devenv %hdf5_tinit_sln% %ccflags% /rebuild Debug - if %errorlevel% neq 0 exit /b 1 - - exit /b - - rem Build the HDF5 libraries. By default, C and C++ libraries are built. :all @@ -226,12 +209,6 @@ rem This is where the magic happens echo. - call :h5tinit - if %errorlevel% neq 0 ( - echo.Error building h5tinit! - goto error - ) - call :all if %errorlevel% neq 0 ( echo.Error building HDF5 libraries!