From 51dcf997dc8d297abd1b7b4513fe4483447ddc0d Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Mon, 21 May 2007 15:04:22 -0500 Subject: [svn-r13776] Added Windows project file for new example project (rev 13702). Updated test scripts and MANIFEST accordingly. Tested: VS6 on WinXP --- MANIFEST | 2 + windows/InstallExamples.bat | 10 ++ windows/examples/allexamples/allexamples.dsw | 64 +++++++++---- .../examples/intermgrouptest/intermgrouptest.dsp | 104 +++++++++++++++++++++ .../intermgrouptestdll/intermgrouptestdll.dsp | 104 +++++++++++++++++++++ windows/examples/testExamples.bat | 4 + windows/examples/testExamples_exp_output.txt | 3 + 7 files changed, 274 insertions(+), 17 deletions(-) create mode 100644 windows/examples/intermgrouptest/intermgrouptest.dsp create mode 100644 windows/examples/intermgrouptestdll/intermgrouptestdll.dsp diff --git a/MANIFEST b/MANIFEST index 18cd8b9..8d93428 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1650,6 +1650,8 @@ ./windows/examples/extendwritetestdll/extendwritetestdll.dsp ./windows/examples/grouptest/grouptest.dsp ./windows/examples/grouptestdll/grouptestdll.dsp +./windows/examples/intermgrouptest/intermgrouptest.dsp +./windows/examples/intermgrouptestdll/intermgrouptestdll.dsp ./windows/examples/readtest/readtest.dsp ./windows/examples/readtestdll/readtestdll.dsp ./windows/examples/selectest/selectest.dsp diff --git a/windows/InstallExamples.bat b/windows/InstallExamples.bat index 880e072..d0bf4dd 100755 --- a/windows/InstallExamples.bat +++ b/windows/InstallExamples.bat @@ -76,6 +76,16 @@ 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\ diff --git a/windows/examples/allexamples/allexamples.dsw b/windows/examples/allexamples/allexamples.dsw index 71e7222..ba26198 100755 --- a/windows/examples/allexamples/allexamples.dsw +++ b/windows/examples/allexamples/allexamples.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "allexamples"=.\allexamples.dsp - Package Owner=<4> +Project: "allexamples"=".\allexamples.dsp" - Package Owner=<4> Package=<5> {{{ @@ -59,11 +59,41 @@ Package=<4> Begin Project Dependency Project_Dep_Name writetestdll End Project Dependency + Begin Project Dependency + Project_Dep_Name intermgrouptest + End Project Dependency + Begin Project Dependency + Project_Dep_Name intermgrouptestdll + End Project Dependency +}}} + +############################################################################### + +Project: "attributetest"="..\attributetest\attributetest.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "attributetestdll"="..\attributetestdll\attributetestdll.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ }}} ############################################################################### -Project: "attributetest"=..\attributetest\attributetest.dsp - Package Owner=<4> +Project: "chunkread"="..\chunkread\chunkread.dsp" - Package Owner=<4> Package=<5> {{{ @@ -75,7 +105,7 @@ Package=<4> ############################################################################### -Project: "attributetestdll"=..\attributetestdll\attributetestdll.dsp - Package Owner=<4> +Project: "chunkreaddll"="..\chunkreaddll\chunkreaddll.dsp" - Package Owner=<4> Package=<5> {{{ @@ -87,7 +117,7 @@ Package=<4> ############################################################################### -Project: "chunkread"=..\chunkread\chunkread.dsp - Package Owner=<4> +Project: "compoundtest"="..\compoundtest\compoundtest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -99,7 +129,7 @@ Package=<4> ############################################################################### -Project: "chunkreaddll"=..\chunkreaddll\chunkreaddll.dsp - Package Owner=<4> +Project: "compoundtestdll"="..\compoundtestdll\compoundtestdll.dsp" - Package Owner=<4> Package=<5> {{{ @@ -111,7 +141,7 @@ Package=<4> ############################################################################### -Project: "compoundtest"=..\compoundtest\compoundtest.dsp - Package Owner=<4> +Project: "extendwritetest"="..\extendwritetest\extendwritetest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -123,7 +153,7 @@ Package=<4> ############################################################################### -Project: "compoundtestdll"=..\compoundtestdll\compoundtestdll.dsp - Package Owner=<4> +Project: "extendwritetestdll"="..\extendwritetestdll\extendwritetestdll.dsp" - Package Owner=<4> Package=<5> {{{ @@ -135,7 +165,7 @@ Package=<4> ############################################################################### -Project: "extendwritetest"=..\extendwritetest\extendwritetest.dsp - Package Owner=<4> +Project: "grouptest"="..\grouptest\grouptest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -147,7 +177,7 @@ Package=<4> ############################################################################### -Project: "extendwritetestdll"=..\extendwritetestdll\extendwritetestdll.dsp - Package Owner=<4> +Project: "grouptestdll"="..\grouptestdll\grouptestdll.dsp" - Package Owner=<4> Package=<5> {{{ @@ -159,7 +189,7 @@ Package=<4> ############################################################################### -Project: "grouptest"=..\grouptest\grouptest.dsp - Package Owner=<4> +Project: "intermgrouptest"="..\intermgrouptest\intermgrouptest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -171,7 +201,7 @@ Package=<4> ############################################################################### -Project: "grouptestdll"=..\grouptestdll\grouptestdll.dsp - Package Owner=<4> +Project: "intermgrouptestdll"="..\intermgrouptestdll\intermgrouptestdll.dsp" - Package Owner=<4> Package=<5> {{{ @@ -183,7 +213,7 @@ Package=<4> ############################################################################### -Project: "readtest"=..\readtest\readtest.dsp - Package Owner=<4> +Project: "readtest"="..\readtest\readtest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -195,7 +225,7 @@ Package=<4> ############################################################################### -Project: "readtestdll"=..\readtestdll\readtestdll.dsp - Package Owner=<4> +Project: "readtestdll"="..\readtestdll\readtestdll.dsp" - Package Owner=<4> Package=<5> {{{ @@ -207,7 +237,7 @@ Package=<4> ############################################################################### -Project: "selectest"=..\selectest\selectest.dsp - Package Owner=<4> +Project: "selectest"="..\selectest\selectest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -219,7 +249,7 @@ Package=<4> ############################################################################### -Project: "selectestdll"=..\selectestdll\selectestdll.dsp - Package Owner=<4> +Project: "selectestdll"="..\selectestdll\selectestdll.dsp" - Package Owner=<4> Package=<5> {{{ @@ -231,7 +261,7 @@ Package=<4> ############################################################################### -Project: "writetest"=..\writetest\writetest.dsp - Package Owner=<4> +Project: "writetest"="..\writetest\writetest.dsp" - Package Owner=<4> Package=<5> {{{ @@ -243,7 +273,7 @@ Package=<4> ############################################################################### -Project: "writetestdll"=..\writetestdll\writetestdll.dsp - Package Owner=<4> +Project: "writetestdll"="..\writetestdll\writetestdll.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/windows/examples/intermgrouptest/intermgrouptest.dsp b/windows/examples/intermgrouptest/intermgrouptest.dsp new file mode 100644 index 0000000..cb083f8 --- /dev/null +++ b/windows/examples/intermgrouptest/intermgrouptest.dsp @@ -0,0 +1,104 @@ +# Microsoft Developer Studio Project File - Name="intermgrouptest" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=intermgrouptest - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "intermgrouptest.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "intermgrouptest.mak" CFG="intermgrouptest - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "intermgrouptest - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "intermgrouptest - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "intermgrouptest - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../../../examples/intermgrouptest/Release" +# PROP Intermediate_Dir "../../../examples/intermgrouptest/Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +F90=df.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5\release" /libpath:"..\..\..\hdf5lib\release\lib" + +!ELSEIF "$(CFG)" == "intermgrouptest - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../../../examples/intermgrouptest/Debug" +# PROP Intermediate_Dir "../../../examples/intermgrouptest/Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +F90=df.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5d.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"..\..\..\proj\hdf5\debug" /libpath:"..\..\..\hdf5lib\debug\lib" + +!ENDIF + +# Begin Target + +# Name "intermgrouptest - Win32 Release" +# Name "intermgrouptest - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\examples\h5_interm_group.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/windows/examples/intermgrouptestdll/intermgrouptestdll.dsp b/windows/examples/intermgrouptestdll/intermgrouptestdll.dsp new file mode 100644 index 0000000..2edc910 --- /dev/null +++ b/windows/examples/intermgrouptestdll/intermgrouptestdll.dsp @@ -0,0 +1,104 @@ +# Microsoft Developer Studio Project File - Name="intermgrouptestdll" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=intermgrouptestdll - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "intermgrouptestdll.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "intermgrouptestdll.mak" CFG="intermgrouptestdll - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "intermgrouptestdll - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "intermgrouptestdll - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "intermgrouptestdll - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "../../../examples/intermgrouptestdll/Release" +# PROP Intermediate_Dir "../../../examples/intermgrouptestdll/Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +F90=df.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5dll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\proj\hdf5dll\release" /libpath:"..\..\..\hdf5lib\release\dll" + +!ELSEIF "$(CFG)" == "intermgrouptestdll - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "../../../examples/intermgrouptestdll/Debug" +# PROP Intermediate_Dir "../../../examples/intermgrouptestdll/Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +F90=df.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_HDF5USEDLL_" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib hdf5ddll.lib $(HDF5_EXT_ZLIB) $(HDF5_EXT_SZIP) /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\proj\hdf5dll\debug" /libpath:"..\..\..\hdf5lib\debug\dll" + +!ENDIF + +# Begin Target + +# Name "intermgrouptestdll - Win32 Release" +# Name "intermgrouptestdll - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\examples\h5_interm_group.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/windows/examples/testExamples.bat b/windows/examples/testExamples.bat index 12b1c56..57aa19c 100755 --- a/windows/examples/testExamples.bat +++ b/windows/examples/testExamples.bat @@ -35,6 +35,7 @@ attributetest >> ..\%1.txt compoundtest >> ..\%1.txt extendwritetest >> ..\%1.txt grouptest >> ..\%1.txt +intermgrouptest >> ..\%1.txt selectest >> ..\%1.txt writetest >> ..\%1.txt chunkread >> ..\%1.txt @@ -60,6 +61,7 @@ attributetestdll >> ..\%1.txt compoundtestdll >> ..\%1.txt extendwritetestdll >> ..\%1.txt grouptestdll >> ..\%1.txt +intermgrouptestdll >> ..\%1.txt selectestdll >> ..\%1.txt writetestdll >> ..\%1.txt chunkreaddll >> ..\%1.txt @@ -90,6 +92,7 @@ attributetest >> ..\%1.txt compoundtest >> ..\%1.txt extendwritetest >> ..\%1.txt grouptest >> ..\%1.txt +intermgrouptest >> ..\%1.txt selectest >> ..\%1.txt writetest >> ..\%1.txt chunkread >> ..\%1.txt @@ -115,6 +118,7 @@ attributetestdll >> ..\%1.txt compoundtestdll >> ..\%1.txt extendwritetestdll >> ..\%1.txt grouptestdll >> ..\%1.txt +intermgrouptestdll >> ..\%1.txt selectestdll >> ..\%1.txt writetestdll >> ..\%1.txt chunkreaddll >> ..\%1.txt diff --git a/windows/examples/testExamples_exp_output.txt b/windows/examples/testExamples_exp_output.txt index 79544b1..228c69f 100755 --- a/windows/examples/testExamples_exp_output.txt +++ b/windows/examples/testExamples_exp_output.txt @@ -38,6 +38,9 @@ chunk rank 2, dimensions 20 x 20 Name : Float_Data Datatype is 'H5T_NATIVE_FLOAT'. +Group /G1 exists in the file +Group /G1/G2 has 1 member(s) +Object's name is G3 10 0 11 12 0 0 0 0 0 18 0 19 20 0 21 22 0 0 0 59 0 61 0 0 0 0 0 -- cgit v0.12