Skip to content

Commit 45cbe1b

Browse files
mulle-natmulle-nat
committed
* now supports _C_BOOL as BOOL (not _Bool\!)
1 parent 384aa3c commit 45cbe1b

16 files changed

+42
-27
lines changed

‎.ackrc

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
--ignore-dir=addiction
2+
--ignore-dir=build
3+
--ignore-dir=dependency
4+
--ignore-dir=kitchen
5+
--ignore-dir=stash
6+
--ignore-dir=.mulle/var

‎.mulle/etc/sourcetree/config

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mulle-objc-runtime;${MULLE_OBJC_RUNTIME_NODETYPE:-tar};no-bequeath,no-header,no-import,no-singlephase;1a4c5f04-6d19-477a-bfb7-55a189dd1e54;${MULLE_OBJC_RUNTIME_URL:-https://github.com/mulle-objc/mulle-objc-runtime/archive/${MULLE_BRANCH}.tar.gz};${MULLE_OBJC_RUNTIME_BRANCH:-latest};;;
2-
mulle-dlfcn;${MULLE_DLFCN_NODETYPE:-tar};no-all-load,no-import,no-link,no-singlephase;315B9D64-1484-402B-AD9E-D8AD1E86AF4B;${MULLE_DLFCN_URL:-https://github.com/mulle-core/mulle-dlfcn/archive/${MULLE_BRANCH}.tar.gz};${MULLE_DLFCN_BRANCH:-latest};;;
3-
mulle-atinit;${MULLE_ATINIT_NODETYPE:-tar};no-bequeath,no-dynamic-link,no-header,no-intermediate-link,no-singlephase;4e27ab5c-4bc1-4fea-adb7-405231f43c8c;${MULLE_ATINIT_URL:-https://github.com/mulle-core/mulle-atinit/archive/${MULLE_BRANCH}.tar.gz};${MULLE_ATINIT_BRANCH:-latest};;;
4-
mulle-atexit;${MULLE_ATEXIT_NODETYPE:-tar};no-bequeath,no-dynamic-link,no-header,no-intermediate-link,no-singlephase;e8de79c9-c40a-41f9-bc5e-c7830831afe7;${MULLE_ATEXIT_URL:-https://github.com/mulle-core/mulle-atexit/archive/${MULLE_BRANCH}.tar.gz};${MULLE_ATEXIT_BRANCH:-latest};;;
1+
mulle-objc-runtime;${MULLE_OBJC_RUNTIME_NODETYPE:-tar};no-bequeath,no-header,no-import,no-singlephase;1a4c5f04-6d19-477a-bfb7-55a189dd1e54;${MULLE_OBJC_RUNTIME_URL:-https://github.com/mulle-objc/mulle-objc-runtime/archive/${MULLE_TAG}.tar.gz};;${MULLE_OBJC_RUNTIME_TAG:-latest};;
2+
mulle-dlfcn;${MULLE_DLFCN_NODETYPE:-tar};no-all-load,no-import,no-link,no-singlephase;315B9D64-1484-402B-AD9E-D8AD1E86AF4B;${MULLE_DLFCN_URL:-https://github.com/mulle-core/mulle-dlfcn/archive/${MULLE_TAG}.tar.gz};;${MULLE_DLFCN_TAG:-latest};;
3+
mulle-atinit;${MULLE_ATINIT_NODETYPE:-tar};no-bequeath,no-dynamic-link,no-header,no-intermediate-link,no-singlephase;4e27ab5c-4bc1-4fea-adb7-405231f43c8c;${MULLE_ATINIT_URL:-https://github.com/mulle-core/mulle-atinit/archive/${MULLE_TAG}.tar.gz};;${MULLE_ATINIT_TAG:-latest};;
4+
mulle-atexit;${MULLE_ATEXIT_NODETYPE:-tar};no-bequeath,no-dynamic-link,no-header,no-intermediate-link,no-singlephase;e8de79c9-c40a-41f9-bc5e-c7830831afe7;${MULLE_ATEXIT_URL:-https://github.com/mulle-core/mulle-atexit/archive/${MULLE_TAG}.tar.gz};;${MULLE_ATEXIT_TAG:-latest};;

‎.mulle/share/env/environment-extension.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Reset to empty
2-
export MULLE_SDE_UPDATE_CALLBACKS="sourcetree:source"
2+
export MULLE_SDE_REFLECT_CALLBACKS="sourcetree:source"
33

44

55
# Used by `mulle-match find` to speed up the search.

‎.mulle/share/env/environment-plugin.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ export KITCHEN_DIR="${MULLE_VIRTUAL_ROOT}/kitchen"
4141
#
4242
#
4343
#
44-
export MULLE_SDE_INSTALLED_VERSION="0.39.1"
44+
export MULLE_SDE_INSTALLED_VERSION="0.40.0"
4545

4646

‎.mulle/share/env/environment.sh

+10-3
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,16 @@ case "${MULLE_SHELL_MODE}" in
8585
done
8686
shopt -u nullglob; IFS="${DEFAULT_IFS}"
8787

88-
unset FILENAME
8988
unset DEFAULT_IFS
89+
unset FILENAME
90+
91+
vardir="${MULLE_VIRTUAL_ROOT}/.mulle/var/${MULLE_HOSTNAME}"
92+
[ -d "${vardir}" ] || mkdir -p "${vardir}"
93+
94+
HISTFILE="${vardir}/bash_history"
95+
export HISTFILE
9096

97+
unset vardir
9198

9299
#
93100
# show motd, if any
@@ -134,7 +141,7 @@ case "${MULLE_SHELL_MODE}" in
134141
alias monitor="mulle-sde monitor"
135142
alias patternfile="mulle-sde patternfile"
136143
alias subproject="mulle-sde subproject"
137-
alias update="mulle-sde update"
144+
alias reflect="mulle-sde reflect"
138145
fi
139146

140147
if [ -z "" ]
@@ -146,7 +153,7 @@ case "${MULLE_SHELL_MODE}" in
146153
alias tt="mulle-sde test craft ; mulle-sde test rerun --serial"
147154
alias T="mulle-sde test craft ; mulle-sde test"
148155
alias TT="mulle-sde test clean ; mulle-sde test"
149-
alias u="mulle-sde update"
156+
alias r="mulle-sde reflect"
150157
alias l="mulle-sde list"
151158
fi
152159
;;

‎.mulle/share/env/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.0
1+
2.6.0

‎.mulle/share/match/match.d/10-sourcetree--all

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.mulle/etc/sourcetree/config
1+
.mulle/etc/sourcetree/config

‎.mulle/share/match/match.d/80-source--standalone-sources

-2
This file was deleted.

‎.mulle/share/monitor/libexec/source-task.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ source_task_run()
3333
{
3434
log_entry "mulle-sde/c-cmake::source_task_run" "$@"
3535

36-
log_info "Updating ${C_MAGENTA}${C_BOLD}${PROJECT_NAME}${C_INFO} source"
36+
log_info "Reflecting ${C_MAGENTA}${C_BOLD}${PROJECT_NAME}${C_INFO} source"
3737

3838
exekutor mulle-match-to-cmake \
3939
${MULLE_TECHNICAL_FLAGS} \

‎.mulle/share/monitor/libexec/sourcetree-task.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ sourcetree_task_run()
4040
{
4141
log_entry "mulle-sde/c-cmake::sourcetree_task_run" "$@"
4242

43-
log_info "Updating ${C_MAGENTA}${C_BOLD}${PROJECT_NAME}${C_INFO} sourcetree"
43+
log_info "Reflecting ${C_MAGENTA}${C_BOLD}${PROJECT_NAME}${C_INFO} sourcetree"
4444

4545
case "${MULLE_SOURCETREE_TO_CMAKE_RUN}" in
4646
NO|DISABLE*|OFF)

‎cmake/Sources.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set( SCRIPTS
99
mulle-objc-encode
1010
mulle-objc-loader-tool
1111
mulle-objc-lista
12+
mulle-objc-leaks
1213
mulle-objc-optimize
1314
mulle-objc-printline
1415
mulle-objc-searchid

‎cmake/share/CompilerFlagsC.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,8 @@ if( NOT __COMPILER_FLAGS_C_CMAKE__)
2020
endif()
2121
endif()
2222

23+
if( MULLE_TEST)
24+
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMULLE_TEST=1")
25+
endif()
26+
2327
endif()

‎cmake/share/Environment.cmake

+9-7
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if( NOT __ENVIRONMENT__CMAKE__)
4848
# set( FALLBACK_BUILD_TYPE "Debug")
4949
# endif()
5050
# endif()
51-
#
51+
#
5252
# if( FALLBACK_BUILD_TYPE STREQUAL "Release")
5353
# unset( FALLBACK_BUILD_TYPE)
5454
# endif()
@@ -69,35 +69,37 @@ if( NOT __ENVIRONMENT__CMAKE__)
6969
#
7070
if( EXISTS "${TMP_SDK_PATH}")
7171

72+
set( TMP_PREFIX "${TMP_SDK_PATH}")
73+
7274
#
7375
# add build type unconditionally if not Release
7476
#
7577
if( NOT CMAKE_BUILD_TYPE STREQUAL "Release")
7678
set( TMP_CMAKE_INCLUDE_PATH
7779
${TMP_CMAKE_INCLUDE_PATH}
78-
"${TMP_SDK_PATH}/${CMAKE_BUILD_TYPE}/include"
80+
"${TMP_PREFIX}/${CMAKE_BUILD_TYPE}/include"
7981
)
8082
set( TMP_INCLUDE_DIRS
8183
${TMP_INCLUDE_DIRS}
82-
"${TMP_SDK_PATH}/${CMAKE_BUILD_TYPE}/include"
84+
"${TMP_PREFIX}/${CMAKE_BUILD_TYPE}/include"
8385
)
8486

8587
set( TMP_CMAKE_LIBRARY_PATH
8688
${TMP_CMAKE_LIBRARY_PATH}
87-
"${TMP_SDK_PATH}/${CMAKE_BUILD_TYPE}/lib"
89+
"${TMP_PREFIX}/${CMAKE_BUILD_TYPE}/lib"
8890
)
8991
set( TMP_CMAKE_FRAMEWORK_PATH
9092
${TMP_CMAKE_FRAMEWORK_PATH}
91-
"${TMP_SDK_PATH}/${CMAKE_BUILD_TYPE}/Frameworks"
93+
"${TMP_PREFIX}/${CMAKE_BUILD_TYPE}/Frameworks"
9294
)
9395
endif()
9496

9597
#
9698
# add release as fallback always
9799
#
98-
set( TMP_SDK_RELEASE_PATH "${TMP_SDK_PATH}/Release")
100+
set( TMP_SDK_RELEASE_PATH "${TMP_PREFIX}/Release")
99101
if( NOT EXISTS "${TMP_SDK_RELEASE_PATH}")
100-
set( TMP_SDK_RELEASE_PATH "${TMP_SDK_PATH}")
102+
set( TMP_SDK_RELEASE_PATH "${TMP_PREFIX}")
101103
endif()
102104

103105
message( STATUS "TMP_SDK_RELEASE_PATH=${TMP_SDK_RELEASE_PATH}")

‎cmake/share/ExecutableAux.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ include( ExecutableAuxC OPTIONAL)
1010
CreateForceAllLoadList( ALL_LOAD_DEPENDENCY_LIBRARIES FORCE_ALL_LOAD_DEPENDENCY_LIBRARIES)
1111
CreateForceAllLoadList( STARTUP_ALL_LOAD_DEPENDENCY_LIBRARIES FORCE_STARTUP_ALL_LOAD_DEPENDENCY_LIBRARIES)
1212

13-
1413
if( NOT EXECUTABLE_LIBRARY_LIST)
1514
set( EXECUTABLE_LIBRARY_LIST
1615
${FORCE_ALL_LOAD_DEPENDENCY_LIBRARIES}

‎cmake/share/Motd.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if( NOT __MOTD__CMAKE__)
2121
)
2222
endif()
2323

24-
24+
# must run in singlephase
2525
if( CREATE_MOTD_EXE)
2626
add_custom_target( __motd__ ALL
2727
COMMAND "${CREATE_MOTD_EXE}" $ENV{CREATE_BUILD_MOTD_FLAGS}

‎src/main.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,7 @@ static char *simple_typename( char *type)
180180
case _C_DBL : return( "double");
181181
case _C_LNG_DBL : return( "long double");
182182
case _C_CHARPTR : return( "char *");
183-
#ifdef _C_BOOL
184-
case _C_BOOL : return( "_Bool");
185-
#endif
183+
case _C_BOOL : return( "BOOL");
186184
#ifdef _C_UNDEF
187185
case _C_UNDEF : return( "undefined");
188186
#endif

0 commit comments

Comments
 (0)