version 1.84.0

Author: apotocki

.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Build
       run: |
-        export ICU4C_RELEASE_LINK=https://github.com/apotocki/icu4c-iosx/releases/download/76.1.4
+        export ICU4C_RELEASE_LINK=https://github.com/apotocki/icu4c-iosx/releases/download/77.1.0
         scripts/build.sh -p=macosx-both,ios,iossim-both,catalyst-both,xros,xrossim-both,watchos,watchossim-both,tvos,tvossim-both
         for i in frameworks/*.xcframework/; do cd frameworks && zip -9 -r "$(basename -- $i).zip" $(basename -- $i) & done; wait
         cd frameworks

README.md

@@ -4,25 +4,48 @@ Supported version: 1.84.0 (use the appropriate tag to select the version)
 
 This repo provides a universal script for building static Boost C++ libraries for use in iOS, watchOS, tvOS, visionOS, and macOS & Catalyst applications.
 
-Since the Boost distribution URLs are often broken and change, the script tries to download it from the links specified in the LOCATIONS file in the master branch. Only after the SHA256 hash of the downloaded archive is verified, the libraries are unpacked and compiled.
+Since Boost distribution URLs are often unreliable and subject to change, the script attempts to download Boost from the links specified in the `LOCATIONS` file on the master branch. Only after verifying the SHA256 hash of the downloaded archive are the libraries unpacked and compiled.
 
-## Building libraries
+## Built Libraries
 atomic, chrono, cobalt (requires apple clang-15.0.0 or later), container, context, contract, coroutine, date_time, exception, fiber, filesystem, graph, iostreams, json, locale, log, math, nowide, program_options, random, regex, serialization, stacktrace, system, test, thread, timer, type_erasure, url, wave
 
-## Not building libraries
+## Excluded Libraries
 graph_parallel, mpi, python
 
 ## Prerequisites
-  1) Xcode must be installed because xcodebuild is used to create xcframeworks
-  2) ```xcode-select -p``` must point to Xcode app developer directory (by default e.g. /Applications/Xcode.app/Contents/Developer). If it points to CommandLineTools directory you should execute:
-  ```sudo xcode-select --reset``` or ```sudo xcode-select -s /Applications/Xcode.app/Contents/Developer```
-  3) You should not have your own user-config.jam file in your home directory!
-  4) Building for tvOS, watchOS, visionOS and their simulators requires the appropriate SDKs to be installed in the folder /Applications/Xcode.app/Contents/Developer/Platforms
 
-## Building notes
-1) The 'locale' and 'regex' libraries are built using the ICU backend. There are two ways to get it. The first (default) is when the ICU libraries are automatically built before Boost is built using the build script from https://github.com/apotocki/icu4c-iosx . The second is by specifying the ICU4C_RELEASE_LINK environment variable where prebuit binaries can be downloaded from.
-2) The 'test' library is built for iOS and visionOS with the BOOST_TEST_NO_MAIN flag.
-3) The 'test' library is built for watchOS and tvOS with the BOOST_TEST_NO_MAIN and BOOST_TEST_DISABLE_ALT_STACK flags.
+1. **Install Xcode**: Ensure Xcode is installed, as `xcodebuild` is required to create `xcframeworks`.
+
+2. **Verify Xcode Developer Directory**:
+   - The `xcode-select -p` command must point to the Xcode app's developer directory (e.g., `/Applications/Xcode.app/Contents/Developer`).
+   - If it points to the CommandLineTools directory, reset it using one of the following commands:
+     ```bash
+     sudo xcode-select --reset
+     ```
+     or
+     ```bash
+     sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
+     ```
+
+3. **Remove User-Specific Configurations**: Ensure you do not have a `user-config.jam` file in your home directory, as it may interfere with the build process.
+
+4. **Install Required SDKs**: To build for tvOS, watchOS, visionOS, and their simulators, make sure the corresponding SDKs are installed in the folder:
+```
+   /Applications/Xcode.app/Contents/Developer/Platforms
+```
+## Building Notes
+
+1. **ICU Backend for `locale` and `regex` Libraries**:
+   - These libraries are built using the ICU backend. There are two ways to obtain the ICU libraries:
+     1. **Default Method**: The ICU libraries are automatically built before Boost using the build script available at:
+        [https://github.com/apotocki/icu4c-iosx](https://github.com/apotocki/icu4c-iosx).
+     2. **Prebuilt Binaries**: Specify the `ICU4C_RELEASE_LINK` environment variable to download prebuilt binaries.
+
+2. **`test` Library for iOS and visionOS**:
+   - The `test` library is built with the `BOOST_TEST_NO_MAIN` flag.
+
+3. **`test` Library for watchOS and tvOS**:
+   - The `test` library is built with the `BOOST_TEST_NO_MAIN` and `BOOST_TEST_DISABLE_ALT_STACK` flags.
 
 # Build Manually
 ```
@@ -34,7 +57,7 @@ graph_parallel, mpi, python
     scripts/build.sh
     
     # However, if you wish, you can skip building the ICU libraries during the boost build and use pre-built binaries from my ICU repository:
-    # ICU4C_RELEASE_LINK=https://github.com/apotocki/icu4c-iosx/releases/download/76.1.4 scripts/build.sh
+    # ICU4C_RELEASE_LINK=https://github.com/apotocki/icu4c-iosx/releases/download/77.1.0 scripts/build.sh
     
     # have fun, the result artifacts will be located in 'frameworks' folder.
     # Then you can add desirable xcframeworks in your XCode project. The process is described, e.g., at https://www.simpleswiftguide.com/how-to-add-xcframework-to-xcode-project/
@@ -48,7 +71,7 @@ scripts/build.sh -p=ios,iossim-x86_64
 ```
 Here is a list of all possible values for '-p' option:
 ```
-macosx,macosx-arm64,macosx-x86_64,macosx-both,ios,iossim,iossim-arm64,iossim-x86_64,iossim-both,catalyst,catalyst-arm64,catalyst-x86_64,catalyst-both,xros,xrossim,xrossim-arm64,xrossim-x86_64,xrossim-both,tvos,tvossim,tvossim-both,tvossim-arm64,tvossim-x86_64,watchos,watchossim,watchossim-both,watchossim-arm64,watchossim-x86_64
+macosx,macosx-arm64,macosx-x86_64,macosx-both,ios,iossim,iossim-arm64,iossim-x86_64,iossim-both,catalyst,catalyst-arm64,catalyst-x86_64,catalyst-both,xros,xrossim,xrossim-arm64,xrossim-x86_64,xrossim-both,tvos,tvossim,tvossim-arm64,tvossim-x86_64,tvossim-both,watchos,watchossim,watchossim-arm64,watchossim-x86_64,watchossim-both
 ```
 Suffix '-both' means that xcframeworks will be built for both arm64 and x86_64 architectures.
 The platform names for macosx and simulators without an architecture suffix (e.g. macosx, iossim, tvossim) mean that xcframeworks are only built for the current host architecture.
@@ -77,7 +100,7 @@ Add the following lines into your project's Podfile:
     use_frameworks!
     pod 'boost-iosx', '~> 1.84.0'
     # or optionally more precisely e.g.:
-    # pod 'boost-iosx', :git => 'https://github.com/apotocki/boost-iosx', :tag => '1.84.0.7'
+    # pod 'boost-iosx', :git => 'https://github.com/apotocki/boost-iosx', :tag => '1.84.0.8'
 ```
 If you want to use specific boost libraries, specify them as in the following example for log and program_options libraries:
 ``` 

boost-iosx.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = "boost-iosx"
-    s.version      = "1.84.0.7"
+    s.version      = "1.84.0.8"
     s.summary      = "Boost C++ libraries for macOS, iOS, watchOS, tvOS, and visionOS, including builds for Mac Catalyst, iOS Simulator, watchOS Simulator, tvOS Simulator, and visionOS Simulator."
     s.homepage     = "https://github.com/apotocki/boost-iosx"
     s.license      = "Boost Software License"

scripts/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -euo pipefail
 ################## SETUP BEGIN
 THREAD_COUNT=$(sysctl hw.ncpu | awk '{print $2}')
 HOST_ARC=$( uname -m )
@@ -16,7 +16,7 @@ TVOS_SIM_VERSION=13.0
 WATCHOS_VERSION=11.0
 WATCHOS_SIM_VERSION=11.0
 ################## SETUP END
-LOCATIONS_FILE_URL="https://raw.githubusercontent.com/apotocki/boost-iosx/master/LOCATIONS"
+LOCATIONS_FILE_URL="https://github.com/apotocki/boost-iosx/raw/refs/heads/master/LOCATIONS"
 IOSSYSROOT=$XCODE_ROOT/Platforms/iPhoneOS.platform/Developer
 IOSSIMSYSROOT=$XCODE_ROOT/Platforms/iPhoneSimulator.platform/Developer
 MACSYSROOT=$XCODE_ROOT/Platforms/MacOSX.platform/Developer
@@ -48,26 +48,24 @@ BUILD_PLATFORMS="macosx,ios,iossim,catalyst"
 [[ -d $WATCHOSSYSROOT/SDKs/WatchOS.sdk ]] && BUILD_PLATFORMS="$BUILD_PLATFORMS,watchos"
 [[ -d $WATCHOSSIMSYSROOT/SDKs/WatchSimulator.sdk ]] && BUILD_PLATFORMS="$BUILD_PLATFORMS,watchossim-both"
 
-boost_arc()
-{
-    if [[ $1 == arm* ]]; then
-		echo "arm"
-	elif [[ $1 == x86* ]]; then
-		echo "x86"
-	else
-		echo "unknown"
-	fi
+REBUILD=false
+
+# Function to determine architecture
+boost_arc() {
+    case $1 in
+        arm*) echo "arm" ;;
+        x86*) echo "x86" ;;
+        *) echo "unknown" ;;
+    esac
 }
 
-boost_abi()
-{
-    if [[ $1 == arm64 ]]; then
-		echo "aapcs"
-	elif [[ $1 == x86_64 ]]; then
-		echo "sysv"
-	else
-		echo "unknown"
-	fi
+# Function to determine ABI
+boost_abi() {
+    case $1 in
+        arm64) echo "aapcs" ;;
+        x86_64) echo "sysv" ;;
+        *) echo "unknown" ;;
+    esac
 }
 
 is_subset() {
@@ -84,26 +82,26 @@ is_subset() {
     echo "true"
 }
 
-# parse command line
+# Parse command line arguments
 for i in "$@"; do
   case $i in
     -l=*|--libs=*)
       LIBS_TO_BUILD="${i#*=}"
-      shift # past argument=value
+      shift
       ;;
     -p=*|--platforms=*)
       BUILD_PLATFORMS="${i#*=},"
-      shift # past argument=value
+      shift
       ;;
     --rebuild)
       REBUILD=true
       [[ -f "$BUILD_DIR/frameworks.built.platforms" ]] && rm "$BUILD_DIR/frameworks.built.platforms"
       [[ -f "$BUILD_DIR/frameworks.built.libs" ]] && rm "$BUILD_DIR/frameworks.built.libs"
-      shift # past argument with no value
+      shift
       ;;
     --rebuildicu)
       [[ -d $SCRIPT_DIR/Pods/icu4c-iosx ]] && rm -rf $SCRIPT_DIR/Pods/icu4c-iosx
-      shift # past argument with no value
+      shift
       ;;
     -*|--*)
       echo "Unknown option $i"
@@ -201,17 +199,17 @@ fi
 
 if [[ ! -f $BOOST_ARCHIVE_FILE ]]; then
 	TEMP_LOCATIONS_FILE=$(mktemp)
-	curl -s -o "$TEMP_LOCATIONS_FILE" "$LOCATIONS_FILE_URL"
+	curl -s -o "$TEMP_LOCATIONS_FILE" -L "$LOCATIONS_FILE_URL"
 	if [[ $? -ne 0 ]]; then
 	    echo "Failed to download the LOCATIONS file."
 	    exit 1
 	fi
 	while IFS= read -r linktemplate; do
 		linktemplate=${linktemplate/DOTVERSION/"$BOOST_VER"}
 		link=${linktemplate/FILENAME/"$BOOST_ARCHIVE_FILE"}
-		echo "downloading from $link ..."
+		echo "downloading from \"$link\" ..."
 
-	    curl -o "$BOOST_ARCHIVE_FILE" "$link"
+	    curl -o "$BOOST_ARCHIVE_FILE" -L "$link"
 
 	    # Check if the download was successful
 	    if [ $? -eq 0 ]; then
@@ -221,6 +219,9 @@ if [[ ! -f $BOOST_ARCHIVE_FILE ]]; then
 	            break
 	        else
 	        	echo "Wrong archive hash $FILE_HASH, expected $EXPECTED_HASH. Trying next link to reload the archive."
+                echo "File content: "
+                head -c 1024 $BOOST_ARCHIVE_FILE
+                echo ""
 	        	rm $BOOST_ARCHIVE_FILE
 	        fi
 	    fi
@@ -249,7 +250,7 @@ fi
 if true; then
 #export ICU4C_RELEASE_LINK=https://github.com/apotocki/icu4c-iosx/releases/download/76.1.4
 if [[ ! -f $SCRIPT_DIR/Pods/icu4c-iosx/build.success ]] || [[ $(is_subset $SCRIPT_DIR/Pods/icu4c-iosx/build.success "${BUILD_PLATFORMS_ARRAY[@]}") == "false" ]]; then
-    if [[ ! -z "${ICU4C_RELEASE_LINK}" ]]; then
+    if [[ ! -z "${ICU4C_RELEASE_LINK:-}" ]]; then
 		[[ -d $SCRIPT_DIR/Pods/icu4c-iosx ]] && rm -rf $SCRIPT_DIR/Pods/icu4c-iosx
 		mkdir -p $SCRIPT_DIR/Pods/icu4c-iosx/product
 		pushd $SCRIPT_DIR/Pods/icu4c-iosx/product
@@ -327,7 +328,7 @@ patch tools/build/src/tools/features/instruction-set-feature.jam $SCRIPT_DIR/ins
 
 B2_BUILD_OPTIONS="-j$THREAD_COUNT address-model=64 release link=static runtime-link=shared define=BOOST_SPIRIT_THREADSAFE cxxflags=\"-std=c++20\""
 
-[[ ! -z "${ICU_PATH}" ]] && B2_BUILD_OPTIONS="$B2_BUILD_OPTIONS -sICU_PATH=\"$ICU_PATH\""
+[[ ! -z "${ICU_PATH:-}" ]] && B2_BUILD_OPTIONS="$B2_BUILD_OPTIONS -sICU_PATH=\"$ICU_PATH\""
 
 for i in $LIBS_TO_BUILD; do :;
   B2_BUILD_OPTIONS="$B2_BUILD_OPTIONS --with-$i"
@@ -348,15 +349,15 @@ if [[ $REBUILD == true ]] || [[ ! -f $1-$2-build.success ]] || [[ $(is_subset $1
     cat >> tools/build/src/user-config.jam <<EOF
 using darwin : $1 : clang++ -arch $2 $3
 : <striper> <root>$4
-: <architecture>$(boost_arc $2) $6
+: <architecture>$(boost_arc $2) ${6:-}
 ;
 EOF
-    if [[ ! -z "${ICU_PATH}" ]]; then
+    if [[ ! -z "${ICU_PATH:-}" ]]; then
         cp $ICU_PATH/frameworks/icudata.xcframework/$5/libicudata.a $ICU_PATH/lib/
         cp $ICU_PATH/frameworks/icui18n.xcframework/$5/libicui18n.a $ICU_PATH/lib/
         cp $ICU_PATH/frameworks/icuuc.xcframework/$5/libicuuc.a $ICU_PATH/lib/
     fi
-    ./b2 -j8 --stagedir=stage/$1-$2 toolset=darwin-$1 architecture=$(boost_arc $2) abi=$(boost_abi $2) $7 $B2_BUILD_OPTIONS
+    ./b2 -j8 --stagedir=stage/$1-$2 toolset=darwin-$1 architecture=$(boost_arc $2) abi=$(boost_abi $2) ${7:-} $B2_BUILD_OPTIONS
     rm -rf bin.v2
     printf "$LIBS_TO_BUILD_SORTED" > $1-$2-build.success
 fi
@@ -399,7 +400,7 @@ build_sim_libs()
 
 build_xrossim_libs()
 {
-    build_generic_libs xrossim $1 "$2 -isysroot $XROSSIMSYSROOT/SDKs/XRSimulator.sdk" $XROSSIMSYSROOT "xros-*-simulator" "<target-os>iphone" "target-os=iphone define=BOOST_TEST_NO_MAIN"
+    build_generic_libs xrossim $1 "-isysroot $XROSSIMSYSROOT/SDKs/XRSimulator.sdk" $XROSSIMSYSROOT "xros-*-simulator" "<target-os>iphone" "target-os=iphone define=BOOST_TEST_NO_MAIN"
 }
 
 build_tvossim_libs()