From 54389d6e2fd76dffe81f5bdfe1ada5e1989c2616 Mon Sep 17 00:00:00 2001
From: Tino Reichardt <milky-7zip@mcmilk.de>
Date: Thu, 27 Apr 2017 20:38:09 +0200
Subject: [PATCH] release time for v1.1.4 - add package.cmd, I am using this
 file for creating the setup - fix date in the version headers - minor
 improvements in the build batch files

---
 C/7zVersion.h     |  4 ++--
 C/7zVersionTr.h   |  2 +-
 CPP/build-x32.cmd |  4 ++++
 CPP/build-x64.cmd |  6 +++++-
 cleanup.cmd       | 35 ++++++-----------------------------
 package.cmd       | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 65 insertions(+), 33 deletions(-)
 create mode 100644 package.cmd

diff --git a/C/7zVersion.h b/C/7zVersion.h
index 781026f4..08225ff8 100644
--- a/C/7zVersion.h
+++ b/C/7zVersion.h
@@ -1,9 +1,9 @@
 #define MY_VER_MAJOR 16
 #define MY_VER_MINOR 04
 #define MY_VER_BUILD 0
-#define MY_VERSION_NUMBERS "16.04 ZS"
+#define MY_VERSION_NUMBERS "16.04 ZS v1.1.4"
 #define MY_VERSION "16.04 ZS"
-#define MY_DATE "2017-03-20"
+#define MY_DATE "2017-04-27"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt"
diff --git a/C/7zVersionTr.h b/C/7zVersionTr.h
index 9c84f114..28e6e40f 100644
--- a/C/7zVersionTr.h
+++ b/C/7zVersionTr.h
@@ -3,7 +3,7 @@
 #define MY_VER_BUILD 4
 #define MY_VERSION_NUMBERS "1.1.4"
 #define MY_VERSION         "1.1.4"
-#define MY_DATE            "2017-03-20"
+#define MY_DATE            "2017-03-27"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME     "Tino Reichardt"
diff --git a/CPP/build-x32.cmd b/CPP/build-x32.cmd
index 6173968a..1c73f3fe 100644
--- a/CPP/build-x32.cmd
+++ b/CPP/build-x32.cmd
@@ -15,6 +15,10 @@ cd %ROOT%\Bundles\Format7zF
 nmake %OPTS%
 copy O\7z.dll %OUTDIR%\7z.dll
 
+cd %ROOT%\Bundles\Format7zUSB
+nmake %OPTS%
+copy O\7zu.dll %OUTDIR%\7zu-x32.dll
+
 cd %ROOT%\UI\FileManager
 nmake %OPTS%
 copy O\7zFM.exe %OUTDIR%\7zFM.exe
diff --git a/CPP/build-x64.cmd b/CPP/build-x64.cmd
index 3c746b91..d3375c5a 100644
--- a/CPP/build-x64.cmd
+++ b/CPP/build-x64.cmd
@@ -15,6 +15,10 @@ cd %ROOT%\Bundles\Format7zF
 nmake %OPTS%
 copy AMD64\7z.dll %OUTDIR%\7z.dll
 
+cd %ROOT%\Bundles\Format7zUSB
+nmake %OPTS%
+copy AMD64\7zu.dll %OUTDIR%\7zu-x64.dll
+
 cd %ROOT%\UI\FileManager
 nmake %OPTS%
 copy AMD64\7zFM.exe %OUTDIR%\7zFM.exe
@@ -39,7 +43,7 @@ cd %ROOT%\Bundles\Codec_lz5
 nmake %OPTS%
 copy AMD64\lz5.dll %OUTDIR%\lz5-x64.dll
 
-cd %ROOT%\Bundles\Codec_zstdf
+cd %ROOT%\Bundles\Codec_zstdF
 nmake %OPTS%
 copy AMD64\zstd.dll %OUTDIR%\zstd-x64.dll
 
diff --git a/cleanup.cmd b/cleanup.cmd
index a6b00305..7fadc123 100644
--- a/cleanup.cmd
+++ b/cleanup.cmd
@@ -1,33 +1,10 @@
 @echo off
 
-rd /S /Q "CPP\7zip\bin32"
-rd /S /Q "CPP\7zip\bin64"
+FOR /R .\ %%d IN (AMD64 O) DO rd /S /Q %%d 2>NUL
 
-rd /S /Q "C/Util/7zipInstall/O"
-rd /S /Q "C/Util/7zipUninstall/O"
-rd /S /Q "CPP/7zip/Bundles/Codec_lz4/O"
-rd /S /Q "CPP/7zip/Bundles/Codec_lz5/O"
-rd /S /Q "CPP/7zip/Bundles/Codec_zstdF/O"
-rd /S /Q "CPP/7zip/Bundles/Format7z/O"
-rd /S /Q "CPP/7zip/Bundles/Format7zF/O"
-rd /S /Q "CPP/7zip/Bundles/SFXCon/O"
-rd /S /Q "CPP/7zip/Bundles/SFXWin/O"
-rd /S /Q "CPP/7zip/UI/Console/O"
-rd /S /Q "CPP/7zip/UI/Explorer/O"
-rd /S /Q "CPP/7zip/UI/FileManager/O"
-rd /S /Q "CPP/7zip/UI/GUI/O"
-
-rd /S /Q "C/Util/7zipInstall/AMD64"
-rd /S /Q "C/Util/7zipUninstall/AMD64"
-rd /S /Q "CPP/7zip/Bundles/Codec_lz4/AMD64"
-rd /S /Q "CPP/7zip/Bundles/Codec_lz5/AMD64"
-rd /S /Q "CPP/7zip/Bundles/Codec_zstdF/AMD64"
-rd /S /Q "CPP/7zip/Bundles/Format7z/AMD64"
-rd /S /Q "CPP/7zip/Bundles/Format7zF/AMD64"
-rd /S /Q "CPP/7zip/Bundles/SFXCon/AMD64"
-rd /S /Q "CPP/7zip/Bundles/SFXWin/AMD64"
-rd /S /Q "CPP/7zip/UI/Console/AMD64"
-rd /S /Q "CPP/7zip/UI/Explorer/AMD64"
-rd /S /Q "CPP/7zip/UI/FileManager/AMD64"
-rd /S /Q "CPP/7zip/UI/GUI/AMD64"
+rd /S /Q "CPP\7zip\bin32" 2>NUL
+rd /S /Q "CPP\7zip\bin64" 2>NUL
+rd /S /Q "CPP\7zip\codecs" 2>NUL
+rd /S /Q "CPP\7zip\x32" 2>NUL
+rd /S /Q "CPP\7zip\x64" 2>NUL
 
diff --git a/package.cmd b/package.cmd
new file mode 100644
index 00000000..abb082c8
--- /dev/null
+++ b/package.cmd
@@ -0,0 +1,47 @@
+@echo off
+REM Build signed setups for 7-Zip ZS /TR
+
+SET WD=%cd%
+SET ROOT=%cd%\CPP\7zip
+SET COPYCMD=/Y /B
+SET TSERVER=http://timestamp.globalsign.com/?signature=sha2
+
+cd %ROOT%
+rd /S /Q "x32"
+rd /S /Q "x64"
+rd /S /Q "codecs"
+7z x C:\tmp\x32.zip
+7z x C:\tmp\x64.zip
+7z x C:\tmp\codecs.zip
+
+FOR %%f IN (7-zip.dll 7z.dll 7z.exe 7za.dll 7za.exe 7zG.exe 7zFM.exe 7z.sfx 7zCon.sfx Uninstall.exe) DO (
+  copy bin32\%%f x32\%%f
+  copy bin64\%%f x64\%%f
+)
+copy bin32\7-zip.dll x32\7-zip32.dll
+
+FOR %%f IN (lz4 lz5 zstd) DO (
+  copy bin32\%%f-x32.dll codecs\%%f-x32.dll
+  copy bin64\%%f-x64.dll codecs\%%f-x64.dll
+)
+del 32.7z 64.7z codecs.7z
+
+signtool.exe sign /v /fd SHA256 /tr %TSERVER% /td sha256 x32\*.exe x32\*.dll x64\*.exe x64\*.dll
+
+cd x32
+7z a ../32.7z -m0=lzma -mx9 -ms=on -mf=bcj2
+
+cd ..\x64
+7z a ../64.7z -m0=lzma -mx9 -ms=on -mf=bcj2
+
+cd ..\codecs
+7z a ..\Codecs.7z -m0=lzma -mx9 -ms=on -mf=bcj2
+cd ..
+
+copy bin32\Install-x32.exe + 32.7z 7z1604-zstd-x32.exe
+copy bin64\Install-x64.exe + 64.7z 7z1604-zstd-x64.exe
+del 32.7z 64.7z
+
+signtool.exe sign /v /fd SHA256 /tr %TSERVER% /td sha256 7z1604-zstd-*.exe
+cd %wd%
+