Skip to content

Commit

Permalink
* NSTask system methods now have variants where you can *modify* (not…
Browse files Browse the repository at this point in the history
… set) the tasks environment
  • Loading branch information
mulle-nat committed Jan 30, 2024
1 parent aa48518 commit 3902a9a
Show file tree
Hide file tree
Showing 66 changed files with 776 additions and 423 deletions.
2 changes: 1 addition & 1 deletion .mulle/share/env/environment-plugin.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 14 additions & 13 deletions .mulle/share/env/environment.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .mulle/share/env/tool-plugin

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .mulle/share/env/version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .mulle/share/sde/version/mulle-sde/cmake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.22.0

* NSTask system methods now have variants where you can *modify* (not set) the tasks environment


### 0.21.4

* fix for cosmopolitan
Expand Down
53 changes: 29 additions & 24 deletions cmake/share/Environment.cmake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/BSD/.mulle/share/env/environment-plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"


27 changes: 14 additions & 13 deletions src/BSD/.mulle/share/env/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" )"
;;

*)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
1 change: 0 additions & 1 deletion src/BSD/.mulle/share/env/tool-plugin
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ make
mkdir;required
mknod
more
more;required
mount
mulle-column
mv;required
Expand Down
2 changes: 1 addition & 1 deletion src/BSD/.mulle/share/env/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.0
5.2.1
2 changes: 1 addition & 1 deletion src/BSD/.mulle/share/sde/version/mulle-sde/cmake
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.27.0
0.27.1
53 changes: 29 additions & 24 deletions src/BSD/cmake/share/Environment.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,25 @@ if( NOT __ENVIRONMENT__CMAKE__)
set( MULLE_VIRTUAL_ROOT "${PROJECT_SOURCE_DIR}")
endif()
endif()
file( TO_CMAKE_PATH ${MULLE_VIRTUAL_ROOT} MULLE_VIRTUAL_ROOT)

macro( mulle_append_unique_existing_path list_name item)
set( item_index -1) # supposedly makes local
list( FIND ${list_name} "${item}" item_index)
if( ${item_index} EQUAL -1)
if( NOT EXISTS "${item}")
list( APPEND ${list_name} "${item}")
endif()
endif()
endmacro()

macro( mulle_append_list list_name other_list)
set( item "") # supposedly makes local
foreach( item ${${other_list}})
list( APPEND ${list_name} "${item}")
endforeach()
endmacro()


#
# MULLE_SDK is dependency/addiction. Not sysroot!
Expand Down Expand Up @@ -85,25 +104,8 @@ if( NOT __ENVIRONMENT__CMAKE__)
endif()
endif()


macro( mulle_append_unique_existing_path list_name item)
set( item_index -1) # supposedly makes local
list( FIND ${list_name} "${item}" item_index)
if( ${item_index} EQUAL -1)
if( NOT EXISTS "${item}")
list( APPEND ${list_name} "${item}")
endif()
endif()
endmacro()

macro( mulle_append_list list_name other_list)
set( item "") # supposedly makes local
foreach( item ${${other_list}})
list( APPEND ${list_name} "${item}")
endforeach()
endmacro()

message( STATUS "DEPENDENCY_DIR=\"${DEPENDENCY_DIR}\"")
# needed for windows
file( TO_CMAKE_PATH ${DEPENDENCY_DIR} DEPENDENCY_DIR)
list( APPEND ADDITIONAL_BIN_PATH "${DEPENDENCY_DIR}/bin")

if( NOT ADDICTION_DIR)
Expand All @@ -128,6 +130,9 @@ if( NOT __ENVIRONMENT__CMAKE__)
set( MULLE_SDK_PATH
"${DEPENDENCY_DIR}"
"${ADDICTION_DIR}")

# needed for windows
file( TO_CMAKE_PATH ${ADDICTION_DIR} ADDICTION_DIR)
list( APPEND ADDITIONAL_BIN_PATH "${ADDICTION_DIR}/bin")
message( STATUS "ADDICTION_DIR=\"${ADDICTION_DIR}\"")
else()
Expand All @@ -137,6 +142,7 @@ if( NOT __ENVIRONMENT__CMAKE__)
set( MULLE_SDK_PATH "${DEPENDENCY_DIR}")
endif()


# where the output is installed by other dependencies
set( MULLE_SDK_DEPENDENCY_DIR "${DEPENDENCY_DIR}/${MULLE_SDK_SUBDIR}")

Expand Down Expand Up @@ -189,10 +195,10 @@ if( NOT __ENVIRONMENT__CMAKE__)
list( APPEND TMP_CMAKE_LIBRARY_PATH "${TMP_MULLE_SDK_PATH}/lib")
list( APPEND TMP_CMAKE_FRAMEWORK_PATH "${TMP_MULLE_SDK_PATH}/Frameworks")
else()
mulle_append_unique_existing_path( APPEND TMP_CMAKE_INCLUDE_PATH "${TMP_MULLE_SDK_PATH}/include")
mulle_append_unique_existing_path( APPEND TMP_INCLUDE_DIRS "${TMP_MULLE_SDK_PATH}/include")
mulle_append_unique_existing_path( APPEND TMP_CMAKE_LIBRARY_PATH "${TMP_MULLE_SDK_PATH}/lib")
mulle_append_unique_existing_path( APPEND TMP_CMAKE_FRAMEWORK_PATH "${TMP_MULLE_SDK_PATH}/Frameworks")
mulle_append_unique_existing_path( TMP_CMAKE_INCLUDE_PATH "${TMP_MULLE_SDK_PATH}/include")
mulle_append_unique_existing_path( TMP_INCLUDE_DIRS "${TMP_MULLE_SDK_PATH}/include")
mulle_append_unique_existing_path( TMP_CMAKE_LIBRARY_PATH "${TMP_MULLE_SDK_PATH}/lib")
mulle_append_unique_existing_path( TMP_CMAKE_FRAMEWORK_PATH "${TMP_MULLE_SDK_PATH}/Frameworks")
endif()

#
Expand Down Expand Up @@ -250,7 +256,6 @@ if( NOT __ENVIRONMENT__CMAKE__)
unset( TMP_FRAMEWORK_PATH)
endif()


#
# add "d" to library names on windows MSVC for debugging libraries
#
Expand Down
2 changes: 1 addition & 1 deletion src/Darwin/.mulle/share/env/environment-plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Loading

0 comments on commit 3902a9a

Please sign in to comment.