OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b80cabd)
Upgrade to 7-Zip 18.06
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 12 Jan 2019 08:42:00 +0000 (17:42 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 12 Jan 2019 08:42:00 +0000 (17:42 +0900)
--HG--
branch : stable

ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj patch | blob | history
ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj patch | blob | history
ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj patch | blob | history
DownloadDeps.cmd patch | blob | history
Externals/hg_clone.cmd patch | blob | history
Externals/versions.txt patch | blob | history

diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj
index 6ebb139..57ffadc 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2015.vcxproj
@@ -80,10 +80,10 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1805U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1805U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1805U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1805U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1806U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1806U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1806U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1806U</TargetName>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj
index 55a185a..a519bd5 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj
@@ -83,10 +83,10 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1805U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1805U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1805U</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1805U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1806U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1806U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1806U</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1806U</TargetName>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>\r
@@ -449,4 +449,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj
index 914cc60..dc05ace 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj
@@ -83,10 +83,10 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1805U</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1805U</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1805U</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1805U</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Merge7z1806U</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Merge7z1806U</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Merge7z1806U</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Merge7z1806U</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -449,4 +449,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index 5db911a..7d53cc4 100644 (file)
--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -4,8 +4,8 @@ set downloadsdir=%~dp0\build\WinMergeDownloadDeps
 set urls_destdirs=^
 https://bitbucket.org/winmerge/winmerge/downloads/winmerge_manual_build_tools_v1.zip!Docs\Users\Manual\build ^
 https://bitbucket.org/winmerge/winmerge/downloads/ShellExtension-1.17.4.0.zip!Build ^
-https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1805.1-win32.zip!Build ^
-https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1805.1-x64.zip!Build\X64 ^
+https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1806.1-win32.zip!Build ^
+https://bitbucket.org/winmerge/winmerge/downloads/Merge7z1806.1-x64.zip!Build\X64 ^
 https://bitbucket.org/winmerge/frhed/downloads/frhed-0.10904.2017.1-win32.zip!Build ^
 https://bitbucket.org/winmerge/frhed/downloads/frhed-0.10904.2017.1-x64.zip!Build\X64 ^
 https://bitbucket.org/winmerge/winimerge/downloads/winimerge-1-0-7-0-exe.zip!Build ^
diff --git a/Externals/hg_clone.cmd b/Externals/hg_clone.cmd
index f054a6e..e31f48a 100644 (file)
--- a/Externals/hg_clone.cmd
+++ b/Externals/hg_clone.cmd
@@ -1,7 +1,7 @@
 set urls_revs=^\r
   https://bitbucket.org/winmerge/freeimage!05e4e65 ^\r
   https://bitbucket.org/winmerge/winimerge!1.0.7.0 ^\r
-  https://bitbucket.org/winmerge/sevenzip!571e08f ^\r
+  https://bitbucket.org/winmerge/sevenzip!899ceeb ^\r
   https://bitbucket.org/winmerge/frhed!7f942c2 ^\r
   https://bitbucket.org/winmerge/patch!b0a7238\r
 \r
diff --git a/Externals/versions.txt b/Externals/versions.txt
index dcedbb8..5d05fa6 100644 (file)
--- a/Externals/versions.txt
+++ b/Externals/versions.txt
@@ -10,4 +10,4 @@ freeimage: 3.16.0
 WinIMerge: 1.0.7.0
 Google C++ Testing Framework: 1.70
 GnuWin32 Patch for Windows: 2.5.9-7
-7-zip: 18.05 
+7-zip: 18.06
About OSDN
Find Software
Develop Software
Help