merged mambo into mamba

Author: shakfu

CHANGELOG.md

@@ -19,7 +19,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 - Changed the main `CMakeLists.txt` file to enable single-project build options.
 
-- Added `mambo` external which uses a new way of building relocatable python3 externals. It includes a tweaked version of the `mamba` single-header c-based python3 library, and makes use of a slightly modified version of the `source/scripts/buildpy.py` script which was [developed externally](https://github.com/shakfu/buildpy). So far, shared, static, and framework builds are possible via: `make mambo-shared`, `make mambo-static` and `make mambo-framework` respectively.
+- Merged `mambo` features into `mamba`. `mambo` is removed as a separate subproject.
+
+- Added `mambo` variant of `mamba` which uses a new way of building relocatable python3 externals. It includes a tweaked version of the `mamba` single-header c-based python3 library, and makes use of a slightly modified version of the `source/scripts/buildpy.py` script which was [developed externally](https://github.com/shakfu/buildpy). So far, shared, static, and framework builds are possible via: `make mambo-shared`, `make mambo-static` and `make mambo-framework` respectively.
 
 - Added additional 'category' folders in `py-js/source` to improve classification of externals
 

CMakeLists.txt

@@ -27,7 +27,6 @@ option(BUILD_ZEDIT_EXTERNAL "Build the zedit external" OFF)
 option(BUILD_ZPY_EXTERNAL "Build the zpy external" OFF)
 option(BUILD_ZTHREAD_EXTERNAL "Build the zthread external" OFF)
 option(BUILD_JMX_EXTERNAL "Build the jmx external" OFF)
-option(BUILD_MAMBO_EXTERNAL "Build the mambo external" OFF)
 
 # micropython external build options
 option(FETCH_MICROPYTHON "Download latest micropython and use that to build external" OFF)
@@ -101,7 +100,6 @@ if(BUILD_PYTHON3_EXPERIMENTAL_EXTERNALS)
 set(BUILD_COBRA_EXTERNAL ON)
 set(BUILD_KRAIT_EXTERNAL ON)
 set(BUILD_MAMBA_EXTERNAL ON)
-set(BUILD_MAMBO_EXTERNAL ON)
 set(BUILD_MXPY_EXTERNAL ON)
 endif()
 
@@ -158,10 +156,6 @@ if(BUILD_MAMBA_EXTERNAL)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/source/projects/mamba)
 endif()
 
-if(BUILD_MAMBO_EXTERNAL)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/source/projects/mambo)
-endif()
-
 if(BUILD_MXPY_EXTERNAL)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/source/projects/mxpy)
 endif()

FAQ.md

@@ -28,6 +28,8 @@ Definitely, if python is installed using [Homebrew](https://brew.sh) you can cre
 
 The `make default` build creates a lightweight external dynamically linked to your local python3 interpreter; other build variants such as `framework-pkg` embeds python3 into an external that is dynamically linked to a python3 interpreter which is part of the containing Max package; and another such as `framework-ext` embeds python into the external itself without any dependencies. There are other ways as well. The section, [Building self-contained Python3 Externals for Packages and Standalones](https://github.com/shakfu/py-js/tree/main/source/projects/py#building-self-contained-python3-externals-for-packages-and-standalones), gives an overview of the different approaches.
 
+Recent work on the `mamba` single-header c library project makes it possible build relocatable python3 externals along the lines of what is possible with `py` and `pyjs`
+
 ## Installation
 
 ### Can I use two different python3 externals in the same patch?

Makefile

@@ -125,8 +125,8 @@ all: default
 		framework-pkg framework-ext \
 		shared-pkg shared-ext shared-tiny-ext \
 		static-pkg static-ext static-tiny-ext \
-		mambo mambo-static mambo-shared \
-		mambo-framework mambo-framework-pkg \
+		mamba mamba-static mamba-shared \
+		mamba-framework mamba-framework-pkg \
 		jmx zthread
 
 # -----------------------------------------------------------------------
@@ -159,56 +159,57 @@ projects: clean-build-dir clean-externals
 			&& \
 		cmake --build . --config Release
 
-mambo: clean-externals
-	$(call section,"building mambo")
+mamba: clean-externals
+	$(call section,"building mamba")
 	@mkdir -p build && \
 		cd build && \
 		cmake -GXcode .. \
-			-DBUILD_MAMBO_EXTERNAL=ON \
+			-DBUILD_MAMBA_EXTERNAL=ON \
 			-DBUILD_VARIANT=local \
 			&& \
 		cmake --build . --config Release
 
-mambo-static: clean-externals
-	$(call section,"building mambo-static")
+
+mamba-static: clean-externals
+	$(call section,"building mamba-static")
 	@./source/scripts/buildpy.py -c static-mid
 	@mkdir -p build && \
 		cd build && \
 		cmake -GXcode .. \
-			-DBUILD_MAMBO_EXTERNAL=ON \
+			-DBUILD_MAMBA_EXTERNAL=ON \
 			-DBUILD_VARIANT=static-ext \
 			&& \
 		cmake --build . --config Release
 
-mambo-shared: clean-externals
-	$(call section,"building mambo-shared")
+mamba-shared: clean-externals
+	$(call section,"building mamba-shared")
 	@./source/scripts/buildpy.py -c shared-mid
 	@mkdir -p build && \
 		cd build && \
 		cmake -GXcode .. \
-			-DBUILD_MAMBO_EXTERNAL=ON \
+			-DBUILD_MAMBA_EXTERNAL=ON \
 			-DBUILD_VARIANT=shared-ext \
 			&& \
 		cmake --build . --config Release
 
-mambo-framework: clean-externals
-	$(call section,"building mambo-framework")
+mamba-framework: clean-externals
+	$(call section,"building mamba-framework")
 	@./source/scripts/buildpy.py -c framework-mid
 	@mkdir -p build && \
 		cd build && \
 		cmake -GXcode .. \
-			-DBUILD_MAMBO_EXTERNAL=ON \
+			-DBUILD_MAMBA_EXTERNAL=ON \
 			-DBUILD_VARIANT=framework-ext \
 			&& \
 		cmake --build . --config Release
 
-mambo-framework-pkg: clean-externals
-	$(call section,"building mambo-framework-pkg")
+mamba-framework-pkg: clean-externals
+	$(call section,"building mamba-framework-pkg")
 	@./source/scripts/buildpy.py --max-package -c framework-mid
 	@mkdir -p build && \
 		cd build && \
 		cmake -GXcode .. \
-			-DBUILD_MAMBO_EXTERNAL=ON \
+			-DBUILD_MAMBA_EXTERNAL=ON \
 			-DBUILD_VARIANT=framework-pkg \
 			&& \
 		cmake --build . --config Release

README.md

@@ -28,7 +28,6 @@ name       | sdk        | lang   | description
 name       | sdk        | lang   | description
 :--------- | :--------- | :----: | :---------------------------------------------------
 [mamba]    | max-sdk    | c      | single-header c library to nest a python3 interpreter in any external
-[mambo]    | max-sdk    | c      | a `mamba` variant with a relocatable python3 interpreter (shared, static, framework)
 [krait]    | max-sdk    | c++    | single-header c++ library to nest a python3 interpreter in any external
 [cobra]    | max-sdk    | c      | python3 external providing deferred and clocked function execution
 [mxpy]     | max-sdk    | c      | a translation of [pdpython](https://github.com/shakfu/pdpython) into Max