Mirror
/
upx
mirror of https://github.com/upx/upx.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

all: remove currently unused submodules

This commit is contained in:
Markus F.X.J. Oberhumer 2023-01-19 03:32:49 +01:00
parent 8efcf6f099
commit 2632342f44
7 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View File

@ -284,17 +284,17 @@ jobs:
cl -MT -J -O2 -W3 -WX %DEFS% -c %H%\vendor\zlib\*.c cl -MT -J -O2 -W3 -WX %DEFS% -c %H%\vendor\zlib\*.c
link -lib -out:zlib.lib *.obj link -lib -out:zlib.lib *.obj
@REM ===== build zstd ===== @REM ===== build zstd =====
cd %BDIR%\zstd @rem cd %BDIR%\zstd
set s=%H%\vendor\zstd\lib @rem set s=%H%\vendor\zstd\lib
cl -MT -J -O2 -W4 -WX -DDYNAMIC_BMI2=0 -DZSTD_DISABLE_ASM %DEFS% -c %s%\common\*.c %s%\compress\*.c %s%\decompress\*.c @rem cl -MT -J -O2 -W4 -WX -DDYNAMIC_BMI2=0 -DZSTD_DISABLE_ASM %DEFS% -c %s%\common\*.c %s%\compress\*.c %s%\decompress\*.c
link -lib -out:zstd.lib *.obj @rem link -lib -out:zstd.lib *.obj
@REM ===== build UPX ===== @REM ===== build UPX =====
cd %BDIR%\upx cd %BDIR%\upx
set s=%H%\src set s=%H%\src
cat .GITREV.txt cat .GITREV.txt
set /p GITREV=<.GITREV.txt set /p GITREV=<.GITREV.txt
set sources=%s%\*.cpp %s%\check\*.cpp %s%\compress\*.cpp %s%\console\*.cpp %s%\filter\*.cpp %s%\util\*.cpp set sources=%s%\*.cpp %s%\check\*.cpp %s%\compress\*.cpp %s%\console\*.cpp %s%\filter\*.cpp %s%\util\*.cpp
cl -std:c++17 -Zc:__cplusplus -EHsc -J -O2 -W4 -WX -DUPX_VERSION_GITREV="""%GITREV%""" -DWITH_ZSTD %DEFS% -I%H%\vendor -I%H%\vendor\boost-pfr\include -Feupx.exe %sources% %BDIR%\ucl\ucl.lib %BDIR%\zlib\zlib.lib %BDIR%\zstd\zstd.lib /link setargv.obj cl -std:c++17 -Zc:__cplusplus -EHsc -J -O2 -W4 -WX -DUPX_VERSION_GITREV="""%GITREV%""" -DWITH_ZSTD=0 %DEFS% -I%H%\vendor -I%H%\vendor\boost-pfr\include -Feupx.exe %sources% %BDIR%\ucl\ucl.lib %BDIR%\zlib\zlib.lib /link setargv.obj
- name: 'Make artifact' - name: 'Make artifact'
shell: bash shell: bash
run: | run: |

15
.gitmodules vendored
View File

@ -1,8 +1,3 @@
[submodule "vendor/boost-pfr"]
path = vendor/boost-pfr
url = https://github.com/upx/upx-vendor-boost-pfr.git
branch = upx-vendor
shallow = true
[submodule "vendor/doctest"] [submodule "vendor/doctest"]
path = vendor/doctest path = vendor/doctest
url = https://github.com/upx/upx-vendor-doctest.git url = https://github.com/upx/upx-vendor-doctest.git
@ -13,11 +8,6 @@
url = https://github.com/upx/upx-vendor-lzma-sdk.git url = https://github.com/upx/upx-vendor-lzma-sdk.git
branch = upx-vendor branch = upx-vendor
shallow = true shallow = true
[submodule "vendor/rangeless"]
path = vendor/rangeless
url = https://github.com/upx/upx-vendor-rangeless.git
branch = upx-vendor
shallow = true
[submodule "vendor/ucl"] [submodule "vendor/ucl"]
path = vendor/ucl path = vendor/ucl
url = https://github.com/upx/upx-vendor-ucl.git url = https://github.com/upx/upx-vendor-ucl.git
@ -33,8 +23,3 @@
url = https://github.com/upx/upx-vendor-zlib.git url = https://github.com/upx/upx-vendor-zlib.git
branch = upx-vendor branch = upx-vendor
shallow = true shallow = true
[submodule "vendor/zstd"]
path = vendor/zstd
url = https://github.com/upx/upx-vendor-zstd.git
branch = upx-vendor
shallow = true

2
Makefile
View File

@ -134,7 +134,7 @@ build/extra/cross-windows-mingw64/%: UPX_CMAKE_CONFIG_FLAGS += -DUPX_CONFIG_DISA
# check git submodules # check git submodules
#*********************************************************************** #***********************************************************************
SUBMODULES = boost-pfr doctest lzma-sdk rangeless ucl valgrind zlib zstd SUBMODULES = doctest lzma-sdk ucl valgrind zlib
dummy := $(foreach m,$(SUBMODULES),$(if $(wildcard vendor/$m/[CL]*),$m,\ dummy := $(foreach m,$(SUBMODULES),$(if $(wildcard vendor/$m/[CL]*),$m,\
$(error ERROR: missing git submodule $m; run 'git submodule update --init'))) $(error ERROR: missing git submodule $m; run 'git submodule update --init')))

2
src/check/dtx_boost_pfr.cpp
View File

@ -24,7 +24,7 @@
<markus@oberhumer.com> <markus@oberhumer.com>
*/ */
#if DEBUG #if DEBUG && 0
#ifndef WITH_BOOST_PFR #ifndef WITH_BOOST_PFR
#define WITH_BOOST_PFR 1 #define WITH_BOOST_PFR 1
#endif #endif

1
vendor/boost-pfr vendored

@ -1 +0,0 @@
Subproject commit f626eb1a31c2b685eddebc7738c771ad60989e0f

1
vendor/rangeless vendored

@ -1 +0,0 @@
Subproject commit c283c97b47252e20ca0307f5a5641c490419e23b

1
vendor/zstd vendored

@ -1 +0,0 @@
Subproject commit 2eed0e3abae48b4839a73fc85a4061ff5735a88a