From b5b8dc86bd7da6fae0ccb42d484a030ee8731cf8 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Fri, 23 Sep 2016 23:30:44 -0400
Subject: [PATCH] Add TestScripts to GNUmakefile

---
 GNUmakefile | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 9f049b44..15b4be75 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -665,21 +665,31 @@ dlltest.exe: cryptopp.dll $(DLLTESTOBJS)
 	$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
 
 # This recipe prepares the distro files
-TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.compat Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcxproj *.filters cryptopp.rc TestVectors/*.txt TestData/*.dat
-EXEC_FILES := GNUmakefile GNUmakefile-cross TestData/ TestVectors/
+TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.compat Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcxproj *.filters cryptopp.rc TestVectors/*.txt TestData/*.dat TestScripts/*.sh TestScripts/*.pl
+EXEC_FILES := GNUmakefile GNUmakefile-cross TestData/ TestVectors/ TestScripts/
 
 ifeq ($(wildcard Filelist.txt),Filelist.txt)
 DIST_FILES := $(shell cat Filelist.txt)
 endif
 
+.PHONY: trim
+trim:
+ifneq ($(IS_DARWIN),0)
+	sed -i '' -e's/[[:space:]]*$$//' *.compat *.sh *.h *.cpp GNUmakefile GNUmakefile-cross
+	make convert
+else
+	sed -i -e's/[[:space:]]*$$//' *.compat *.sh *.h *.cpp GNUmakefile GNUmakefile-cross
+	make convert
+endif
+
 .PHONY: convert
 convert:
-	-$(CHMOD) 0700 TestVectors/ TestData/
-	-$(CHMOD) 0600 $(TEXT_FILES) *.asm *.S *.zip *.cmake
-	-$(CHMOD) 0700 $(EXEC_FILES) *.sh *.cmd
+	-$(CHMOD) 0700 TestVectors/ TestData/ TestScripts/
+	-$(CHMOD) 0600 $(TEXT_FILES) *.asm *.S *.zip *.cmake TestVectors/*.txt TestData/*.dat
+	-$(CHMOD) 0700 $(EXEC_FILES) *.sh *.cmd TestScripts/*.sh TestScripts/cryptest-win.pl
 	-$(CHMOD) 0700 *.cmd *.sh GNUmakefile GNUmakefile-cross
-	-unix2dos --keepdate --quiet $(TEXT_FILES) *.asm *.cmd *.cmake
-	-dos2unix --keepdate --quiet GNUmakefile GNUmakefile-cross *.S *.sh
+	-unix2dos --keepdate --quiet $(TEXT_FILES) *.asm *.cmd *.cmake TestScripts/cryptest-win.pl
+	-dos2unix --keepdate --quiet GNUmakefile GNUmakefile-cross *.S *.sh TestScripts/*.sh
 ifneq ($(IS_DARWIN),0)
 	-xattr -c *
 endif