mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Update Travis.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2017-03-23 13:00:42 +01:00
parent 72156fcf1b
commit 9d14715652
6 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.github/travis_build.sh vendored
View File

@ -39,10 +39,34 @@ set -x
# #
if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
bin_upx=$(readlink -en -- "$upx_SRCDIR/../deps/bin-upx-20160918") if [[ -f "$HOME/local/bin/bin-upx/upx-stubtools-check-version" ]]; then
bin_upx=$(readlink -en -- "$HOME/local/bin/bin-upx")
elif [[ -f "$HOME/.local/bin/bin-upx/upx-stubtools-check-version" ]]; then
bin_upx=$(readlink -en -- "$HOME/.local/bin/bin-upx")
else
bin_upx=$(readlink -en -- "$upx_SRCDIR/../deps/bin-upx-20160918")
fi
cd / && cd $upx_SRCDIR || exit 1 cd / && cd $upx_SRCDIR || exit 1
extra_subdirs=()
extra_subdirs+=( src/stub/src/arch/amd64 )
extra_subdirs+=( src/stub/src/arch/arm/v4a )
extra_subdirs+=( src/stub/src/arch/arm/v4t )
extra_subdirs+=( src/stub/src/arch/i386 )
extra_subdirs+=( src/stub/src/arch/m68k/m68000 )
extra_subdirs+=( src/stub/src/arch/m68k/m68020 )
extra_subdirs+=( src/stub/src/arch/mips/r3000 )
#extra_subdirs+=( src/stub/src/arch/powerpc/32 ) # FIXME / TODO
extra_subdirs+=( src/stub/src/arch/powerpc/64le )
make -C src/stub maintainer-clean make -C src/stub maintainer-clean
for d in ${extra_subdirs[@]}; do
make -C $d -f Makefile.extra maintainer-clean
git status $d || true
done
git status || true
failed=0 failed=0
for d in ${extra_subdirs[@]}; do
PATH="$bin_upx:$PATH" make -C $d -f Makefile.extra || failed=1
done
PATH="$bin_upx:$PATH" make -C src/stub all || failed=1 PATH="$bin_upx:$PATH" make -C src/stub all || failed=1
if [[ $failed != 0 ]]; then if [[ $failed != 0 ]]; then
echo "UPX-ERROR: FATAL: rebuild-stubs failed" echo "UPX-ERROR: FATAL: rebuild-stubs failed"
@ -58,7 +82,7 @@ if [[ $BM_X =~ (^|\+)rebuild-stubs($|\+) ]]; then
echo "X=rebuild-stubs done. Exiting." echo "X=rebuild-stubs done. Exiting."
exit 0 exit 0
fi fi
unset bin_upx failed unset bin_upx extra_subdirs d failed
fi fi
# #

2
.github/travis_init.sh vendored
View File

@ -150,7 +150,7 @@ case $BM_C in
clang*-m64) CC="$CC -m64"; CXX="$CXX -m64" ;; clang*-m64) CC="$CC -m64"; CXX="$CXX -m64" ;;
gcc*-m32) CC="$CC -m32"; CXX="$CXX -m32" ;; gcc*-m32) CC="$CC -m32"; CXX="$CXX -m32" ;;
gcc*-m64) CC="$CC -m64"; CXX="$CXX -m64" ;; gcc*-m64) CC="$CC -m64"; CXX="$CXX -m64" ;;
gcc*-mx32) CC="$CC -mx32"; CXX="$CXX -mx32"; BUILD_LOCAL_ZLIB=1 ;; gcc*-mx32) CC="$CC -mx32"; CXX="$CXX -mx32"; BUILD_LOCAL_UCL=1; BUILD_LOCAL_ZLIB=1 ;;
esac esac
if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then if [[ $BM_C =~ (^|\-)(clang|gcc)($|\-) ]]; then
CC="$CC -std=gnu89" CC="$CC -std=gnu89"

2
.travis.yml
View File

@ -75,7 +75,7 @@ matrix:
sudo: required sudo: required
dist: trusty dist: trusty
compiler: gcc compiler: gcc
env: C=gcc-4.8-mx32 T=SKIP env: C=gcc-4.8-mx32
addons: { apt: { packages: [ "g++-multilib", "libx32stdc++-4.8-dev" ] } } addons: { apt: { packages: [ "g++-multilib", "libx32stdc++-4.8-dev" ] } }
- os: linux - os: linux
compiler: gcc compiler: gcc

5
src/stub/Makefile
View File

@ -37,8 +37,9 @@ include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
# update $PATH for our special stub build tools # update $PATH for our special stub build tools
ifneq ($(wildcard $(HOME)/local/bin/bin-upx/upx-stubtools-check-version),) ifneq ($(wildcard $(HOME)/local/bin/bin-upx/upx-stubtools-check-version),)
export PATH := $(HOME)/local/bin/bin-upx:$(PATH) export PATH := $(HOME)/local/bin/bin-upx:$(PATH)
endif else ifneq ($(wildcard $(HOME)/.local/bin/bin-upx/upx-stubtools-check-version),)
ifneq ($(wildcard $(HOME)/bin/bin-upx/upx-stubtools-check-version),) export PATH := $(HOME)/.local/bin/bin-upx:$(PATH)
else ifneq ($(wildcard $(HOME)/bin/bin-upx/upx-stubtools-check-version),)
export PATH := $(HOME)/bin/bin-upx:$(PATH) export PATH := $(HOME)/bin/bin-upx:$(PATH)
endif endif

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

@ -7,6 +7,9 @@ set -e; set -o pipefail
CLANG_FORMAT="$HOME/local/bin/bin-upx/clang-format-3.9.0" CLANG_FORMAT="$HOME/local/bin/bin-upx/clang-format-3.9.0"
if [[ ! -f $CLANG_FORMAT ]]; then if [[ ! -f $CLANG_FORMAT ]]; then
CLANG_FORMAT="$HOME/.local/bin/bin-upx/clang-format-3.9.0"
fi
if [[ ! -f $CLANG_FORMAT ]]; then
CLANG_FORMAT="$HOME/bin/bin-upx/clang-format-3.9.0" CLANG_FORMAT="$HOME/bin/bin-upx/clang-format-3.9.0"
fi fi
if [[ ! -f $CLANG_FORMAT ]]; then if [[ ! -f $CLANG_FORMAT ]]; then

7
src/stub/tools/armpe/Makefile
View File

@ -8,10 +8,11 @@ export LC_ALL = C
export SHELL = /bin/sh export SHELL = /bin/sh
# update $PATH for our special stub build tools # update $PATH for our special stub build tools
ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),) ifneq ($(wildcard $(HOME)/local/bin/bin-upx/upx-stubtools-check-version),)
export PATH := $(HOME)/local/bin/bin-upx:$(PATH) export PATH := $(HOME)/local/bin/bin-upx:$(PATH)
endif else ifneq ($(wildcard $(HOME)/.local/bin/bin-upx/upx-stubtools-check-version),)
ifneq ($(wildcard $(HOME)/bin/bin-upx/.),) export PATH := $(HOME)/.local/bin/bin-upx:$(PATH)
else ifneq ($(wildcard $(HOME)/bin/bin-upx/upx-stubtools-check-version),)
export PATH := $(HOME)/bin/bin-upx:$(PATH) export PATH := $(HOME)/bin/bin-upx:$(PATH)
endif endif