Skip to content

Commit d5e6a7f

Browse files
committed
version 1.88.0
1 parent 065b603 commit d5e6a7f

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v3
1515
- name: Build
1616
run: |
17-
export ICU4C_RELEASE_LINK=https://github.com/apotocki/icu4c-iosx/releases/download/76.1.4
17+
export ICU4C_RELEASE_LINK=https://github.com/apotocki/icu4c-iosx/releases/download/77.1.0
1818
scripts/build.sh -p=macosx-both,ios,iossim-both,catalyst-both,xros,xrossim-both,watchos,watchossim-both,tvos,tvossim-both
1919
for i in frameworks/*.xcframework/; do cd frameworks && zip -9 -r "$(basename -- $i).zip" $(basename -- $i) & done; wait
2020
cd frameworks

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ scripts/build.sh -p=ios,iossim-x86_64
7171
```
7272
Here is a list of all possible values for '-p' option:
7373
```
74-
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
74+
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
7575
```
7676
Suffix '-both' means that xcframeworks will be built for both arm64 and x86_64 architectures.
7777
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.
@@ -100,7 +100,7 @@ Add the following lines into your project's Podfile:
100100
use_frameworks!
101101
pod 'boost-iosx', '~> 1.88.0'
102102
# or optionally more precisely e.g.:
103-
# pod 'boost-iosx', :git => 'https://github.com/apotocki/boost-iosx', :tag => '1.88.0.0'
103+
# pod 'boost-iosx', :git => 'https://github.com/apotocki/boost-iosx', :tag => '1.88.0.1'
104104
```
105105
If you want to use specific boost libraries, specify them as in the following example for log and program_options libraries:
106106
```

boost-iosx.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "boost-iosx"
3-
s.version = "1.88.0.0"
3+
s.version = "1.88.0.1"
44
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."
55
s.homepage = "https://github.com/apotocki/boost-iosx"
66
s.license = "Boost Software License"

scripts/build.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ BUILD_PLATFORMS="macosx,ios,iossim,catalyst"
4848
[[ -d $WATCHOSSYSROOT/SDKs/WatchOS.sdk ]] && BUILD_PLATFORMS="$BUILD_PLATFORMS,watchos"
4949
[[ -d $WATCHOSSIMSYSROOT/SDKs/WatchSimulator.sdk ]] && BUILD_PLATFORMS="$BUILD_PLATFORMS,watchossim-both"
5050

51+
REBUILD=false
52+
5153
# Function to determine architecture
5254
boost_arc() {
5355
case $1 in
@@ -217,6 +219,8 @@ if [[ ! -f $BOOST_ARCHIVE_FILE ]]; then
217219
break
218220
else
219221
echo "Wrong archive hash $FILE_HASH, expected $EXPECTED_HASH. Trying next link to reload the archive."
222+
echo "File content: "
223+
head -c 1024 $BOOST_ARCHIVE_FILE
220224
rm $BOOST_ARCHIVE_FILE
221225
fi
222226
fi
@@ -245,7 +249,7 @@ fi
245249
if true; then
246250
#export ICU4C_RELEASE_LINK=https://github.com/apotocki/icu4c-iosx/releases/download/76.1.4
247251
if [[ ! -f $SCRIPT_DIR/Pods/icu4c-iosx/build.success ]] || [[ $(is_subset $SCRIPT_DIR/Pods/icu4c-iosx/build.success "${BUILD_PLATFORMS_ARRAY[@]}") == "false" ]]; then
248-
if [[ ! -z "${ICU4C_RELEASE_LINK}" ]]; then
252+
if [[ ! -z "${ICU4C_RELEASE_LINK:-}" ]]; then
249253
[[ -d $SCRIPT_DIR/Pods/icu4c-iosx ]] && rm -rf $SCRIPT_DIR/Pods/icu4c-iosx
250254
mkdir -p $SCRIPT_DIR/Pods/icu4c-iosx/product
251255
pushd $SCRIPT_DIR/Pods/icu4c-iosx/product
@@ -323,7 +327,7 @@ patch tools/build/src/tools/features/instruction-set-feature.jam $SCRIPT_DIR/ins
323327

324328
B2_BUILD_OPTIONS="-j$THREAD_COUNT address-model=64 release link=static runtime-link=shared define=BOOST_SPIRIT_THREADSAFE cxxflags=\"-std=c++20\""
325329

326-
[[ ! -z "${ICU_PATH}" ]] && B2_BUILD_OPTIONS="$B2_BUILD_OPTIONS -sICU_PATH=\"$ICU_PATH\""
330+
[[ ! -z "${ICU_PATH:-}" ]] && B2_BUILD_OPTIONS="$B2_BUILD_OPTIONS -sICU_PATH=\"$ICU_PATH\""
327331

328332
for i in $LIBS_TO_BUILD; do :;
329333
B2_BUILD_OPTIONS="$B2_BUILD_OPTIONS --with-$i"
@@ -344,15 +348,15 @@ if [[ $REBUILD == true ]] || [[ ! -f $1-$2-build.success ]] || [[ $(is_subset $1
344348
cat >> tools/build/src/user-config.jam <<EOF
345349
using darwin : $1 : clang++ -arch $2 $3
346350
: <striper> <root>$4
347-
: <architecture>$(boost_arc $2) $6
351+
: <architecture>$(boost_arc $2) ${6:-}
348352
;
349353
EOF
350-
if [[ ! -z "${ICU_PATH}" ]]; then
354+
if [[ ! -z "${ICU_PATH:-}" ]]; then
351355
cp $ICU_PATH/frameworks/icudata.xcframework/$5/libicudata.a $ICU_PATH/lib/
352356
cp $ICU_PATH/frameworks/icui18n.xcframework/$5/libicui18n.a $ICU_PATH/lib/
353357
cp $ICU_PATH/frameworks/icuuc.xcframework/$5/libicuuc.a $ICU_PATH/lib/
354358
fi
355-
./b2 -j8 --stagedir=stage/$1-$2 toolset=darwin-$1 architecture=$(boost_arc $2) abi=$(boost_abi $2) $7 $B2_BUILD_OPTIONS
359+
./b2 -j8 --stagedir=stage/$1-$2 toolset=darwin-$1 architecture=$(boost_arc $2) abi=$(boost_abi $2) ${7:-} $B2_BUILD_OPTIONS
356360
rm -rf bin.v2
357361
printf "$LIBS_TO_BUILD_SORTED" > $1-$2-build.success
358362
fi
@@ -395,7 +399,7 @@ build_sim_libs()
395399

396400
build_xrossim_libs()
397401
{
398-
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"
402+
build_generic_libs xrossim $1 "-isysroot $XROSSIMSYSROOT/SDKs/XRSimulator.sdk" $XROSSIMSYSROOT "xros-*-simulator" "<target-os>iphone" "target-os=iphone define=BOOST_TEST_NO_MAIN"
399403
}
400404

401405
build_tvossim_libs()

0 commit comments

Comments
 (0)