From ed0dd75abc3b493d8a611500fe01ead8261008fb Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Wed, 20 Nov 2024 13:52:50 +0100 Subject: [PATCH 1/2] Update release scripts to msvc2022 Signed-off-by: Maxime Gervais --- .../FieldsDescription/FieldsDescription.vcxproj | 4 ++++ .../ShellExtension/MediaInfoShellExt.vcxproj | 2 ++ Release/Release_DLL_Windows_i386.bat | 13 ++++++++----- Release/Release_DLL_Windows_x64.bat | 13 ++++++++----- Source/Install/MediaInfo_DLL_Windows_i386.nsi | 4 ++-- Source/Install/MediaInfo_DLL_Windows_x64.nsi | 4 ++-- 6 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Project/MSVC2022/FieldsDescription/FieldsDescription.vcxproj b/Project/MSVC2022/FieldsDescription/FieldsDescription.vcxproj index b1137c457..5e6660059 100644 --- a/Project/MSVC2022/FieldsDescription/FieldsDescription.vcxproj +++ b/Project/MSVC2022/FieldsDescription/FieldsDescription.vcxproj @@ -77,6 +77,7 @@ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true ../../../../ZenLib/Source;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL Console @@ -92,6 +93,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true ../../../../ZenLib/Source;%(AdditionalIncludeDirectories) + MultiThreadedDLL Console @@ -107,6 +109,7 @@ _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true ../../../../ZenLib/Source;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL Console @@ -122,6 +125,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true ../../../../ZenLib/Source;%(AdditionalIncludeDirectories) + MultiThreadedDLL Console diff --git a/Project/MSVC2022/ShellExtension/MediaInfoShellExt.vcxproj b/Project/MSVC2022/ShellExtension/MediaInfoShellExt.vcxproj index 1da0751df..b98c3a82f 100644 --- a/Project/MSVC2022/ShellExtension/MediaInfoShellExt.vcxproj +++ b/Project/MSVC2022/ShellExtension/MediaInfoShellExt.vcxproj @@ -154,6 +154,7 @@ ..\..\..\Source;%(AdditionalIncludeDirectories) Use true + MultiThreadedDLL NoExtensions Guard @@ -187,6 +188,7 @@ ..\..\..\Source;%(AdditionalIncludeDirectories) Use true + MultiThreadedDLL Guard diff --git a/Release/Release_DLL_Windows_i386.bat b/Release/Release_DLL_Windows_i386.bat index 8241230ca..bdc25d70f 100644 --- a/Release/Release_DLL_Windows_i386.bat +++ b/Release/Release_DLL_Windows_i386.bat @@ -102,6 +102,9 @@ xcopy ..\Project\MSVC2015\Example\HowToUse_Dll.vcxproj.filters MediaInfoDLL_Wind xcopy ..\Project\MSVC2019\*.sln MediaInfoDLL_Windows_i386\Developers\Project\MSVC2019\ xcopy ..\Project\MSVC2019\Example\HowToUse_Dll.vcxproj MediaInfoDLL_Windows_i386\Developers\Project\MSVC2019\Example\ xcopy ..\Project\MSVC2019\Example\HowToUse_Dll.vcxproj.filters MediaInfoDLL_Windows_i386\Developers\Project\MSVC2019\Example\ +xcopy ..\Project\MSVC2022\*.sln MediaInfoDLL_Windows_i386\Developers\Project\MSVC2022\ +xcopy ..\Project\MSVC2022\Example\HowToUse_Dll.vcxproj MediaInfoDLL_Windows_i386\Developers\Project\MSVC2022\Example\ +xcopy ..\Project\MSVC2022\Example\HowToUse_Dll.vcxproj.filters MediaInfoDLL_Windows_i386\Developers\Project\MSVC2022\Example\ xcopy ..\Project\GCC\Example\Make* MediaInfoDLL_Windows_i386\Developers\Project\GCC\Example\ xcopy ..\Project\Java\Example.JNA\*.java MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNA\ xcopy ..\Project\Java\Example.JNA\*.txt MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNA\ @@ -126,8 +129,8 @@ xcopy ..\Project\NetBeans\Example.JNative\src\*.java MediaInfoDLL_Windows_i386\D rem --- Copying : Libs --- xcopy ..\Release\BCB\DLL\MediaInfo.lib MediaInfoDLL_Windows_i386\Developers\Release\BCB\DLL\ -xcopy ..\Project\MSVC2019\Win32\Release\MediaInfo.lib MediaInfoDLL_Windows_x64\Developers\Project\MSVC2019\Win32\Release\ -xcopy ..\Project\MSVC2019\Win32\Debug\MediaInfo.lib MediaInfoDLL_Windows_x64\Developers\Project\MSVC2019\x64\Debug\ +xcopy ..\Project\MSVC2022\Win32\Release\MediaInfo.lib MediaInfoDLL_Windows_x64\Developers\Project\MSVC2022\Win32\Release\ +xcopy ..\Project\MSVC2022\Win32\Debug\MediaInfo.lib MediaInfoDLL_Windows_x64\Developers\Project\MSVC2022\x64\Debug\ rem --- Copying : Examples --- xcopy ..\Source\Example\HowToUse_Dll*.* MediaInfoDLL_Windows_i386\Developers\Source\Example\ @@ -143,9 +146,9 @@ rem --- Copying : Contrib --- xcopy ..\Contrib\*.* MediaInfoDLL_Windows_i386\Developers\Contrib\ /S rem --- Copying : DLL --- -xcopy ..\Project\MSVC2019\Win32\Release\MediaInfo.dll MediaInfoDLL_Windows_i386\ -xcopy ..\Project\MSVC2019\Win32\Release\MediaInfo_InfoTip.dll MediaInfoDLL_Windows_i386\ -xcopy ..\Project\MSVC2019\ShellExtension\*.bat MediaInfoDLL_Windows_i386\ +xcopy ..\Project\MSVC2022\Win32\Release\MediaInfo.dll MediaInfoDLL_Windows_i386\ +xcopy ..\Project\MSVC2022\Win32\Release\MediaInfo_InfoTip.dll MediaInfoDLL_Windows_i386\ +xcopy ..\Project\MSVC2022\ShellExtension\*.bat MediaInfoDLL_Windows_i386\ rem --- Compressing Archive --- diff --git a/Release/Release_DLL_Windows_x64.bat b/Release/Release_DLL_Windows_x64.bat index 82f80fe27..0c0a65d8f 100644 --- a/Release/Release_DLL_Windows_x64.bat +++ b/Release/Release_DLL_Windows_x64.bat @@ -102,6 +102,9 @@ xcopy ..\Project\MSVC2015\Example\HowToUse_Dll.vcxproj.filters MediaInfoDLL_Wind xcopy ..\Project\MSVC2019\*.sln MediaInfoDLL_Windows_x64\Developers\Project\MSVC2019\ xcopy ..\Project\MSVC2019\Example\HowToUse_Dll.vcxproj MediaInfoDLL_Windows_x64\Developers\Project\MSVC2019\Example\ xcopy ..\Project\MSVC2019\Example\HowToUse_Dll.vcxproj.filters MediaInfoDLL_Windows_x64\Developers\Project\MSVC2019\Example\ +xcopy ..\Project\MSVC2022\*.sln MediaInfoDLL_Windows_x64\Developers\Project\MSVC2022\ +xcopy ..\Project\MSVC2022\Example\HowToUse_Dll.vcxproj MediaInfoDLL_Windows_x64\Developers\Project\MSVC2022\Example\ +xcopy ..\Project\MSVC2022\Example\HowToUse_Dll.vcxproj.filters MediaInfoDLL_Windows_x64\Developers\Project\MSVC2022\Example\ xcopy ..\Project\GCC\Example\Make* MediaInfoDLL_Windows_x64\Developers\Project\GCC\Example\ xcopy ..\Project\Java\Example.JNA\*.java MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNA\ xcopy ..\Project\Java\Example.JNA\*.txt MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNA\ @@ -125,8 +128,8 @@ xcopy ..\Project\NetBeans\Example.JNative\*.txt MediaInfoDLL_Windows_x64\Develop xcopy ..\Project\NetBeans\Example.JNative\src\*.java MediaInfoDLL_Windows_x64\Developers\Project\NetBeans\Example.JNative\src\ rem --- Copying : Libs --- -xcopy ..\Project\MSVC2019\x64\Release\MediaInfo.lib MediaInfoDLL_Windows_x64\Developers\Project\MSVC2019\x64\Release\ -xcopy ..\Project\MSVC2019\x64\Debug\MediaInfo.lib MediaInfoDLL_Windows_x64\Developers\Project\MSVC2019\x64\Debug\ +xcopy ..\Project\MSVC2022\x64\Release\MediaInfo.lib MediaInfoDLL_Windows_x64\Developers\Project\MSVC2022\x64\Release\ +xcopy ..\Project\MSVC2022\x64\Debug\MediaInfo.lib MediaInfoDLL_Windows_x64\Developers\Project\MSVC2022\x64\Debug\ rem --- Copying : Examples --- xcopy ..\Source\Example\HowToUse_Dll*.* MediaInfoDLL_Windows_x64\Developers\Source\Example\ @@ -139,9 +142,9 @@ copy ..\Changes.txt MediaInfoDLL_Windows_x64\Developers\ copy ReadMe_DLL_Windows.txt MediaInfoDLL_Windows_x64\ReadMe.txt rem --- Copying : DLL --- -xcopy ..\Project\MSVC2019\x64\Release\MediaInfo.dll MediaInfoDLL_Windows_x64\ -xcopy ..\Project\MSVC2019\x64\Release\MediaInfo_InfoTip.dll MediaInfoDLL_Windows_x64\ -xcopy ..\Project\MSVC2019\ShellExtension\*.bat MediaInfoDLL_Windows_x64\ +xcopy ..\Project\MSVC2022\x64\Release\MediaInfo.dll MediaInfoDLL_Windows_x64\ +xcopy ..\Project\MSVC2022\x64\Release\MediaInfo_InfoTip.dll MediaInfoDLL_Windows_x64\ +xcopy ..\Project\MSVC2022\ShellExtension\*.bat MediaInfoDLL_Windows_x64\ rem --- Compressing Archive --- diff --git a/Source/Install/MediaInfo_DLL_Windows_i386.nsi b/Source/Install/MediaInfo_DLL_Windows_i386.nsi index 919026b54..4ad8df367 100644 --- a/Source/Install/MediaInfo_DLL_Windows_i386.nsi +++ b/Source/Install/MediaInfo_DLL_Windows_i386.nsi @@ -108,8 +108,8 @@ FunctionEnd Section "SectionPrincipale" SEC01 SetOutPath "$INSTDIR" - !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2019\Win32\Release\MediaInfo.dll" $SYSDIR\MediaInfo.dll $SYSDIR - !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2019\Win32\Release\MediaInfo_InfoTip.dll" $INSTDIR\MediaInfo_InfoTip.dll $INSTDIR + !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2022\Win32\Release\MediaInfo.dll" $SYSDIR\MediaInfo.dll $SYSDIR + !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2022\Win32\Release\MediaInfo_InfoTip.dll" $INSTDIR\MediaInfo_InfoTip.dll $INSTDIR SectionEnd Section -Post diff --git a/Source/Install/MediaInfo_DLL_Windows_x64.nsi b/Source/Install/MediaInfo_DLL_Windows_x64.nsi index 83138bc24..5d3752937 100644 --- a/Source/Install/MediaInfo_DLL_Windows_x64.nsi +++ b/Source/Install/MediaInfo_DLL_Windows_x64.nsi @@ -108,8 +108,8 @@ FunctionEnd Section "SectionPrincipale" SEC01 SetOutPath "$INSTDIR" - !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2019\x64\Release\MediaInfo.dll" $SYSDIR\MediaInfo.dll $SYSDIR - !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2019\x64\Release\MediaInfo_InfoTip.dll" $INSTDIR\MediaInfo_InfoTip.dll $INSTDIR + !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2022\x64\Release\MediaInfo.dll" $SYSDIR\MediaInfo.dll $SYSDIR + !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2022\x64\Release\MediaInfo_InfoTip.dll" $INSTDIR\MediaInfo_InfoTip.dll $INSTDIR SectionEnd Section -Post From a1ff716c1594df5e9ddaedecd6eebb1cda6c01b1 Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Thu, 21 Nov 2024 11:40:39 +0100 Subject: [PATCH 2/2] Fix CI Signed-off-by: Maxime Gervais --- .github/workflows/MediaInfoLib_Checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/MediaInfoLib_Checks.yml b/.github/workflows/MediaInfoLib_Checks.yml index 61fffae6d..8a1ebd044 100644 --- a/.github/workflows/MediaInfoLib_Checks.yml +++ b/.github/workflows/MediaInfoLib_Checks.yml @@ -40,7 +40,7 @@ jobs: sudo apt-get install -y libxml2-utils zlib1g-dev libcurl4-gnutls-dev libmms-dev fi if [ "$RUNNER_OS" == "macOS" ]; then - brew install libtool automake pkg-config + brew install libtool automake fi sudo npm install -g jsonlint - name: ZenLib