From cd7f0cdc2978c4970df32f774877a81c91013636 Mon Sep 17 00:00:00 2001 From: Karl Waclawek Date: Tue, 21 Feb 2012 03:49:47 +0000 Subject: [PATCH] Added Windows project files (same VC++ 6.0 format as the others) and modified minicheck.h to build under Windows. --- expat/tests/minicheck.h | 9 +-- expat/tests/runtests.dsp | 120 +++++++++++++++++++++++++++++++++++++++ expat/tests/runtests.dsw | 29 ++++++++++ 3 files changed, 154 insertions(+), 4 deletions(-) create mode 100644 expat/tests/runtests.dsp create mode 100644 expat/tests/runtests.dsw diff --git a/expat/tests/minicheck.h b/expat/tests/minicheck.h index f846bead..c917c026 100644 --- a/expat/tests/minicheck.h +++ b/expat/tests/minicheck.h @@ -18,10 +18,11 @@ extern "C" { #define CK_NORMAL 1 #define CK_VERBOSE 2 -/* Workaround for Tru64 Unix systems where the C compiler has a working - __func__, but the C++ compiler only has a working __FUNCTION__. This - could be fixed in configure.in, but it's not worth it right now. */ -#if defined(__osf__) && defined(__cplusplus) +/* Workaround for Microsoft's compiler and Tru64 Unix systems where the + C compiler has a working __func__, but the C++ compiler only has a + working __FUNCTION__. This could be fixed in configure.in, but it's + not worth it right now. */ +#if defined (_MSC_VER) || (defined(__osf__) && defined(__cplusplus)) #define __func__ __FUNCTION__ #endif diff --git a/expat/tests/runtests.dsp b/expat/tests/runtests.dsp new file mode 100644 index 00000000..a5aa2342 --- /dev/null +++ b/expat/tests/runtests.dsp @@ -0,0 +1,120 @@ +# Microsoft Developer Studio Project File - Name="runtests" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=runtests - 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 "runtests.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 "runtests.mak" CFG="runtests - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "runtests - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "runtests - 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)" == "runtests - 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 "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# 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 "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "COMPILED_FROM_DSP" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x1009 /d "NDEBUG" +# ADD RSC /l 0x1009 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 +# ADD LINK32 libexpat.lib /nologo /subsystem:console /machine:I386 /libpath:"..\win32\bin\Release" + +!ELSEIF "$(CFG)" == "runtests - 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 "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# 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 "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "COMPILED_FROM_DSP" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x1009 /d "_DEBUG" +# ADD RSC /l 0x1009 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 libexpat.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\win32\bin\Debug" + +!ENDIF + +# Begin Target + +# Name "runtests - Win32 Release" +# Name "runtests - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\chardata.c +# End Source File +# Begin Source File + +SOURCE=.\minicheck.c +# End Source File +# Begin Source File + +SOURCE=.\runtests.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\chardata.h +# End Source File +# Begin Source File + +SOURCE=.\minicheck.h +# End Source File +# 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/expat/tests/runtests.dsw b/expat/tests/runtests.dsw new file mode 100644 index 00000000..96273619 --- /dev/null +++ b/expat/tests/runtests.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "runtests"=.\runtests.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### +