From 141eb0cf5d7aca1c0c08a6d3d4a7c43306f6cd32 Mon Sep 17 00:00:00 2001
From: Herwin <herwin.bozet@gmail.com>
Date: Wed, 2 Nov 2022 19:11:58 +0100
Subject: [PATCH] Added proper packaging Update .gitattributes, .gitignore, and
 2 more files...

---
 .gitattributes                   |  1 +
 .gitignore                       |  5 +----
 Packages/PACKAGES_SHOULD_BE_HERE |  1 -
 make.bat                         | 37 ++++++++++++++++++--------------
 4 files changed, 23 insertions(+), 21 deletions(-)
 delete mode 100644 Packages/PACKAGES_SHOULD_BE_HERE

diff --git a/.gitattributes b/.gitattributes
index 23e94ff..7c6645e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 *.rtf linguist-detectable=false
+*.bat linguist-detectable=false
diff --git a/.gitignore b/.gitignore
index c54f628..9b31ebc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,10 +13,7 @@ NibblePoker.Packaging.ListComPort/*.wixobj
 NibblePoker.Packaging.ListComPort/*.wixpdb
 NibblePoker.Packaging.ListComPort/*.bat
 
-Packages/*/
-Packages/*.msi
-Packages/*.zip
-Packages/*.7z
+Packages/
 
 *.exe
 *.pbd
diff --git a/Packages/PACKAGES_SHOULD_BE_HERE b/Packages/PACKAGES_SHOULD_BE_HERE
deleted file mode 100644
index d6076a5..0000000
--- a/Packages/PACKAGES_SHOULD_BE_HERE
+++ /dev/null
@@ -1 +0,0 @@
-See the filename...
diff --git a/make.bat b/make.bat
index 8191d3d..573a0f1 100644
--- a/make.bat
+++ b/make.bat
@@ -170,22 +170,11 @@ goto end
 
 :packages
 echo Removing old final distributable packages...
-del Packages\*.msi >nul 2>&1
-del Packages\*.exe >nul 2>&1
-rmdir /Q /S Packages\any
-rmdir /Q /S Packages\x86_DotNet6
-rmdir /Q /S Packages\x86_SelfContained
-rmdir /Q /S Packages\x64_DotNet6
-rmdir /Q /S Packages\x64_SelfContained
-rmdir /Q /S Packages\arm_DotNet6
-rmdir /Q /S Packages\arm_SelfContained
-rmdir /Q /S Packages\arm64_DotNet6
-rmdir /Q /S Packages\arm64_SelfContained
-rmdir /Q /S Packages\licenses_Others
-rmdir /Q /S Packages\licenses_SelfContained
+rmdir /Q /S Packages 2>nul
 echo.
 
 echo Preparing folders...
+mkdir Packages
 mkdir Packages\any
 mkdir Packages\x86_DotNet6
 mkdir Packages\x86_SelfContained
@@ -196,13 +185,15 @@ mkdir Packages\arm_SelfContained
 mkdir Packages\arm64_DotNet6
 mkdir Packages\arm64_SelfContained
 mkdir Packages\licenses_Others
+mkdir Packages\licenses_Others\Licenses
 mkdir Packages\licenses_SelfContained
+mkdir Packages\licenses_SelfContained\Licenses
 echo.
 
 echo Copying final distributable files...
-xcopy /E /v NibblePoker.Packaging.ListComPort\Licenses Packages\licenses_SelfContained
-del Packages\licenses_SelfContained\*.rtf
-copy Packages\licenses_SelfContained\License_NibblePoker.pdf Packages\licenses_Others\License_NibblePoker.pdf
+xcopy /E /v NibblePoker.Packaging.ListComPort\Licenses Packages\licenses_SelfContained\Licenses
+del Packages\licenses_SelfContained\Licenses\*.rtf
+copy Packages\licenses_SelfContained\Licenses\License_NibblePoker.pdf Packages\licenses_Others\Licenses\License_NibblePoker.pdf
 
 xcopy /E /v Builds\any Packages\any
 del Packages\any\*.pdb
@@ -223,7 +214,21 @@ copy /B /V Builds\arm64_single\NibblePoker.Application.ListComPort.exe Packages\
 copy /B /V Builds\arm64_single_sc_trim_comp\NibblePoker.Application.ListComPort.exe Packages\arm64_SelfContained\lscom.exe
 echo.
 
+echo Renaming some files...
+:: TODO: For the any build !
+echo.
+
 echo Creating final distributable packages...
+7z a -mx9 "./Packages/ListComPort_AnyCPU.zip" ./Packages/any/* ./Packages/licenses_Others/* > nul
+7z a -mx9 "./Packages/ListComPort_x86_Single.zip" ./Packages/x86_DotNet6/* ./Packages/licenses_Others/* > nul
+7z a -mx9 "./Packages/ListComPort_x86_SelfContained.zip" ./Packages/x86_SelfContained/* ./Packages/licenses_SelfContained/* > nul
+7z a -mx9 "./Packages/ListComPort_x64_Single.zip" ./Packages/x64_DotNet6/* ./Packages/licenses_Others/* > nul
+7z a -mx9 "./Packages/ListComPort_x64_SelfContained.zip" ./Packages/x64_SelfContained/* ./Packages/licenses_SelfContained/* > nul
+7z a -mx9 "./Packages/ListComPort_arm_Single.zip" ./Packages/arm_DotNet6/* ./Packages/licenses_Others/* > nul
+7z a -mx9 "./Packages/ListComPort_arm_SelfContained.zip" ./Packages/arm_SelfContained/* ./Packages/licenses_SelfContained/* > nul
+7z a -mx9 "./Packages/ListComPort_arm64_Single.zip" ./Packages/arm64_DotNet6/* ./Packages/licenses_Others/* > nul
+7z a -mx9 "./Packages/ListComPort_arm64_SelfContained.zip" ./Packages/arm64_SelfContained/* ./Packages/licenses_SelfContained/* > nul
+
 echo.
 
 goto end-success