Defaults for DkML vars in shell scripts

Part of diskuv/dkml-installer-ocaml#77
diskuv · Nov 27, 2023 · 23aecfc · 23aecfc
1 parent e4b3fac
commit 23aecfc
Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/bump-version.cmake b/bump-version.cmake
@@ -8,6 +8,7 @@ include(${DKML_BUMP_VERSION_PARTICIPANT_MODULE})
 
 DkMLBumpVersionParticipant_PlainReplace(template.dkmlroot)
 DkMLBumpVersionParticipant_PlainReplace(README.md)
+DkMLBumpVersionParticipant_PlainReplace(unix/crossplatform-functions.sh)
 DkMLBumpVersionParticipant_MetaReplace(META)
 DkMLBumpVersionParticipant_OpamReplace(dkml-runtime-common.opam)
 DkMLBumpVersionParticipant_OpamReplace(dkml-runtime-common-native.opam)

diff --git a/unix/_common_tool.sh b/unix/_common_tool.sh
@@ -24,7 +24,7 @@
 # _common_tool.sh
 #
 # Inputs:
-#   DKMLDIR: The 'diskuv-ocaml' vendored directory containing '.dkmlroot'.
+#   DKMLDIR: The DkML vendored directory containing '.dkmlroot'.
 #
 #################################################
 
@@ -52,7 +52,7 @@ is_reproducible_platform() {
     is_arg_linux_based_platform "$PLATFORM"
 }
 
-if [ ! -e "$DKMLDIR/.dkmlroot" ]; then echo "FATAL: Not embedded within or launched from a 'diskuv-ocaml' Local Project" >&2 ; exit 1; fi
+if [ ! -e "$DKMLDIR/.dkmlroot" ]; then echo "FATAL: Not launched within a directory tree containing a .dkmlroot file" >&2 ; exit 1; fi
 
 # set $dkml_root_version
 # shellcheck disable=SC1091

diff --git a/unix/crossplatform-functions.sh b/unix/crossplatform-functions.sh
@@ -88,6 +88,17 @@ set_dkmlparenthomedir() {
     fi
 }
 
+set_default_dkmlnativedir() {
+    if [ -n "${LOCALAPPDATA:-}" ]; then
+        DKMLNATIVEDIR_BUILDHOST="$LOCALAPPDATA\\Programs\\DkMLNative"
+    elif is_macos_build_machine; then
+        DKMLNATIVEDIR_BUILDHOST="$HOME/Applications/DkMLNative"
+    else
+        # shellcheck disable=SC2034
+        DKMLNATIVEDIR_BUILDHOST="${XDG_DATA_HOME:-$HOME/.local/share}/dkml-native"
+    fi
+}
+
 # Detects DkML and sets its variables.
 #
 # If the environment variables already exist they are not overwritten.
@@ -110,7 +121,20 @@ set_dkmlparenthomedir() {
 # - env:DKMLBINPATHS_UNIX - set if DkML installed. Paths will be in Unix (colon separated) format
 # - env:DKMLMSYS2DIR_BUILDHOST - set if DkML installed MSYS2. Directory will be in Windows format
 # Return Code:
-# - 1 if DiskuvOCaml is not installed
+# - 1 if DkML is not installed
+default_dkmlvars() {
+    set_default_dkmlnativedir # Native is the default mode, not Bytecode
+    autodetect_dkmlvars_DiskuvOCamlVarsVersion_Override=2
+    if [ -x /usr/bin/cygpath ]; then
+        autodetect_dkmlvars_DiskuvOCamlHome_Override=$(/usr/bin/cygpath -a "$DKMLNATIVEDIR_BUILDHOST")
+    else
+        autodetect_dkmlvars_DiskuvOCamlHome_Override=$DKMLNATIVEDIR_BUILDHOST
+    fi
+    autodetect_dkmlvars_DiskuvOCamlBinaryPaths_Override="$autodetect_dkmlvars_DiskuvOCamlHome_Override/usr/bin;$autodetect_dkmlvars_DiskuvOCamlHome_Override/bin"
+    autodetect_dkmlvars_DiskuvOCamlDeploymentId_Override="default-592592597"
+    autodetect_dkmlvars_DiskuvOCamlVersion_Override=2.1.0
+    autodetect_dkmlvars_DiskuvOCamlMSYS2Dir_Override=
+}
 autodetect_dkmlvars() {
     autodetect_dkmlvars_DiskuvOCamlVarsVersion_Override=${DiskuvOCamlVarsVersion:-}
     autodetect_dkmlvars_DiskuvOCamlHome_Override=${DiskuvOCamlHome:-}
@@ -139,11 +163,15 @@ autodetect_dkmlvars() {
                 # shellcheck disable=SC1090
                 . "$DKMLPARENTHOME_BUILDHOST\\dkmlvars.sh"
             fi
+        else
+            default_dkmlvars
         fi
     else
         if [ -e "$DKMLPARENTHOME_BUILDHOST/dkmlvars.sh" ]; then
             # shellcheck disable=SC1091
             . "$DKMLPARENTHOME_BUILDHOST/dkmlvars.sh"
+        else
+            default_dkmlvars
         fi
     fi
     # Overrides
@@ -559,6 +587,13 @@ is_cygwin_build_machine() {
     return 1
 }
 
+is_macos_build_machine() {
+    if [ -x /usr/bin/uname ] && [ "$(/usr/bin/uname -s)" = Darwin ]; then
+        return 0
+    fi
+    return 1
+}
+
 # Inputs:
 # - $1 - The PLATFORM
 is_arg_windows_platform() {