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

Cleaned artifacts from testing. Move documentation clean rule to distclean

pull/151/head
Jeffrey Walton 2016-03-29 03:47:33 -04:00
parent 2129e94b62
commit 34a34967ac
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
GNUmakefile
View File

@ -430,15 +430,13 @@ endif
-$(RM) adhoc.cpp.o adhoc.cpp.proto.o $(LIBOBJS) $(TESTOBJS) $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS) -$(RM) adhoc.cpp.o adhoc.cpp.proto.o $(LIBOBJS) $(TESTOBJS) $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
-$(RM) cryptest.exe dlltest.exe cryptest.import.exe cryptest.info ct rdrand-???.o -$(RM) cryptest.exe dlltest.exe cryptest.import.exe cryptest.info ct rdrand-???.o
-$(RM) *.gcno *.gcda *.stackdump core-* -$(RM) *.gcno *.gcda *.stackdump core-*
-$(RM) /tmp/adhoc.exe
ifneq ($(wildcard /tmp/cryptopp_test/),)
-$(RM) -r /tmp/cryptopp_test/
endif
ifneq ($(wildcard *.exe.dSYM),) ifneq ($(wildcard *.exe.dSYM),)
-$(RM) -r *.exe.dSYM/ -$(RM) -r *.exe.dSYM/
endif endif
ifneq ($(wildcard $(DOCUMENT_DIRECTORY)/),)
-$(RM) -r $(DOCUMENT_DIRECTORY)/
endif
ifneq ($(wildcard TestCoverage/),)
-$(RM) -r TestCoverage/
endif
ifneq ($(wildcard cov-int/),) ifneq ($(wildcard cov-int/),)
-$(RM) -r cov-int/ -$(RM) -r cov-int/
endif endif
@ -451,6 +449,12 @@ distclean: clean
ifneq ($(wildcard CMakeFiles/),) ifneq ($(wildcard CMakeFiles/),)
-$(RM) -r CMakeFiles/ -$(RM) -r CMakeFiles/
endif endif
ifneq ($(wildcard $(DOCUMENT_DIRECTORY)/),)
-$(RM) -r $(DOCUMENT_DIRECTORY)/
endif
ifneq ($(wildcard TestCoverage/),)
-$(RM) -r TestCoverage/
endif
ifneq ($(wildcard cryptopp$(LIB_VER)\.*),) ifneq ($(wildcard cryptopp$(LIB_VER)\.*),)
-$(RM) cryptopp$(LIB_VER)\.* -$(RM) cryptopp$(LIB_VER)\.*
endif endif

14
cryptest.sh
View File

@ -80,7 +80,7 @@ if [ -z "$TMP" ]; then
TMP=/tmp TMP=/tmp
fi fi
$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -Wno-deprecated-declarations adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 $CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -Wno-deprecated-declarations adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1
if [ "$?" -eq "0" ]; then if [ "$?" -eq "0" ]; then
ADD_CXXFLAGS="$ADD_CXXFLAGS -Wno-deprecated-declarations" ADD_CXXFLAGS="$ADD_CXXFLAGS -Wno-deprecated-declarations"
fi fi
@ -102,7 +102,7 @@ else
fi fi
# Set to 0 if you don't have UBsan # Set to 0 if you don't have UBsan
$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -fsanitize=undefined adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 $CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -fsanitize=undefined adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1
if [ "$?" -eq "0" ] && [ "$IS_X86" -ne "0" ]; then if [ "$?" -eq "0" ] && [ "$IS_X86" -ne "0" ]; then
HAVE_UBSAN=1 HAVE_UBSAN=1
else else
@ -110,7 +110,7 @@ else
fi fi
# Set to 0 if you don't have Asan # Set to 0 if you don't have Asan
$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -fsanitize=address adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 $CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -fsanitize=address adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1
if [ "$?" -eq "0" ] && [ "$IS_X86" -ne "0" ]; then if [ "$?" -eq "0" ] && [ "$IS_X86" -ne "0" ]; then
HAVE_ASAN=1 HAVE_ASAN=1
else else
@ -120,7 +120,7 @@ fi
# Set to 0 if you don't have Intel multiarch # Set to 0 if you don't have Intel multiarch
HAVE_INTEL_MULTIARCH=0 HAVE_INTEL_MULTIARCH=0
if [ "$IS_DARWIN" -ne "0" ] && [ "$IS_X86" -ne "0" ]; then if [ "$IS_DARWIN" -ne "0" ] && [ "$IS_X86" -ne "0" ]; then
$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -arch i386 -arch x86_64 adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 $CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -arch i386 -arch x86_64 adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1
if [ "$?" -eq "0" ]; then if [ "$?" -eq "0" ]; then
HAVE_INTEL_MULTIARCH=1 HAVE_INTEL_MULTIARCH=1
fi fi
@ -129,7 +129,7 @@ fi
# Set to 0 if you don't have PPC multiarch # Set to 0 if you don't have PPC multiarch
HAVE_PPC_MULTIARCH=0 HAVE_PPC_MULTIARCH=0
if [ "$IS_DARWIN" -ne "0" ] && [ "$IS_PPC" -ne "0" ]; then if [ "$IS_DARWIN" -ne "0" ] && [ "$IS_PPC" -ne "0" ]; then
$CXX -x -DCRYPTOPP_ADHOC_MAIN c++ -arch ppc -arch ppc64 adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 $CXX -x -DCRYPTOPP_ADHOC_MAIN c++ -arch ppc -arch ppc64 adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1
if [ "$?" -eq "0" ]; then if [ "$?" -eq "0" ]; then
HAVE_PPC_MULTIARCH=1 HAVE_PPC_MULTIARCH=1
fi fi
@ -137,7 +137,7 @@ fi
HAVE_X32=0 HAVE_X32=0
if [ "$IS_X64" -ne "0" ]; then if [ "$IS_X64" -ne "0" ]; then
$CXX -x -DCRYPTOPP_ADHOC_MAIN c++ -mx32 adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 $CXX -x -DCRYPTOPP_ADHOC_MAIN c++ -mx32 adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1
if [ "$?" -eq "0" ]; then if [ "$?" -eq "0" ]; then
HAVE_X32=1 HAVE_X32=1
fi fi
@ -1711,7 +1711,7 @@ fi
if [ "$CXX" == "g++" ]; then if [ "$CXX" == "g++" ]; then
CLANG_COMPILER=$(which clang++ 2>/dev/null) CLANG_COMPILER=$(which clang++ 2>/dev/null)
"$CLANG_COMPILER" -x c++ -DCRYPTOPP_ADHOC_MAIN adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 "$CLANG_COMPILER" -x c++ -DCRYPTOPP_ADHOC_MAIN adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1
if [ "$?" -eq "0" ]; then if [ "$?" -eq "0" ]; then
############################################ ############################################