fix cmake for windows

mulle-c · Jan 30, 2024 · 7b1a6dc · 7b1a6dc
1 parent 9bbc640
commit 7b1a6dc
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 57 deletions.
diff --git a/.mulle/share/env/environment-plugin.sh b/.mulle/share/env/environment-plugin.sh
diff --git a/.mulle/share/env/environment.sh b/.mulle/share/env/environment.sh
diff --git a/.mulle/share/env/tool-plugin b/.mulle/share/env/tool-plugin
diff --git a/.mulle/share/env/version b/.mulle/share/env/version
diff --git a/.mulle/share/sde/version/mulle-sde/cmake b/.mulle/share/sde/version/mulle-sde/cmake
diff --git a/cmake/share/Environment.cmake b/cmake/share/Environment.cmake
diff --git a/test/.mulle/share/env/environment-plugin.sh b/test/.mulle/share/env/environment-plugin.sh
@@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES'
 #
 #
 #
-export MULLE_SDE_INSTALLED_VERSION="3.0.0"
+export MULLE_SDE_INSTALLED_VERSION="3.1.0"
 
 
diff --git a/test/.mulle/share/env/environment.sh b/test/.mulle/share/env/environment.sh
@@ -41,7 +41,7 @@ case "${MULLE_SHELL_MODE}" in
          ;;
 
          *\\h*)
-            PS1="$(sed 's/\\h/\\h\['${envname}'\]/' <<< "${PS1}" )"
+            PS1="$( PATH=/bin:/usr/bin sed 's/\\h/\\h\['${envname}'\]/' <<< "${PS1}" )"
          ;;
 
          *)
@@ -82,7 +82,7 @@ case "${MULLE_SHELL_MODE}" in
       unset FILENAME
 
       vardir="${MULLE_VIRTUAL_ROOT}/.mulle/var/${MULLE_HOSTNAME:-unknown-host}"
-      [ -d "${vardir}" ] || mkdir -p "${vardir}"
+      [ -d "${vardir}" ] || PATH=/bin:/usr/bin mkdir -p "${vardir}"
 
       HISTFILE="${vardir}/bash_history"
       export HISTFILE
@@ -117,37 +117,38 @@ unset TRACE
 
 case "${MULLE_SHELL_MODE}" in
    *INTERACTIVE*)
-      if [ -z "" ]
+      if [ -z "${MULLE_SDE_NO_ALIAS}" ]
       then
-         alias craftorder="mulle-sde craftorder"
          alias clean="mulle-sde clean"
          alias craft="mulle-sde craft"
+         alias craftorder="mulle-sde craftorder"
          alias dependency="mulle-sde dependency"
          alias environment="mulle-sde environment"
          alias extension="mulle-sde extension"
          alias fetch="mulle-sde fetch"
-         alias show="mulle-sde show"
-         alias list="mulle-sde list"
          alias library="mulle-sde library"
+         alias list="mulle-sde list"
          alias log="mulle-sde log"
          alias match="mulle-sde match"
          alias monitor="mulle-sde monitor"
-         alias reflect="mulle-sde reflect"
          alias patternfile="mulle-sde patternfile"
+         alias reflect="mulle-sde reflect"
+         alias run="mulle-sde run"
+         alias show="mulle-sde show"
          alias subproject="mulle-sde subproject"
       fi
 
-      if [ -z "" ]
+      if [ -z "${MULLE_SDE_NO_QUICK_ALIAS}" ]
       then
-         alias c="mulle-sde craft"
          alias C="mulle-sde clean; mulle-sde craft"
+         alias c="mulle-sde craft"
          alias CC="mulle-sde clean all; mulle-sde craft"
-         alias t="mulle-sde test rerun --serial"
-         alias tt="mulle-sde test craft ; mulle-sde test rerun --serial"
+         alias l="mulle-sde list --files"
+         alias r="mulle-sde reflect"
          alias T="mulle-sde test craft ; mulle-sde test"
+         alias t="mulle-sde test rerun --serial"
          alias TT="mulle-sde test clean all; mulle-sde test"
-         alias r="mulle-sde reflect"
-         alias l="mulle-sde list --files"
+         alias tt="mulle-sde test craft ; mulle-sde test rerun --serial"
       fi
    ;;
 esac
diff --git a/test/.mulle/share/env/tool-plugin b/test/.mulle/share/env/tool-plugin
@@ -41,7 +41,6 @@ make
 mkdir;required
 mknod
 more
-more;required
 mount
 mulle-column
 mv;required

diff --git a/test/.mulle/share/env/version b/test/.mulle/share/env/version
@@ -1 +1 @@
-5.2.0
+5.2.1