From 7bfec03577bd7beda76125a01364e36fc25ffacf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Tue, 6 Feb 2024 21:36:03 -0500
Subject: [PATCH] Looks like slog is the only util that links with libsbbs.
Add a standalone-utils .PHONY target to build all the rest before
Spidermonkey is done.
---
.gitlab-ci-unix.yml | 20 ++++++++++++++++++++
src/sbbs3/targets.mk | 12 ++++++++++++
2 files changed, 32 insertions(+)
diff --git a/.gitlab-ci-unix.yml b/.gitlab-ci-unix.yml
index b6b621d356..3b3c381d4e 100644
--- a/.gitlab-ci-unix.yml
+++ b/.gitlab-ci-unix.yml
@@ -234,6 +234,25 @@ spec:
- job: "uifc-$[[ inputs.os ]]"
- job: "xpdev-$[[ inputs.os ]]"
+"utils-$[[ inputs.os ]]":
+ extends:
+ - .$[[ inputs.os ]]-build
+ script:
+ - cd src/sbbs3
+ - gmake ${BUILD_FLAGS} standalone-utils
+ artifacts:
+ name: "utils-${OSP}"
+ paths:
+ - "src/sbbs3/*.exe.release/*"
+ - "src/sbbs3/*.obj.release*/*"
+ needs:
+ - job: "ciolib-$[[ inputs.os ]]"
+ - job: "encode-$[[ inputs.os ]]"
+ - job: "hash-$[[ inputs.os ]]"
+ - job: "smblib-$[[ inputs.os ]]"
+ - job: "uifc-$[[ inputs.os ]]"
+ - job: "xpdev-$[[ inputs.os ]]"
+
"sbbs-$[[ inputs.os ]]":
extends:
- .$[[ inputs.os ]]-build
@@ -259,6 +278,7 @@ spec:
- job: "uifc-$[[ inputs.os ]]"
- job: "umonitor-$[[ inputs.os ]]"
- job: "xpdev-$[[ inputs.os ]]"
+ - job: "utils-$[[ inputs.os ]]"
rules:
- if: $NO_JAVASCRIPT == "yes"
when: never
diff --git a/src/sbbs3/targets.mk b/src/sbbs3/targets.mk
index 03797fdcb9..c4f2bf67d8 100644
--- a/src/sbbs3/targets.mk
+++ b/src/sbbs3/targets.mk
@@ -65,6 +65,18 @@ utils: smblib xpdev-mt xpdev ciolib-mt uifc-mt \
gtkutils: gtkmonitor gtkchat gtkuseredit gtkuserlist
+.PHONY: standalone-utils
+standalone-utils: $(FIXSMB) $(CHKSMB) \
+ $(SMBUTIL) $(BAJA) $(NODE) \
+ $(SBBSECHO) $(ECHOCFG) \
+ $(ADDFILES) $(FILELIST) $(MAKEUSER) \
+ $(ANS2ASC) $(ASC2ANS) $(UNBAJA) \
+ $(QWKNODES) $(SLOG) \
+ $(DELFILES) $(DUPEFIND) \
+ $(SEXYZ) $(READSAUCE) \
+ $(PKTDUMP) $(FMSGDUMP) $(UPGRADE_TO_V319) \
+ $(UPGRADE_TO_V320)
+
.PHONY: libdeps
libdeps: $(JS_DEPS) gitinfo smblib xpdev-mt $(MTOBJODIR) $(LIBODIR)
--
GitLab