arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix distclean rule in GNUmakefile-cross

pull/696/head
Jeffrey Walton 2018-08-01 21:33:24 -04:00
parent 89ec3c4a25
commit a1b30685ab
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
.travis.yml
View File

@ -51,93 +51,120 @@ matrix:
include: include:
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=autotools - BUILD_MODE=autotools
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=cmake - BUILD_MODE=cmake
- os: osx - os: osx
env: env:
- BUILD_OS=osx
- BUILD_MODE=autotools - BUILD_MODE=autotools
- os: osx - os: osx
env: env:
- BUILD_OS=osx
- BUILD_MODE=cmake - BUILD_MODE=cmake
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=android - BUILD_MODE=android
- PLATFORM=armeabi-v7a - PLATFORM=armeabi-v7a
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=android - BUILD_MODE=android
- PLATFORM=armv7a-neon - PLATFORM=armv7a-neon
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=android - BUILD_MODE=android
- PLATFORM=aarch64 - PLATFORM=aarch64
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=android - BUILD_MODE=android
- PLATFORM=mipsel - PLATFORM=mipsel
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=android - BUILD_MODE=android
- PLATFORM=mipsel64 - PLATFORM=mipsel64
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=android - BUILD_MODE=android
- PLATFORM=x86 - PLATFORM=x86
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=android - BUILD_MODE=android
- PLATFORM=x86_64 - PLATFORM=x86_64
- os: osx - os: osx
env: env:
- BUILD_OS=osx
- BUILD_MODE=ios - BUILD_MODE=ios
- PLATFORM=iPhoneOS - PLATFORM=iPhoneOS
- os: osx - os: osx
env: env:
- BUILD_OS=osx
- BUILD_MODE=ios - BUILD_MODE=ios
- PLATFORM=Arm64 - PLATFORM=Arm64
- os: osx - os: osx
env: env:
- BUILD_OS=osx
- BUILD_MODE=ios - BUILD_MODE=ios
- PLATFORM=WatchOS - PLATFORM=WatchOS
- os: osx - os: osx
env: env:
- BUILD_OS=osx
- BUILD_MODE=ios - BUILD_MODE=ios
- PLATFORM=AppleTVOS - PLATFORM=AppleTVOS
- os: osx - os: osx
env: env:
- BUILD_OS=osx
- BUILD_MODE=ios - BUILD_MODE=ios
- PLATFORM=iPhoneSimulator - PLATFORM=iPhoneSimulator
allow_failures: allow_failures:
- os: osx - os: osx
env: env:
- BUILD_OS=osx
- BUILD_MODE=ios - BUILD_MODE=ios
- PLATFORM=WatchOS - PLATFORM=WatchOS
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=android - BUILD_MODE=android
- PLATFORM=armeabi - PLATFORM=armeabi
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=android - BUILD_MODE=android
- PLATFORM=mipsel - PLATFORM=mipsel
- os: linux - os: linux
env: env:
- BUILD_OS=linux
- BUILD_MODE=android - BUILD_MODE=android
- PLATFORM=mipsel64 - PLATFORM=mipsel64
- os: osx - os: osx
env: env:
- BUILD_OS=osx
- BUILD_MODE=ios - BUILD_MODE=ios
- PLATFORM=iPhoneSimulator - PLATFORM=iPhoneSimulator
before_install: before_install:
- | - |
if [[ "$BUILD_MODE" == "android" ]]; then if [[ "$BUILD_OS" == "linux" ]] && [[ "$BUILD_MODE" == "android" ]]; then
# https://github.com/travis-ci/travis-ci/issues/9037 # https://github.com/travis-ci/travis-ci/issues/9037
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A145 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A145
TestScripts/install-android.sh sudo apt-get update
bash TestScripts/install-android.sh
fi
if [[ "$BUILD_OS" == "linux" ]] && [[ "$BUILD_MODE" == "autotools" ]]; then
# https://github.com/travis-ci/travis-ci/issues/9037
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A145
sudo apt-get install -y autoconf automake libtool
fi fi
# xattr is OS X only and is used to remove quarantine bits # xattr is OS X only and is used to remove quarantine bits
@ -146,27 +173,27 @@ before_install:
script: script:
- | - |
if [[ "$BUILD_MODE" == "ios" ]]; then if [[ "$BUILD_MODE" == "ios" ]]; then
cp ./TestScripts/setenv-ios.sh . cp TestScripts/setenv-ios.sh "${PWD}"
cp ./TestScripts/cryptest-ios.sh . cp TestScripts/cryptest-ios.sh "${PWD}"
chmod +x *.sh chmod +x *.sh
xattr -r -d com.apple.quarantine *.sh 2>/dev/null xattr -r -d com.apple.quarantine "${PWD}" 2>/dev/null
./cryptest-ios.sh bash cryptest-ios.sh
elif [[ "$BUILD_MODE" == "android" ]]; then elif [[ "$BUILD_MODE" == "android" ]]; then
cp ./TestScripts/setenv-android-gcc.sh . cp TestScripts/setenv-android-gcc.sh "${PWD}"
cp ./TestScripts/cryptest-android.sh . cp TestScripts/cryptest-android.sh "${PWD}"
chmod +x *.sh chmod +x *.sh
xattr -r -d com.apple.quarantine *.sh 2>/dev/null xattr -r -d com.apple.quarantine "${PWD}" 2>/dev/null
./cryptest-android.sh bash cryptest-android.sh
elif [[ "$BUILD_MODE" == "autotools" ]]; then elif [[ "$BUILD_MODE" == "autotools" ]]; then
cp ./TestScripts/cryptest-autotools.sh . cp TestScripts/cryptest-autotools.sh "${PWD}"
chmod +x *.sh chmod +x *.sh
xattr -r -d com.apple.quarantine *.sh 2>/dev/null xattr -r -d com.apple.quarantine "${PWD}" 2>/dev/null
./cryptest-autotools.sh bash cryptest-autotools.sh
elif [[ "$BUILD_MODE" == "cmake" ]]; then elif [[ "$BUILD_MODE" == "cmake" ]]; then
cp ./TestScripts/cryptest-cmake.sh . cp TestScripts/cryptest-cmake.sh "${PWD}"
chmod +x *.sh chmod +x *.sh
xattr -r -d com.apple.quarantine *.sh 2>/dev/null xattr -r -d com.apple.quarantine "${PWD}" 2>/dev/null
./cryptest-cmake.sh bash cryptest-cmake.sh
elif [[ "$BUILD_MODE" == "debug" ]]; then elif [[ "$BUILD_MODE" == "debug" ]]; then
CXXFLAGS="-DDEBUG -g2 -O1" make -j "$BUILD_JOBS" CXXFLAGS="-DDEBUG -g2 -O1" make -j "$BUILD_JOBS"
./cryptest.exe v ./cryptest.exe v

2
GNUmakefile-cross
View File

@ -451,7 +451,7 @@ distclean: clean autotools-clean cmake-clean
-$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps benchmarks.html cryptest.txt -$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps benchmarks.html cryptest.txt
@-$(RM) cryptest-*.txt cryptopp.tgz libcryptopp.pc *.o *.bc *.ii *~ @-$(RM) cryptest-*.txt cryptopp.tgz libcryptopp.pc *.o *.bc *.ii *~
@-$(RM) -r cryptlib.lib cryptest.exe *.suo *.sdf *.pdb Win32/ x64/ ipch/ @-$(RM) -r cryptlib.lib cryptest.exe *.suo *.sdf *.pdb Win32/ x64/ ipch/
@-$(RM) -r $(LIBOBJS:.o=.obj) $(TESTOBJS:.o=.obj) $(DOCUMENT_DIRECTORY)/ @-$(RM) -r $(LIBOBJS:.o=.obj) $(TESTOBJS:.o=.obj)
@-$(RM) -r TestCoverage/ @-$(RM) -r TestCoverage/
@-$(RM) cryptopp$(LIB_VER)\.* CryptoPPRef.zip @-$(RM) cryptopp$(LIB_VER)\.* CryptoPPRef.zip