From 77ec5b1ff36d25d95e2c3d99c0a7de3dac20af56 Mon Sep 17 00:00:00 2001 From: rok-cesnovar Date: Wed, 18 Mar 2020 09:16:51 +0100 Subject: [PATCH 1/8] add strip --- make/compiler_flags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/compiler_flags b/make/compiler_flags index 929647ee77d..dce11a18392 100644 --- a/make/compiler_flags +++ b/make/compiler_flags @@ -1,6 +1,6 @@ # Find files subroutine for different operating system # This is recursive version of the makefiles wildcard function -findfiles = $(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2)) $(wildcard $(d)/$(2))) +findfiles = $(strip $(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2))$(wildcard $(d)/$(2)))) ifneq ($(OS),Windows_NT) GENERATE_DISTRIBUTION_TESTS=true From d6f9db97c257e57f63e11532df996d01beedb413 Mon Sep 17 00:00:00 2001 From: rok-cesnovar Date: Wed, 18 Mar 2020 09:23:23 +0100 Subject: [PATCH 2/8] different call to runChecks.py --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index cba287ce86e..4174a189fad 100644 --- a/makefile +++ b/makefile @@ -126,7 +126,7 @@ clean-all: clean clean-doxygen clean-deps clean-libraries .PHONY: test-math-dependencies test-math-dependencies: - @python runChecks.py + @./runChecks.py ## # Debug target that allows you to print a variable ## From f2901f533d794e7191456eb1d92d0d394dd36c30 Mon Sep 17 00:00:00 2001 From: rok-cesnovar Date: Wed, 18 Mar 2020 16:54:32 +0100 Subject: [PATCH 3/8] use subst instead of strip --- make/compiler_flags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/compiler_flags b/make/compiler_flags index dce11a18392..0b808cdbccf 100644 --- a/make/compiler_flags +++ b/make/compiler_flags @@ -1,6 +1,6 @@ # Find files subroutine for different operating system # This is recursive version of the makefiles wildcard function -findfiles = $(strip $(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2))$(wildcard $(d)/$(2)))) +findfiles = $(subst \n,,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2))$(wildcard $(d)/$(2)))) ifneq ($(OS),Windows_NT) GENERATE_DISTRIBUTION_TESTS=true From 04b3bfe4c0a259f76ec84e30caffe2f70ccb2b95 Mon Sep 17 00:00:00 2001 From: rok-cesnovar Date: Thu, 19 Mar 2020 17:45:58 +0100 Subject: [PATCH 4/8] add spaces for windows --- make/compiler_flags | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/make/compiler_flags b/make/compiler_flags index 0b808cdbccf..8021c3dc7be 100644 --- a/make/compiler_flags +++ b/make/compiler_flags @@ -1,6 +1,10 @@ # Find files subroutine for different operating system # This is recursive version of the makefiles wildcard function +ifneq ($(OS),Windows_NT) +findfiles = $(subst \n, ,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2))$(wildcard $(d)/$(2)))) +else findfiles = $(subst \n,,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2))$(wildcard $(d)/$(2)))) +endif ifneq ($(OS),Windows_NT) GENERATE_DISTRIBUTION_TESTS=true From a443194c72034be2b534940acee92c461baab37a Mon Sep 17 00:00:00 2001 From: rok-cesnovar Date: Fri, 20 Mar 2020 12:26:59 +0100 Subject: [PATCH 5/8] ifneq -> ifeq --- make/compiler_flags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/compiler_flags b/make/compiler_flags index 8021c3dc7be..de0650a077a 100644 --- a/make/compiler_flags +++ b/make/compiler_flags @@ -1,6 +1,6 @@ # Find files subroutine for different operating system # This is recursive version of the makefiles wildcard function -ifneq ($(OS),Windows_NT) +ifeq ($(OS),Windows_NT) findfiles = $(subst \n, ,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2))$(wildcard $(d)/$(2)))) else findfiles = $(subst \n,,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2))$(wildcard $(d)/$(2)))) From 1924245193849ca79fa3a26367fee0e6ba3625b3 Mon Sep 17 00:00:00 2001 From: rok-cesnovar Date: Fri, 20 Mar 2020 14:16:55 +0100 Subject: [PATCH 6/8] suffix space --- make/tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/tests b/make/tests index 25344579189..030b3ab0bfd 100644 --- a/make/tests +++ b/make/tests @@ -67,7 +67,7 @@ $(ALGEBRA_SOLVER_TESTS) : $(LIBSUNDIALS) # Target to verify header files within Stan has # enough include calls ## -HEADER_TESTS := $(addsuffix -test,$(call findfiles,stan,*.hpp)) +HEADER_TESTS := $(addsuffix -test ,$(call findfiles,stan,*.hpp)) ifeq ($(OS),Windows_NT) DEV_NULL = nul From c73c8d81a40bbc8576b842418910a43a94330576 Mon Sep 17 00:00:00 2001 From: Rok Date: Sat, 21 Mar 2020 09:08:36 +0100 Subject: [PATCH 7/8] add spaces --- make/compiler_flags | 4 ++-- make/tests | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/make/compiler_flags b/make/compiler_flags index de0650a077a..aa8782e7a03 100644 --- a/make/compiler_flags +++ b/make/compiler_flags @@ -1,9 +1,9 @@ # Find files subroutine for different operating system # This is recursive version of the makefiles wildcard function ifeq ($(OS),Windows_NT) -findfiles = $(subst \n, ,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2))$(wildcard $(d)/$(2)))) +findfiles = $(subst \n,,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2)) $(wildcard $(d)/$(2)))) else -findfiles = $(subst \n,,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2))$(wildcard $(d)/$(2)))) +findfiles = $(subst \n,,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2)) $(wildcard $(d)/$(2)))) endif ifneq ($(OS),Windows_NT) diff --git a/make/tests b/make/tests index 030b3ab0bfd..25344579189 100644 --- a/make/tests +++ b/make/tests @@ -67,7 +67,7 @@ $(ALGEBRA_SOLVER_TESTS) : $(LIBSUNDIALS) # Target to verify header files within Stan has # enough include calls ## -HEADER_TESTS := $(addsuffix -test ,$(call findfiles,stan,*.hpp)) +HEADER_TESTS := $(addsuffix -test,$(call findfiles,stan,*.hpp)) ifeq ($(OS),Windows_NT) DEV_NULL = nul From abddcc00d81b983d7dbf35e056f7c91bad0cefd7 Mon Sep 17 00:00:00 2001 From: rok-cesnovar Date: Sat, 21 Mar 2020 20:25:17 +0100 Subject: [PATCH 8/8] remove os check --- make/compiler_flags | 4 ---- 1 file changed, 4 deletions(-) diff --git a/make/compiler_flags b/make/compiler_flags index aa8782e7a03..a736830fc1a 100644 --- a/make/compiler_flags +++ b/make/compiler_flags @@ -1,10 +1,6 @@ # Find files subroutine for different operating system # This is recursive version of the makefiles wildcard function -ifeq ($(OS),Windows_NT) -findfiles = $(subst \n,,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2)) $(wildcard $(d)/$(2)))) -else findfiles = $(subst \n,,$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call findfiles,$(d)/,$(2)) $(wildcard $(d)/$(2)))) -endif ifneq ($(OS),Windows_NT) GENERATE_DISTRIBUTION_TESTS=true