From 07eb46c6d4c4bce4e0ca76794a5ddaa3a0806851 Mon Sep 17 00:00:00 2001 From: Florent Gluck <florent.gluck@hesge.ch> Date: Fri, 27 Sep 2024 16:03:38 +0200 Subject: [PATCH] Updated Makefile: added check for CERT env. var --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8a99c7b8..dc5dbb3e 100644 --- a/Makefile +++ b/Makefile @@ -221,11 +221,13 @@ check_bin_var: check_server_var: $(call check_defined, SERVER) +check_cert_var: + $(call check_defined, CERT) + check_login_var: $(call check_defined, LOGIN) check_nexus_exam_vars: - $(call check_defined, CERT) $(call check_defined, EXAM_USER) $(call check_defined, EXAM_PWD) @@ -273,7 +275,7 @@ else @echo -n "" > $(RESOURCES_DIR_CLIENT)/$(CA_CERT_FILE) endif -xbuild_client: check_bin_var check_server_var copy_resources_client $(SRC_CLIENT)/nexush $(SRC_CLIENT)/nexus-cli +xbuild_client: check_bin_var check_server_var check_cert_var copy_resources_client $(SRC_CLIENT)/nexush $(SRC_CLIENT)/nexus-cli @echo "[Cross-building $(BIN) into $(BUILD_DIR_CLIENT) directory]" @for os in $(OSES_CLIENT); do \ for arch in $(ARCHES_CLIENT); do \ @@ -296,15 +298,15 @@ xbuild_client: check_bin_var check_server_var copy_resources_client $(SRC_CLIENT $(BUILD_DIR_CLIENT): mkdir $@ -build_nexush: check_server_var copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexush +build_nexush: check_server_var check_cert_var copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexush @echo "[Building nexush into $(BUILD_DIR_CLIENT) directory]" @cd $(SRC_CLIENT)/nexush && go build $(BUILD_FLAGS) $(BUILD_CLIENT_FLAGS) && mv nexush $(BUILD_ABS_CLIENT) -build_nexus-cli: check_server_var copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexus-cli +build_nexus-cli: check_server_var check_cert_var copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexus-cli @echo "[Building nexus-cli into $(BUILD_DIR_CLIENT) directory]" @cd $(SRC_CLIENT)/nexus-cli && go build $(BUILD_FLAGS) $(BUILD_CLIENT_FLAGS) && mv nexus-cli $(BUILD_ABS_CLIENT) -build_nexus-exam: check_server_var check_nexus_exam_vars copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexus-exam +build_nexus-exam: check_server_var check_cert_var check_nexus_exam_vars copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexus-exam @echo "[Building nexus-exam into $(BUILD_DIR_CLIENT) directory]" @echo -n '$(value EXAM_USER)' > $(NEXUS_EXAM_USER_CREDS_FILE) @echo -n '$(value EXAM_PWD)' > $(NEXUS_EXAM_PWD_CREDS_FILE) -- GitLab