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

Now using upx-stubtools 20210104 with new clang-format-10.0.1.

This commit is contained in:
Markus F.X.J. Oberhumer 2021-01-04 17:23:57 +01:00
parent f962afe146
commit 9db6d18d11
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/travis_build.sh vendored
View File

@ -43,7 +43,7 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
elif [[ -f "$HOME/.local/bin/bin-upx/upx-stubtools-check-version" ]]; then elif [[ -f "$HOME/.local/bin/bin-upx/upx-stubtools-check-version" ]]; then
bin_upx=$(readlink -en -- "$HOME/.local/bin/bin-upx") bin_upx=$(readlink -en -- "$HOME/.local/bin/bin-upx")
else else
bin_upx=$(readlink -en -- "$upx_SRCDIR/../deps/bin-upx-20160918") bin_upx=$(readlink -en -- "$upx_SRCDIR/../deps/bin-upx-20210104")
fi fi
cd / && cd $upx_SRCDIR || exit 1 cd / && cd $upx_SRCDIR || exit 1
extra_subdirs=() extra_subdirs=()

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

@ -26,7 +26,7 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install -y libmpfr4:i386 zlib1g:i386 sudo apt-get install -y libmpfr4:i386 zlib1g:i386
cd ..; mkdir -p deps; cd deps cd ..; mkdir -p deps; cd deps
wget -q -O - https://github.com/upx/upx-stubtools/releases/download/v20160918/bin-upx-20160918.tar.xz | tar -xJ wget -q -O - https://github.com/upx/upx-stubtools/releases/download/v20210104/bin-upx-20210104.tar.xz | tar -xJ
- name: 'Check out code' - name: 'Check out code'
uses: actions/checkout@v2 uses: actions/checkout@v2
with: { submodules: true } with: { submodules: true }

2
src/stub/Makefile
View File

@ -162,7 +162,7 @@ endif
all.targets ?= .upx-stubtools-stamp tmp/.tmp-stamp .all-stamp all.targets ?= .upx-stubtools-stamp tmp/.tmp-stamp .all-stamp
all: $$(all.targets) all: $$(all.targets)
.upx-stubtools-stamp: $(MAKEFILE_LIST) .upx-stubtools-stamp: $(MAKEFILE_LIST)
upx-stubtools-check-version 20160918 upx-stubtools-check-version 20210104
@echo "timestamp" > $@ @echo "timestamp" > $@
.DELETE_ON_ERROR: .upx-stubtools-stamp .DELETE_ON_ERROR: .upx-stubtools-stamp
%/.tmp-stamp: %/.tmp-stamp:

10
src/stub/scripts/upx-clang-format
View File

@ -2,18 +2,18 @@
## vim:set ts=4 sw=4 et: ## vim:set ts=4 sw=4 et:
set -e; set -o pipefail set -e; set -o pipefail
# NOTE: we are using clang-format-3.9.0 from upx-stubtools # NOTE: we are using clang-format-10.0.1 from upx-stubtools
# see https://github.com/upx/upx-stubtools/releases # see https://github.com/upx/upx-stubtools/releases
CLANG_FORMAT="$HOME/local/bin/bin-upx/clang-format-3.9.0" CLANG_FORMAT="$HOME/local/bin/bin-upx/clang-format-10.0.1"
if [[ ! -f $CLANG_FORMAT ]]; then if [[ ! -f $CLANG_FORMAT ]]; then
CLANG_FORMAT="$HOME/.local/bin/bin-upx/clang-format-3.9.0" CLANG_FORMAT="$HOME/.local/bin/bin-upx/clang-format-10.0.1"
fi fi
if [[ ! -f $CLANG_FORMAT ]]; then if [[ ! -f $CLANG_FORMAT ]]; then
CLANG_FORMAT="$HOME/bin/bin-upx/clang-format-3.9.0" CLANG_FORMAT="$HOME/bin/bin-upx/clang-format-10.0.1"
fi fi
if [[ ! -f $CLANG_FORMAT ]]; then if [[ ! -f $CLANG_FORMAT ]]; then
echo "ERROR: $0: cannot find clang-format-3.9.0" echo "ERROR: $0: cannot find clang-format-10.0.1"
echo "ERROR: $0: please visit https://github.com/upx/upx-stubtools/releases" echo "ERROR: $0: please visit https://github.com/upx/upx-stubtools/releases"
exit 1 exit 1
fi fi