mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-30 15:32:37 +08:00
[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.
This commit is contained in:
parent
62529d9b1e
commit
63e111fb51
@ -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!
|
||||
|
Loading…
Reference in New Issue
Block a user