Skip to content

Commit ef48d48

Browse files
mulle-natmulle-nat
committed
fix cmake for windows
1 parent 1f202d3 commit ef48d48

File tree

23 files changed

+112
-107
lines changed

23 files changed

+112
-107
lines changed

Diff for: ‎.mulle/share/env/environment-plugin.sh

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎.mulle/share/env/environment.sh

+14-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎.mulle/share/env/tool-plugin

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎.mulle/share/env/version

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎.mulle/share/sde/version/mulle-sde/cmake

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎cmake/share/Environment.cmake

+29-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/reflect/_mulle-objc-runtime-versioncheck.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
#if defined( MULLE__CORE_VERSION)
99
# ifndef MULLE__CORE_VERSION_MIN
10-
# define MULLE__CORE_VERSION_MIN ((0UL << 20) | (2 << 8) | 0)
10+
# define MULLE__CORE_VERSION_MIN ((0UL << 20) | (3 << 8) | 0)
1111
# endif
1212
# ifndef MULLE__CORE_VERSION_MAX
13-
# define MULLE__CORE_VERSION_MAX ((0UL << 20) | (3 << 8) | 0)
13+
# define MULLE__CORE_VERSION_MAX ((0UL << 20) | (4 << 8) | 0)
1414
# endif
1515
# if MULLE__CORE_VERSION < MULLE__CORE_VERSION_MIN
1616
# error "mulle-core is too old"

Diff for: ‎test-compiler-runtime/.mulle/share/env/environment-plugin.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES'
2222
#
2323
#
2424
#
25-
export MULLE_SDE_INSTALLED_VERSION="3.0.0"
25+
export MULLE_SDE_INSTALLED_VERSION="3.1.0"
2626

2727

Diff for: ‎test-compiler-runtime/.mulle/share/env/environment.sh

+14-13
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ case "${MULLE_SHELL_MODE}" in
4141
;;
4242

4343
*\\h*)
44-
PS1="$(sed 's/\\h/\\h\['${envname}'\]/' <<< "${PS1}" )"
44+
PS1="$( PATH=/bin:/usr/bin sed 's/\\h/\\h\['${envname}'\]/' <<< "${PS1}" )"
4545
;;
4646

4747
*)
@@ -82,7 +82,7 @@ case "${MULLE_SHELL_MODE}" in
8282
unset FILENAME
8383

8484
vardir="${MULLE_VIRTUAL_ROOT}/.mulle/var/${MULLE_HOSTNAME:-unknown-host}"
85-
[ -d "${vardir}" ] || mkdir -p "${vardir}"
85+
[ -d "${vardir}" ] || PATH=/bin:/usr/bin mkdir -p "${vardir}"
8686

8787
HISTFILE="${vardir}/bash_history"
8888
export HISTFILE
@@ -117,37 +117,38 @@ unset TRACE
117117

118118
case "${MULLE_SHELL_MODE}" in
119119
*INTERACTIVE*)
120-
if [ -z "" ]
120+
if [ -z "${MULLE_SDE_NO_ALIAS}" ]
121121
then
122-
alias craftorder="mulle-sde craftorder"
123122
alias clean="mulle-sde clean"
124123
alias craft="mulle-sde craft"
124+
alias craftorder="mulle-sde craftorder"
125125
alias dependency="mulle-sde dependency"
126126
alias environment="mulle-sde environment"
127127
alias extension="mulle-sde extension"
128128
alias fetch="mulle-sde fetch"
129-
alias show="mulle-sde show"
130-
alias list="mulle-sde list"
131129
alias library="mulle-sde library"
130+
alias list="mulle-sde list"
132131
alias log="mulle-sde log"
133132
alias match="mulle-sde match"
134133
alias monitor="mulle-sde monitor"
135-
alias reflect="mulle-sde reflect"
136134
alias patternfile="mulle-sde patternfile"
135+
alias reflect="mulle-sde reflect"
136+
alias run="mulle-sde run"
137+
alias show="mulle-sde show"
137138
alias subproject="mulle-sde subproject"
138139
fi
139140

140-
if [ -z "" ]
141+
if [ -z "${MULLE_SDE_NO_QUICK_ALIAS}" ]
141142
then
142-
alias c="mulle-sde craft"
143143
alias C="mulle-sde clean; mulle-sde craft"
144+
alias c="mulle-sde craft"
144145
alias CC="mulle-sde clean all; mulle-sde craft"
145-
alias t="mulle-sde test rerun --serial"
146-
alias tt="mulle-sde test craft ; mulle-sde test rerun --serial"
146+
alias l="mulle-sde list --files"
147+
alias r="mulle-sde reflect"
147148
alias T="mulle-sde test craft ; mulle-sde test"
149+
alias t="mulle-sde test rerun --serial"
148150
alias TT="mulle-sde test clean all; mulle-sde test"
149-
alias r="mulle-sde reflect"
150-
alias l="mulle-sde list --files"
151+
alias tt="mulle-sde test craft ; mulle-sde test rerun --serial"
151152
fi
152153
;;
153154
esac

Diff for: ‎test-compiler-runtime/.mulle/share/env/tool-plugin

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ make
4141
mkdir;required
4242
mknod
4343
more
44-
more;required
4544
mount
4645
mulle-column
4746
mv;required

Diff for: ‎test-compiler-runtime/.mulle/share/env/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.2.0
1+
5.2.1

Diff for: ‎test-compiler/.mulle/share/env/environment-plugin.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES'
2222
#
2323
#
2424
#
25-
export MULLE_SDE_INSTALLED_VERSION="3.0.0"
25+
export MULLE_SDE_INSTALLED_VERSION="3.1.0"
2626

2727

Diff for: ‎test-compiler/.mulle/share/env/environment.sh

+14-13
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ case "${MULLE_SHELL_MODE}" in
4141
;;
4242

4343
*\\h*)
44-
PS1="$(sed 's/\\h/\\h\['${envname}'\]/' <<< "${PS1}" )"
44+
PS1="$( PATH=/bin:/usr/bin sed 's/\\h/\\h\['${envname}'\]/' <<< "${PS1}" )"
4545
;;
4646

4747
*)
@@ -82,7 +82,7 @@ case "${MULLE_SHELL_MODE}" in
8282
unset FILENAME
8383

8484
vardir="${MULLE_VIRTUAL_ROOT}/.mulle/var/${MULLE_HOSTNAME:-unknown-host}"
85-
[ -d "${vardir}" ] || mkdir -p "${vardir}"
85+
[ -d "${vardir}" ] || PATH=/bin:/usr/bin mkdir -p "${vardir}"
8686

8787
HISTFILE="${vardir}/bash_history"
8888
export HISTFILE
@@ -117,37 +117,38 @@ unset TRACE
117117

118118
case "${MULLE_SHELL_MODE}" in
119119
*INTERACTIVE*)
120-
if [ -z "" ]
120+
if [ -z "${MULLE_SDE_NO_ALIAS}" ]
121121
then
122-
alias craftorder="mulle-sde craftorder"
123122
alias clean="mulle-sde clean"
124123
alias craft="mulle-sde craft"
124+
alias craftorder="mulle-sde craftorder"
125125
alias dependency="mulle-sde dependency"
126126
alias environment="mulle-sde environment"
127127
alias extension="mulle-sde extension"
128128
alias fetch="mulle-sde fetch"
129-
alias show="mulle-sde show"
130-
alias list="mulle-sde list"
131129
alias library="mulle-sde library"
130+
alias list="mulle-sde list"
132131
alias log="mulle-sde log"
133132
alias match="mulle-sde match"
134133
alias monitor="mulle-sde monitor"
135-
alias reflect="mulle-sde reflect"
136134
alias patternfile="mulle-sde patternfile"
135+
alias reflect="mulle-sde reflect"
136+
alias run="mulle-sde run"
137+
alias show="mulle-sde show"
137138
alias subproject="mulle-sde subproject"
138139
fi
139140

140-
if [ -z "" ]
141+
if [ -z "${MULLE_SDE_NO_QUICK_ALIAS}" ]
141142
then
142-
alias c="mulle-sde craft"
143143
alias C="mulle-sde clean; mulle-sde craft"
144+
alias c="mulle-sde craft"
144145
alias CC="mulle-sde clean all; mulle-sde craft"
145-
alias t="mulle-sde test rerun --serial"
146-
alias tt="mulle-sde test craft ; mulle-sde test rerun --serial"
146+
alias l="mulle-sde list --files"
147+
alias r="mulle-sde reflect"
147148
alias T="mulle-sde test craft ; mulle-sde test"
149+
alias t="mulle-sde test rerun --serial"
148150
alias TT="mulle-sde test clean all; mulle-sde test"
149-
alias r="mulle-sde reflect"
150-
alias l="mulle-sde list --files"
151+
alias tt="mulle-sde test craft ; mulle-sde test rerun --serial"
151152
fi
152153
;;
153154
esac

Diff for: ‎test-compiler/.mulle/share/env/tool-plugin

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ make
4141
mkdir;required
4242
mknod
4343
more
44-
more;required
4544
mount
4645
mulle-column
4746
mv;required

Diff for: ‎test-compiler/.mulle/share/env/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.2.0
1+
5.2.1

Diff for: ‎test-startup/.mulle/share/env/environment-plugin.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES'
2222
#
2323
#
2424
#
25-
export MULLE_SDE_INSTALLED_VERSION="3.0.0"
25+
export MULLE_SDE_INSTALLED_VERSION="3.1.0"
2626

2727

0 commit comments

Comments
 (0)