Adding the relative path

adoptium · May 17, 2024 · fb539fd · fb539fd
1 parent 7617fed
commit fb539fd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
@@ -212,6 +212,7 @@ def setupParallelEnv() {
 					def customUrl = getCustomUrl()
 					if (PLATFORM.contains("windows")) {
 						env.LIB_DIR = env.LIB_DIR.replaceAll("\\\\", "/")
+                        env.SYSTEM_LIB_DIR = env.SYSTEM_LIB_DIR.replaceAll("\\\\", "/")
 					}
 					if (env.BUILD_LIST != 'system') {
 						sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default -customUrl ${customUrl}"
@@ -665,6 +666,7 @@ def buildTest() {
 				def customUrl = getCustomUrl()
 				if (PLATFORM.contains("windows")) {
 					env.LIB_DIR = env.LIB_DIR.replaceAll("\\\\", "/")
+                    env.SYSTEM_LIB_DIR = env.SYSTEM_LIB_DIR.replaceAll("\\\\", "/")
 				}
 				if (env.BUILD_LIST != 'system') {
 					sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default -customUrl ${customUrl}"

diff --git a/system/system.mk b/system/system.mk
@@ -14,12 +14,12 @@
 # Set our own macro to indicate we're running under cygwin.
 ifndef CYGWIN
   OSTYPE?=$(shell echo $$OSTYPE)
-  CYGWIN:=0
+  CYGWIN := 0
   ifeq ($(OSTYPE),cygwin)
-	CYGWIN:=1
+    CYGWIN := 1
   endif
   ifeq ($(TERM),cygwin)
-	CYGWIN:=1
+    CYGWIN := 1
   endif
 endif
 $(warning CYGWIN is $(CYGWIN))
@@ -29,15 +29,16 @@ ifeq ($(CYGWIN),1)
   # than the cygwin perl port. This assumes that version will be in a directory ending /perl/bin directory
   # and the cygwin version will not. Once found, that version of perl is added ahead of cygwin perl in the PATH.
   $(warning Running under cygwin, looking for Windows perl on path)
-  PERL:=$(shell which -a perl.exe | grep /perl/bin | sort | uniq)
+  PERL := $(shell which -a perl.exe | grep /perl/bin | sort | uniq)
   ifeq (,$(PERL))
-	$(error Unable to find Windows perl e.g. Strawberry perl in a /perl/bin subdirectory on PATH.  Install perl or add to PATH and retry)
+    $(error Unable to find Windows perl e.g. Strawberry perl in a /perl/bin subdirectory on PATH. Install perl or add to PATH and retry)
   else
-	$(warning Found perl in $(PERL))
+    $(warning Found perl in $(PERL))
   endif
-  PERL:=$(dir $(PERL))
-  export PATH:=$(PERL):$(PATH)
+  PERL := $(dir $(PERL))
+  export PATH := $(PERL):$(PATH)
 endif
+
 REL_PATH := ../
 TEST_RESROOT := $(shell realpath $(REL_PATH))
 $(info TEST_RESROOT is $(TEST_RESROOT))