From ed5640d8b587fbcfed7dd7967f3de04b37a76f26 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 11:06:44 +0200 Subject: Adding upstream version 4:7.4.7. Signed-off-by: Daniel Baumann --- external/cppunit/windows-arm64.patch.1 | 786 +++++++++++++++++++++++++++++++++ 1 file changed, 786 insertions(+) create mode 100644 external/cppunit/windows-arm64.patch.1 (limited to 'external/cppunit/windows-arm64.patch.1') diff --git a/external/cppunit/windows-arm64.patch.1 b/external/cppunit/windows-arm64.patch.1 new file mode 100644 index 000000000..0e41fa005 --- /dev/null +++ b/external/cppunit/windows-arm64.patch.1 @@ -0,0 +1,786 @@ +diff -ur cppunit-1.15.1.orig/src/cppunit/cppunit_dll.vcxproj cppunit-1.15.1/src/cppunit/cppunit_dll.vcxproj +--- cppunit-1.15.1.orig/src/cppunit/cppunit_dll.vcxproj 2019-11-28 20:35:43.000000000 +0100 ++++ cppunit-1.15.1/src/cppunit/cppunit_dll.vcxproj 2020-08-03 03:04:20.181281900 +0200 +@@ -1,6 +1,10 @@ +  + + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -9,6 +13,10 @@ + Debug + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -34,6 +42,11 @@ + false + MultiByte + ++ ++ DynamicLibrary ++ false ++ MultiByte ++ + + DynamicLibrary + false +@@ -44,6 +57,11 @@ + false + MultiByte + ++ ++ DynamicLibrary ++ false ++ MultiByte ++ + + + +@@ -55,6 +73,10 @@ + + + ++ ++ ++ ++ + + + +@@ -63,6 +85,10 @@ + + + ++ ++ ++ ++ + + + .\DebugDll\ +@@ -76,6 +102,12 @@ + true + cppunitd_dll + ++ ++ .\DebugDll\ ++ .\DebugDll\ ++ true ++ cppunitd_dll ++ + + .\ReleaseDll\ + .\ReleaseDll\ +@@ -86,6 +116,11 @@ + .\ReleaseDll\ + false + ++ ++ .\ReleaseDll\ ++ .\ReleaseDll\ ++ false ++ + + + MultiThreadedDebugDLL +@@ -180,6 +213,52 @@ + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + ++ ++ ++ MultiThreadedDebugDLL ++ Default ++ false ++ Disabled ++ true ++ Level3 ++ 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 ++ ++ ++ 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 +@@ -267,6 +345,52 @@ + true + true + true ++ Console ++ .\ReleaseDll\cppunit_dll.dll ++ .\ReleaseDll\cppunit_dll.lib ++ odbc32.lib;odbccp32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ MultiThreadedDLL ++ OnlyExplicitInline ++ true ++ true ++ MaxSpeed ++ true ++ Level3 ++ true ++ ..\..\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 ++ ++ ++ 0x040c ++ NDEBUG;%(PreprocessorDefinitions) ++ ++ ++ true ++ .\ReleaseDll\cppunit_dll.bsc ++ ++ ++ true ++ true ++ true + Console + .\ReleaseDll\cppunit_dll.dll + .\ReleaseDll\cppunit_dll.lib +diff -ur cppunit-1.15.1.orig/src/DllPlugInTester/DllPlugInTester.vcxproj cppunit-1.15.1/src/DllPlugInTester/DllPlugInTester.vcxproj +--- cppunit-1.15.1.orig/src/DllPlugInTester/DllPlugInTester.vcxproj 2019-11-28 20:35:43.000000000 +0100 ++++ cppunit-1.15.1/src/DllPlugInTester/DllPlugInTester.vcxproj 2020-08-03 03:05:06.310642100 +0200 +@@ -1,6 +1,10 @@ +  + + ++ ++ Debug Static ++ ARM64 ++ + + Debug Static + Win32 +@@ -9,6 +13,10 @@ + Debug Static + x64 + ++ ++ Debug Unicode ++ ARM64 ++ + + Debug Unicode + Win32 +@@ -17,6 +25,10 @@ + Debug Unicode + x64 + ++ ++ Debug ++ ARM64 ++ + + Debug + Win32 +@@ -25,6 +37,10 @@ + Debug + x64 + ++ ++ Release Static ++ ARM64 ++ + + Release Static + Win32 +@@ -33,6 +49,10 @@ + Release Static + x64 + ++ ++ Release Unicode ++ ARM64 ++ + + Release Unicode + Win32 +@@ -41,6 +61,10 @@ + Release Unicode + x64 + ++ ++ Release ++ ARM64 ++ + + Release + Win32 +@@ -66,6 +90,11 @@ + false + MultiByte + ++ ++ Application ++ false ++ MultiByte ++ + + Application + false +@@ -76,6 +105,11 @@ + false + MultiByte + ++ ++ Application ++ false ++ MultiByte ++ + + Application + false +@@ -86,6 +120,11 @@ + false + MultiByte + ++ ++ Application ++ false ++ MultiByte ++ + + Application + false +@@ -96,6 +135,11 @@ + false + MultiByte + ++ ++ Application ++ false ++ MultiByte ++ + + Application + false +@@ -106,6 +150,11 @@ + false + MultiByte + ++ ++ Application ++ false ++ MultiByte ++ + + Application + false +@@ -116,6 +165,11 @@ + false + MultiByte + ++ ++ Application ++ false ++ MultiByte ++ + + + +@@ -127,6 +181,10 @@ + + + ++ ++ ++ ++ + + + +@@ -135,6 +193,10 @@ + + + ++ ++ ++ ++ + + + +@@ -143,6 +205,10 @@ + + + ++ ++ ++ ++ + + + +@@ -151,6 +217,10 @@ + + + ++ ++ ++ ++ + + + +@@ -159,6 +229,10 @@ + + + ++ ++ ++ ++ + + + +@@ -167,6 +241,10 @@ + + + ++ ++ ++ ++ + + + .\ReleaseUnicode\ +@@ -180,6 +258,12 @@ + false + $(ProjectName)u + ++ ++ .\Release\ ++ .\Release\ ++ false ++ $(ProjectName)u ++ + + .\Debug\ + .\Debug\ +@@ -192,6 +274,12 @@ + false + $(ProjectName)d + ++ ++ .\DebugDll\ ++ .\DebugDll\ ++ false ++ $(ProjectName)d ++ + + .\Release\ + .\Release\ +@@ -202,6 +288,11 @@ + .\Release\ + false + ++ ++ .\Release\ ++ .\Release\ ++ false ++ + + .\DebugDll\ + .\DebugDll\ +@@ -214,6 +303,12 @@ + false + DllPlugInTesterd_dll + ++ ++ .\DebugDll\ ++ .\DebugDll\ ++ false ++ DllPlugInTesterd_dll ++ + + .\ReleaseDll\ + .\ReleaseDll\ +@@ -226,6 +319,12 @@ + false + $(ProjectName)_dll + ++ ++ .\ReleaseDll\ ++ .\ReleaseDll\ ++ false ++ $(ProjectName)_dll ++ + + .\DebugUnicode\ + .\DebugUnicode\ +@@ -238,6 +335,12 @@ + false + $(ProjectName)ud + ++ ++ .\DebugDll\ ++ .\DebugDll\ ++ false ++ $(ProjectName)ud ++ + + + MultiThreadedDLL +@@ -324,6 +425,49 @@ + odbc32.lib;odbccp32.lib;cppunit.lib;%(AdditionalDependencies) + + ++ ++ ++ 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 +@@ -411,6 +555,49 @@ + odbc32.lib;odbccp32.lib;cppunitd.lib;%(AdditionalDependencies) + + ++ ++ ++ MultiThreadedDebugDLL ++ Default ++ false ++ Disabled ++ true ++ Level3 ++ 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 +@@ -497,6 +684,49 @@ + odbc32.lib;odbccp32.lib;cppunit.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 +@@ -584,6 +814,49 @@ + odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies) + + ++ ++ ++ MultiThreadedDebugDLL ++ Default ++ false ++ Disabled ++ true ++ Level3 ++ 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_dll.exe ++ ../../lib;%(AdditionalLibraryDirectories) ++ odbc32.lib;odbccp32.lib;cppunitd_dll.lib;%(AdditionalDependencies) ++ ++ + + + MultiThreadedDLL +@@ -670,6 +943,49 @@ + odbc32.lib;odbccp32.lib;cppunit_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_dll.exe ++ ../../lib;%(AdditionalLibraryDirectories) ++ odbc32.lib;odbccp32.lib;cppunit_dll.lib;%(AdditionalDependencies) ++ ++ + + + MultiThreadedDebugDLL +@@ -718,6 +1034,49 @@ + + MultiThreadedDebugDLL + Default ++ false ++ Disabled ++ true ++ Level3 ++ 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) ++ ++ ++ ++ ++ MultiThreadedDebugDLL ++ Default + false + Disabled + true -- cgit v1.2.3