From fb1dad1814cd6e4308d1f0de53ac2ce437a40e08 Mon Sep 17 00:00:00 2001 From: Martijn Laan <1092369+martijnlaan@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:03:43 +0200 Subject: [PATCH] Change the names of the Compiler/Setup/SetupLdr subdirectories to match the names of the unit which needs its contents. --- .../Compression.LZMA1SmallDecompressor.pas | 2 +- .../LzmaDecode/LzmaDecode.h | 0 .../LzmaDecode/LzmaDecodeInno.c | 0 .../LzmaDecode/LzmaDecodeInno.obj | Bin .../LzmaDecode/LzmaDecodeSize.c | 0 .../LzmaDecode/LzmaTypes.h | 0 .../LzmaDecode/compile.bat | 0 .../islzma/islzma.c | 0 .../islzma/islzma.def | 0 .../islzma/islzma.h | 0 .../islzma/islzma.sln | 0 .../islzma/islzma.vcxproj | 0 .../islzma/islzma.vcxproj.filters | 0 .../islzma/islzma.vcxproj.user | 0 .../islzma/islzma_dll.c | 0 .../islzma/islzma_exe.c | 0 .../islzma/islzma_exe.rc | 0 .../islzma/islzma_exe.vcxproj | 0 .../islzma/islzma_exe.vcxproj.filters | 0 .../islzma/islzma_exe.vcxproj.user | 0 .../islzma/islzma_exe32.ico | Bin .../islzma/islzma_exe64.ico | Bin Projects/Src/Compression.LZMADecompressor.pas | 4 ++-- .../Lzma2Decode/ISLzma2Dec.c | 0 .../Lzma2Decode/ISLzma2Dec.obj | Bin .../Lzma2Decode/ISLzmaDec.c | 0 .../Lzma2Decode/ISLzmaDec.obj | Bin .../Lzma2Decode/compile-bcc32c.bat | 0 .../Lzma2Decode/compile.bat | 0 .../Helper/Helper.c | 0 .../Helper/Helper.manifest.txt | 0 .../Helper/Helper.rc | 0 .../Helper/Helper.sln | 0 .../Helper/Helper.vcproj | 0 .../Helper/x64/Release/Helper.exe | Bin README.md | 22 +++++++++--------- 36 files changed, 14 insertions(+), 14 deletions(-) rename Projects/Src/{SetupLdr => Compression.LZMA1SmallDecompressor}/LzmaDecode/LzmaDecode.h (100%) rename Projects/Src/{SetupLdr => Compression.LZMA1SmallDecompressor}/LzmaDecode/LzmaDecodeInno.c (100%) rename Projects/Src/{SetupLdr => Compression.LZMA1SmallDecompressor}/LzmaDecode/LzmaDecodeInno.obj (100%) rename Projects/Src/{SetupLdr => Compression.LZMA1SmallDecompressor}/LzmaDecode/LzmaDecodeSize.c (100%) rename Projects/Src/{SetupLdr => Compression.LZMA1SmallDecompressor}/LzmaDecode/LzmaTypes.h (100%) rename Projects/Src/{SetupLdr => Compression.LZMA1SmallDecompressor}/LzmaDecode/compile.bat (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma.c (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma.def (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma.h (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma.sln (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma.vcxproj (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma.vcxproj.filters (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma.vcxproj.user (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma_dll.c (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma_exe.c (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma_exe.rc (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma_exe.vcxproj (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma_exe.vcxproj.filters (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma_exe.vcxproj.user (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma_exe32.ico (100%) rename Projects/Src/{Compiler => Compression.LZMACompressor}/islzma/islzma_exe64.ico (100%) rename Projects/Src/{Setup => Compression.LZMADecompressor}/Lzma2Decode/ISLzma2Dec.c (100%) rename Projects/Src/{Setup => Compression.LZMADecompressor}/Lzma2Decode/ISLzma2Dec.obj (100%) rename Projects/Src/{Setup => Compression.LZMADecompressor}/Lzma2Decode/ISLzmaDec.c (100%) rename Projects/Src/{Setup => Compression.LZMADecompressor}/Lzma2Decode/ISLzmaDec.obj (100%) rename Projects/Src/{Setup => Compression.LZMADecompressor}/Lzma2Decode/compile-bcc32c.bat (100%) rename Projects/Src/{Setup => Compression.LZMADecompressor}/Lzma2Decode/compile.bat (100%) rename Projects/Src/{Setup => Setup.HelperEXEs}/Helper/Helper.c (100%) rename Projects/Src/{Setup => Setup.HelperEXEs}/Helper/Helper.manifest.txt (100%) rename Projects/Src/{Setup => Setup.HelperEXEs}/Helper/Helper.rc (100%) rename Projects/Src/{Setup => Setup.HelperEXEs}/Helper/Helper.sln (100%) rename Projects/Src/{Setup => Setup.HelperEXEs}/Helper/Helper.vcproj (100%) rename Projects/Src/{Setup => Setup.HelperEXEs}/Helper/x64/Release/Helper.exe (100%) diff --git a/Projects/Src/Compression.LZMA1SmallDecompressor.pas b/Projects/Src/Compression.LZMA1SmallDecompressor.pas index 8a0ba1804..552a7baab 100644 --- a/Projects/Src/Compression.LZMA1SmallDecompressor.pas +++ b/Projects/Src/Compression.LZMA1SmallDecompressor.pas @@ -80,7 +80,7 @@ procedure LZMAInternalErrorFmt(const Msg: String; const Args: array of const); { TLZMA1SmallDecompressor } -{$L Src\SetupLdr\LzmaDecode\LzmaDecodeInno.obj} +{$L Src\Compression.LZMA1SmallDecompressor\LzmaDecode\LzmaDecodeInno.obj} type TLzmaInCallback = record diff --git a/Projects/Src/SetupLdr/LzmaDecode/LzmaDecode.h b/Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaDecode.h similarity index 100% rename from Projects/Src/SetupLdr/LzmaDecode/LzmaDecode.h rename to Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaDecode.h diff --git a/Projects/Src/SetupLdr/LzmaDecode/LzmaDecodeInno.c b/Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaDecodeInno.c similarity index 100% rename from Projects/Src/SetupLdr/LzmaDecode/LzmaDecodeInno.c rename to Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaDecodeInno.c diff --git a/Projects/Src/SetupLdr/LzmaDecode/LzmaDecodeInno.obj b/Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaDecodeInno.obj similarity index 100% rename from Projects/Src/SetupLdr/LzmaDecode/LzmaDecodeInno.obj rename to Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaDecodeInno.obj diff --git a/Projects/Src/SetupLdr/LzmaDecode/LzmaDecodeSize.c b/Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaDecodeSize.c similarity index 100% rename from Projects/Src/SetupLdr/LzmaDecode/LzmaDecodeSize.c rename to Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaDecodeSize.c diff --git a/Projects/Src/SetupLdr/LzmaDecode/LzmaTypes.h b/Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaTypes.h similarity index 100% rename from Projects/Src/SetupLdr/LzmaDecode/LzmaTypes.h rename to Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/LzmaTypes.h diff --git a/Projects/Src/SetupLdr/LzmaDecode/compile.bat b/Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/compile.bat similarity index 100% rename from Projects/Src/SetupLdr/LzmaDecode/compile.bat rename to Projects/Src/Compression.LZMA1SmallDecompressor/LzmaDecode/compile.bat diff --git a/Projects/Src/Compiler/islzma/islzma.c b/Projects/Src/Compression.LZMACompressor/islzma/islzma.c similarity index 100% rename from Projects/Src/Compiler/islzma/islzma.c rename to Projects/Src/Compression.LZMACompressor/islzma/islzma.c diff --git a/Projects/Src/Compiler/islzma/islzma.def b/Projects/Src/Compression.LZMACompressor/islzma/islzma.def similarity index 100% rename from Projects/Src/Compiler/islzma/islzma.def rename to Projects/Src/Compression.LZMACompressor/islzma/islzma.def diff --git a/Projects/Src/Compiler/islzma/islzma.h b/Projects/Src/Compression.LZMACompressor/islzma/islzma.h similarity index 100% rename from Projects/Src/Compiler/islzma/islzma.h rename to Projects/Src/Compression.LZMACompressor/islzma/islzma.h diff --git a/Projects/Src/Compiler/islzma/islzma.sln b/Projects/Src/Compression.LZMACompressor/islzma/islzma.sln similarity index 100% rename from Projects/Src/Compiler/islzma/islzma.sln rename to Projects/Src/Compression.LZMACompressor/islzma/islzma.sln diff --git a/Projects/Src/Compiler/islzma/islzma.vcxproj b/Projects/Src/Compression.LZMACompressor/islzma/islzma.vcxproj similarity index 100% rename from Projects/Src/Compiler/islzma/islzma.vcxproj rename to Projects/Src/Compression.LZMACompressor/islzma/islzma.vcxproj diff --git a/Projects/Src/Compiler/islzma/islzma.vcxproj.filters b/Projects/Src/Compression.LZMACompressor/islzma/islzma.vcxproj.filters similarity index 100% rename from Projects/Src/Compiler/islzma/islzma.vcxproj.filters rename to Projects/Src/Compression.LZMACompressor/islzma/islzma.vcxproj.filters diff --git a/Projects/Src/Compiler/islzma/islzma.vcxproj.user b/Projects/Src/Compression.LZMACompressor/islzma/islzma.vcxproj.user similarity index 100% rename from Projects/Src/Compiler/islzma/islzma.vcxproj.user rename to Projects/Src/Compression.LZMACompressor/islzma/islzma.vcxproj.user diff --git a/Projects/Src/Compiler/islzma/islzma_dll.c b/Projects/Src/Compression.LZMACompressor/islzma/islzma_dll.c similarity index 100% rename from Projects/Src/Compiler/islzma/islzma_dll.c rename to Projects/Src/Compression.LZMACompressor/islzma/islzma_dll.c diff --git a/Projects/Src/Compiler/islzma/islzma_exe.c b/Projects/Src/Compression.LZMACompressor/islzma/islzma_exe.c similarity index 100% rename from Projects/Src/Compiler/islzma/islzma_exe.c rename to Projects/Src/Compression.LZMACompressor/islzma/islzma_exe.c diff --git a/Projects/Src/Compiler/islzma/islzma_exe.rc b/Projects/Src/Compression.LZMACompressor/islzma/islzma_exe.rc similarity index 100% rename from Projects/Src/Compiler/islzma/islzma_exe.rc rename to Projects/Src/Compression.LZMACompressor/islzma/islzma_exe.rc diff --git a/Projects/Src/Compiler/islzma/islzma_exe.vcxproj b/Projects/Src/Compression.LZMACompressor/islzma/islzma_exe.vcxproj similarity index 100% rename from Projects/Src/Compiler/islzma/islzma_exe.vcxproj rename to Projects/Src/Compression.LZMACompressor/islzma/islzma_exe.vcxproj diff --git a/Projects/Src/Compiler/islzma/islzma_exe.vcxproj.filters b/Projects/Src/Compression.LZMACompressor/islzma/islzma_exe.vcxproj.filters similarity index 100% rename from Projects/Src/Compiler/islzma/islzma_exe.vcxproj.filters rename to Projects/Src/Compression.LZMACompressor/islzma/islzma_exe.vcxproj.filters diff --git a/Projects/Src/Compiler/islzma/islzma_exe.vcxproj.user b/Projects/Src/Compression.LZMACompressor/islzma/islzma_exe.vcxproj.user similarity index 100% rename from Projects/Src/Compiler/islzma/islzma_exe.vcxproj.user rename to Projects/Src/Compression.LZMACompressor/islzma/islzma_exe.vcxproj.user diff --git a/Projects/Src/Compiler/islzma/islzma_exe32.ico b/Projects/Src/Compression.LZMACompressor/islzma/islzma_exe32.ico similarity index 100% rename from Projects/Src/Compiler/islzma/islzma_exe32.ico rename to Projects/Src/Compression.LZMACompressor/islzma/islzma_exe32.ico diff --git a/Projects/Src/Compiler/islzma/islzma_exe64.ico b/Projects/Src/Compression.LZMACompressor/islzma/islzma_exe64.ico similarity index 100% rename from Projects/Src/Compiler/islzma/islzma_exe64.ico rename to Projects/Src/Compression.LZMACompressor/islzma/islzma_exe64.ico diff --git a/Projects/Src/Compression.LZMADecompressor.pas b/Projects/Src/Compression.LZMADecompressor.pas index 6d2881760..b53e9f2d6 100644 --- a/Projects/Src/Compression.LZMADecompressor.pas +++ b/Projects/Src/Compression.LZMADecompressor.pas @@ -95,8 +95,8 @@ TLZMAISzAlloc = record { Compiled by Visual Studio 2022 using compile.bat To enable source debugging recompile using compile-bcc32c.bat } -{$L Src\Setup\Lzma2Decode\ISLzmaDec.obj} -{$L Src\Setup\Lzma2Decode\ISLzma2Dec.obj} +{$L Src\Compression.LZMADecompressor\Lzma2Decode\ISLzmaDec.obj} +{$L Src\Compression.LZMADecompressor\Lzma2Decode\ISLzma2Dec.obj} function IS_LzmaDec_Init(var state: TLZMA1InternalDecoderState; stateSize: Cardinal; const props; propsSize: Cardinal; diff --git a/Projects/Src/Setup/Lzma2Decode/ISLzma2Dec.c b/Projects/Src/Compression.LZMADecompressor/Lzma2Decode/ISLzma2Dec.c similarity index 100% rename from Projects/Src/Setup/Lzma2Decode/ISLzma2Dec.c rename to Projects/Src/Compression.LZMADecompressor/Lzma2Decode/ISLzma2Dec.c diff --git a/Projects/Src/Setup/Lzma2Decode/ISLzma2Dec.obj b/Projects/Src/Compression.LZMADecompressor/Lzma2Decode/ISLzma2Dec.obj similarity index 100% rename from Projects/Src/Setup/Lzma2Decode/ISLzma2Dec.obj rename to Projects/Src/Compression.LZMADecompressor/Lzma2Decode/ISLzma2Dec.obj diff --git a/Projects/Src/Setup/Lzma2Decode/ISLzmaDec.c b/Projects/Src/Compression.LZMADecompressor/Lzma2Decode/ISLzmaDec.c similarity index 100% rename from Projects/Src/Setup/Lzma2Decode/ISLzmaDec.c rename to Projects/Src/Compression.LZMADecompressor/Lzma2Decode/ISLzmaDec.c diff --git a/Projects/Src/Setup/Lzma2Decode/ISLzmaDec.obj b/Projects/Src/Compression.LZMADecompressor/Lzma2Decode/ISLzmaDec.obj similarity index 100% rename from Projects/Src/Setup/Lzma2Decode/ISLzmaDec.obj rename to Projects/Src/Compression.LZMADecompressor/Lzma2Decode/ISLzmaDec.obj diff --git a/Projects/Src/Setup/Lzma2Decode/compile-bcc32c.bat b/Projects/Src/Compression.LZMADecompressor/Lzma2Decode/compile-bcc32c.bat similarity index 100% rename from Projects/Src/Setup/Lzma2Decode/compile-bcc32c.bat rename to Projects/Src/Compression.LZMADecompressor/Lzma2Decode/compile-bcc32c.bat diff --git a/Projects/Src/Setup/Lzma2Decode/compile.bat b/Projects/Src/Compression.LZMADecompressor/Lzma2Decode/compile.bat similarity index 100% rename from Projects/Src/Setup/Lzma2Decode/compile.bat rename to Projects/Src/Compression.LZMADecompressor/Lzma2Decode/compile.bat diff --git a/Projects/Src/Setup/Helper/Helper.c b/Projects/Src/Setup.HelperEXEs/Helper/Helper.c similarity index 100% rename from Projects/Src/Setup/Helper/Helper.c rename to Projects/Src/Setup.HelperEXEs/Helper/Helper.c diff --git a/Projects/Src/Setup/Helper/Helper.manifest.txt b/Projects/Src/Setup.HelperEXEs/Helper/Helper.manifest.txt similarity index 100% rename from Projects/Src/Setup/Helper/Helper.manifest.txt rename to Projects/Src/Setup.HelperEXEs/Helper/Helper.manifest.txt diff --git a/Projects/Src/Setup/Helper/Helper.rc b/Projects/Src/Setup.HelperEXEs/Helper/Helper.rc similarity index 100% rename from Projects/Src/Setup/Helper/Helper.rc rename to Projects/Src/Setup.HelperEXEs/Helper/Helper.rc diff --git a/Projects/Src/Setup/Helper/Helper.sln b/Projects/Src/Setup.HelperEXEs/Helper/Helper.sln similarity index 100% rename from Projects/Src/Setup/Helper/Helper.sln rename to Projects/Src/Setup.HelperEXEs/Helper/Helper.sln diff --git a/Projects/Src/Setup/Helper/Helper.vcproj b/Projects/Src/Setup.HelperEXEs/Helper/Helper.vcproj similarity index 100% rename from Projects/Src/Setup/Helper/Helper.vcproj rename to Projects/Src/Setup.HelperEXEs/Helper/Helper.vcproj diff --git a/Projects/Src/Setup/Helper/x64/Release/Helper.exe b/Projects/Src/Setup.HelperEXEs/Helper/x64/Release/Helper.exe similarity index 100% rename from Projects/Src/Setup/Helper/x64/Release/Helper.exe rename to Projects/Src/Setup.HelperEXEs/Helper/x64/Release/Helper.exe diff --git a/README.md b/README.md index 06934623d..dab0ce300 100644 --- a/README.md +++ b/README.md @@ -201,20 +201,20 @@ from the bzlib directory in the iscompress repository. from the zlib-dll directory in the iscompress repository. **Files\islzma.dll**, **Files\islzma32.exe**, **Files\islzma64.exe** - Compiled -by Visual Studio 2022 from the [Projects\Src\Compiler\islzma] directory. +by Visual Studio 2022 from the [Projects\Src\Compression.LZMACompressor\islzma] directory. **Files\isscint.dll** - Compiled by Visual Studio 2022 from Scintilla source code in the isscint repository. -**Projects\Src\Setup\Helper\x64\Release\Helper.exe**, **Projects\Src\Setup\HelperEXEs.res** - -Compiled by Visual Studio 2005 from the [Projects\Src\Setup\Helper] directory and then +**Projects\Src\Setup.HelperEXEs\Helper\x64\Release\Helper.exe**, **Projects\Src\Setup.HelperEXEs.res** - +Compiled by Visual Studio 2005 from the [Projects\Src\Setup.HelperEXEs\Helper] directory and then stored in a compiled resource file. -**Projects\Src\Setup\Lzma2Decode\ISLzmaDec.obj**, **Projects\Src\Setup\Lzma2Decode\ISLzma2Dec.obj** - -Compiled by Visual Studio 2022 from the [Projects\Src\Setup\Lzma2Decode] directory. +**Projects\Src\Compression.LZMADecompressor\Lzma2Decode\ISLzmaDec.obj**, **Projects\Src\Compression.LZMADecompressor\Lzma2Decode\ISLzma2Dec.obj** - +Compiled by Visual Studio 2022 from the [Projects\Src\Compression.LZMADecompressor\Lzma2Decode] directory. -**Projects\Src\SetupLdr\LzmaDecode\LzmaDecodeInno.obj** - Compiled by Visual Studio -2022 from the [Projects\Src\SetupLdr\LzmaDecode] directory. +**Projects\Src\Compression.LZMA1SmallDecompressor\LzmaDecode\LzmaDecodeInno.obj** - +Compiled by Visual Studio 2022 from the [Projects\Src\Compression.LZMA1SmallDecompressor\LzmaDecode] directory. **Examples\MyProg.exe**, **Examples\MyProg-x64.exe**, **Examples\MyProg-Arm64.exe** - Compiled by Visual Studio 2022 from the [Examples\MyProg] directory. @@ -272,12 +272,12 @@ workflow will be triggered automatically. [Projects\Bin]: [Components]: [Files]: -[Projects\Src\Compiler\islzma]: -[Projects\Src\Setup\Helper]: +[Projects\Src\Compiler\Compression.LZMACompressor]: +[Projects\Src\Setup.HelperEXEs\Helper]: [Examples\MyProg]: [Projects\Src]: [Projects\Src\Compil32]: -[Projects\Src\Setup\Lzma2Decode]: -[Projects\Src\SetupLdr\LzmaDecode]: +[Projects\Src\Compression.LZMADecompressor\Lzma2Decode]: +[Projects\Src\Compression.LZMA1SmallDecompressor\LzmaDecode]: [7-Zip]: https://www.7-zip.org/ [secret]: https://docs.github.com/en/actions/security-guides/encrypted-secrets