From 2a070435ff8f9cf4b36636c2a88e72c33bdbb156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20=C4=8C=C3=A1p?= <6508800+RadekCap@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:21:21 +0100 Subject: [PATCH 1/3] Update makefile Add check of CUT. CUT is needed for a proper setting of LIB_DIR in CYGWIN. --- makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 5253646b..a8dc53fc 100644 --- a/makefile +++ b/makefile @@ -25,8 +25,9 @@ export JAVA_HOME := $(TEST_JDK_HOME) $(info JAVA_HOME is set to $(JAVA_HOME)) endif - - +ifndef CUT +$(error Please provide CUT value.) +endif D = / MKTREE = mkdir -p From af6db3f2f51b15d40a6d583e62b6817a1f9c2553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20=C4=8C=C3=A1p?= <6508800+RadekCap@users.noreply.github.com> Date: Tue, 30 Jan 2024 17:16:09 +0100 Subject: [PATCH 2/3] Update makefile use cut instead of $CUT --- makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/makefile b/makefile index a8dc53fc..e611d844 100644 --- a/makefile +++ b/makefile @@ -25,10 +25,6 @@ export JAVA_HOME := $(TEST_JDK_HOME) $(info JAVA_HOME is set to $(JAVA_HOME)) endif -ifndef CUT -$(error Please provide CUT value.) -endif - D = / MKTREE = mkdir -p SUBDIRS = .. @@ -41,7 +37,7 @@ ifndef LIB_DIR endif UNAME := uname -UNAME_OS := $(shell $(UNAME) -s | $(CUT) -f1 -d_) +UNAME_OS := $(shell $(UNAME) -s | cut -f1 -d_) ifeq ($(findstring CYGWIN,$(UNAME_OS)), CYGWIN) LIB_DIR:=$(shell cygpath -w $(LIB_DIR)) endif From c3190b24e331782925e13c38bd3b98294d8a1411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20=C4=8C=C3=A1p?= <6508800+RadekCap@users.noreply.github.com> Date: Tue, 30 Jan 2024 17:25:08 +0100 Subject: [PATCH 3/3] Update makefile Add debug message about used LIB_DIR. --- makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/makefile b/makefile index e611d844..ef414113 100644 --- a/makefile +++ b/makefile @@ -42,6 +42,7 @@ ifeq ($(findstring CYGWIN,$(UNAME_OS)), CYGWIN) LIB_DIR:=$(shell cygpath -w $(LIB_DIR)) endif export LIB_DIR:=$(subst \,/,$(LIB_DIR)) +$(info LIB_DIR is set to $(LIB_DIR)) _TESTTARGET = $(firstword $(MAKECMDGOALS)) TESTTARGET = $(patsubst _%,%,$(_TESTTARGET))