From 58cb1a2f25ceba89766797af4ce3ce1d590b3915 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Fri, 7 Dec 2012 00:29:45 +0100 Subject: fix pretty broken cppunit gbuild conversion on windows The original dmake makefile.mk even said the files were missing ... ? --- cppunit/ExternalPackage_cppunit.mk | 2 +- cppunit/UnpackedTarball_cppunit.mk | 4 + cppunit/src/DllPlugInTester.vcproj | 718 +++++++++++++++ cppunit/src/DllPlugInTester.vcxproj | 408 +++++++++ cppunit/src/cppunit_dll.vcproj | 1672 +++++++++++++++++++++++++++++++++++ cppunit/src/cppunit_dll.vcxproj | 311 +++++++ 6 files changed, 3114 insertions(+), 1 deletion(-) create mode 100644 cppunit/src/DllPlugInTester.vcproj create mode 100644 cppunit/src/DllPlugInTester.vcxproj create mode 100644 cppunit/src/cppunit_dll.vcproj create mode 100644 cppunit/src/cppunit_dll.vcxproj diff --git a/cppunit/ExternalPackage_cppunit.mk b/cppunit/ExternalPackage_cppunit.mk index 3d8ab3fdae22..e9c6cac29af2 100644 --- a/cppunit/ExternalPackage_cppunit.mk +++ b/cppunit/ExternalPackage_cppunit.mk @@ -14,7 +14,7 @@ ifeq ($(OS),WNT) ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/cppunit_dll.dll,src/cppunit/ReleaseDll/cppunit_dll.dll)) $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppunit/ReleaseDll/cppunit_dll.lib)) -$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester_dll.exe,src/DllPlugInTester/ReleaseDll/DllPlugInTester_dll.exe)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester.exe,src/DllPlugInTester/ReleaseDll/DllPlugInTester.exe)) else $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1-13-0.dll,src/cppunit/.libs/libcppunit-1-13-0.dll)) $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/cppunit.dll.a,src/cppunit/.libs/cppunit.dll.a)) diff --git a/cppunit/UnpackedTarball_cppunit.mk b/cppunit/UnpackedTarball_cppunit.mk index c8cb69eafc09..49e556711e3c 100644 --- a/cppunit/UnpackedTarball_cppunit.mk +++ b/cppunit/UnpackedTarball_cppunit.mk @@ -29,5 +29,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ cppunit/disable-dynloading.patch \ )) endif +$(eval $(call gb_UnpackedTarball_add_file,cppunit,src/cppunit/cppunit_dll.vcproj,cppunit/src/cppunit_dll.vcproj)) +$(eval $(call gb_UnpackedTarball_add_file,cppunit,src/cppunit/cppunit_dll.vcxproj,cppunit/src/cppunit_dll.vcxproj)) +$(eval $(call gb_UnpackedTarball_add_file,cppunit,src/DllPlugInTester/DllPlugInTester.vcproj,cppunit/src/DllPlugInTester.vcproj)) +$(eval $(call gb_UnpackedTarball_add_file,cppunit,src/DllPlugInTester/DllPlugInTester.vcxproj,cppunit/src/DllPlugInTester.vcxproj)) # vim: set noet sw=4 ts=4: diff --git a/cppunit/src/DllPlugInTester.vcproj b/cppunit/src/DllPlugInTester.vcproj new file mode 100644 index 000000000000..2926779d17d6 --- /dev/null +++ b/cppunit/src/DllPlugInTester.vcproj @@ -0,0 +1,718 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cppunit/src/DllPlugInTester.vcxproj b/cppunit/src/DllPlugInTester.vcxproj new file mode 100644 index 000000000000..a98c07bc0473 --- /dev/null +++ b/cppunit/src/DllPlugInTester.vcxproj @@ -0,0 +1,408 @@ + + + + + Debug Static + Win32 + + + Debug Unicode + Win32 + + + Debug + Win32 + + + Release Static + Win32 + + + Release Unicode + Win32 + + + Release + Win32 + + + Template + Win32 + + + + + + + + + Application + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + MultiByte + + + Application + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .\ReleaseUnicode\ + .\ReleaseUnicode\ + false + + + .\Debug\ + .\Debug\ + false + + + .\Release\ + .\Release\ + false + + + .\DebugDll\ + .\DebugDll\ + false + + + .\ReleaseDll\ + .\ReleaseDll\ + false + + + .\DebugUnicode\ + .\DebugUnicode\ + false + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MinSpace + true + Level3 + true + OldStyle + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + .\ReleaseUnicode\ + .\ReleaseUnicode\DllPlugInTester.pch + + + .\ReleaseUnicode\ + .\ReleaseUnicode\ + + + copy "$(TargetPath)" ..\..\lib\$(TargetName).exe + Copying target to lib/ + + + .\ReleaseUnicode\DllPlugInTester.tlb + + + 0x040c + NDEBUG;%(PreprocessorDefinitions) + + + true + .\ReleaseUnicode\DllPlugInTester.bsc + + + true + Console + ReleaseUnicode\DllPlugInTesteru.exe + ../../lib;%(AdditionalLibraryDirectories) + odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies) + + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + true + true + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + .\Debug\ + .\Debug\DllPlugInTester.pch + + + .\Debug\ + .\Debug\ + EnableFastChecks + + + copy $(TargetPath) ..\..\lib\$(TargetName).exe + Copying target to lib/ + + + .\Debug\DllPlugInTester.tlb + + + 0x040c + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\DllPlugInTester.bsc + + + true + true + Console + Debug\DllPlugInTesterd.exe + ../../lib;%(AdditionalLibraryDirectories) + odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies) + + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MinSpace + true + Level3 + true + OldStyle + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + .\Release\ + .\Release\DllPlugInTester.pch + + + .\Release\ + .\Release\ + + + copy $(TargetPath) ..\..\lib\$(TargetName).exe + Copying target to lib/ + + + .\Release\DllPlugInTester.tlb + + + 0x040c + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\DllPlugInTester.bsc + + + true + Console + .\Release\DllPlugInTester.exe + ../../lib;%(AdditionalLibraryDirectories) + odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies) + + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + true + true + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;CPPUNIT_DLL;%(PreprocessorDefinitions) + .\DebugDll\ + .\DebugDll\DllPlugInTester.pch + + + .\DebugDll\ + .\DebugDll\ + EnableFastChecks + + + copy "$(TargetPath)" ..\..\lib\$(TargetName).exe + Copying target to lib/ + + + .\DebugDll\DllPlugInTester.tlb + + + 0x040c + _DEBUG;%(PreprocessorDefinitions) + + + true + .\DebugDll\DllPlugInTester.bsc + + + true + true + Console + DebugDll\DllPlugInTesterd.exe + ../../lib;%(AdditionalLibraryDirectories) + odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies) + + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MinSpace + true + Level3 + true + OldStyle + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;CPPUNIT_DLL;%(PreprocessorDefinitions) + .\ReleaseDll\ + .\ReleaseDll\DllPlugInTester.pch + + + .\ReleaseDll\ + .\ReleaseDll\ + + + copy "$(TargetPath)" ..\..\lib\$(TargetName).exe + Copying target to lib/ + + + .\ReleaseDll\DllPlugInTester.tlb + + + 0x040c + NDEBUG;%(PreprocessorDefinitions) + + + true + .\ReleaseDll\DllPlugInTester.bsc + + + true + Console + ReleaseDll\DllPlugInTester.exe + ../../lib;%(AdditionalLibraryDirectories) + odbc32.lib;odbccp32.lib;cppunit_dll.lib;%(AdditionalDependencies) + + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + true + true + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + .\DebugUnicode\ + .\DebugUnicode\DllPlugInTester.pch + + + .\DebugUnicode\ + .\DebugUnicode\ + EnableFastChecks + + + copy "$(TargetPath)" ..\..\lib\$(TargetName).exe + Copying target to lib/ + + + .\DebugUnicode\DllPlugInTester.tlb + + + 0x040c + _DEBUG;%(PreprocessorDefinitions) + + + true + .\DebugUnicode\DllPlugInTester.bsc + + + true + true + Console + DebugUnicode\DllPlugInTesterud.exe + ../../lib;%(AdditionalLibraryDirectories) + odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies) + + + + + + + + + + + + Document + + + + + + \ No newline at end of file diff --git a/cppunit/src/cppunit_dll.vcproj b/cppunit/src/cppunit_dll.vcproj new file mode 100644 index 000000000000..bbd0b2f8c74b --- /dev/null +++ b/cppunit/src/cppunit_dll.vcproj @@ -0,0 +1,1672 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cppunit/src/cppunit_dll.vcxproj b/cppunit/src/cppunit_dll.vcxproj new file mode 100644 index 000000000000..e2b1d1be4c2d --- /dev/null +++ b/cppunit/src/cppunit_dll.vcxproj @@ -0,0 +1,311 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Template + Win32 + + + + + + + + + Application + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + + + + + + + + + + + + + + + + + + .\DebugDll\ + .\DebugDll\ + true + + + .\ReleaseDll\ + .\ReleaseDll\ + false + + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + true + true + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions) + .\DebugDll\ + .\DebugDll\cppunit_dll.pch + .\DebugDll\ + .\DebugDll\ + EnableFastChecks + + + copy "$(TargetPath)" ..\..\lib\$(TargetName).dll +copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib + Copying target to lib/ + + + true + _DEBUG;%(PreprocessorDefinitions) + .\DebugDll\cppunit_dll.tlb + true + Win32 + + + 0x040c + _DEBUG;%(PreprocessorDefinitions) + + + true + .\DebugDll\cppunit_dll.bsc + + + true + true + true + Console + DebugDll\cppunitd_dll.dll + .\DebugDll\cppunitd_dll.lib + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + MultiThreadedDLL + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + true + OldStyle + ..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPUNIT_BUILD_DLL;%(PreprocessorDefinitions) + .\ReleaseDll\ + .\ReleaseDll\cppunit_dll.pch + .\ReleaseDll\ + .\ReleaseDll\ + + + copy "$(TargetPath)" ..\..\lib\$(TargetName).dll +copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib + Copying target to lib/ + + + true + NDEBUG;%(PreprocessorDefinitions) + .\ReleaseDll\cppunit_dll.tlb + true + Win32 + + + 0x040c + NDEBUG;%(PreprocessorDefinitions) + + + true + .\ReleaseDll\cppunit_dll.bsc + + + true + true + Console + .\ReleaseDll\cppunit_dll.dll + .\ReleaseDll\cppunit_dll.lib + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + + Document + + + Document + + + + + + \ No newline at end of file -- cgit