Skip to content

Commit a400ddc

Browse files
apotockiapotocki
committed
version 1.82
1 parent 3e19435 commit a400ddc

File tree

5 files changed

+38
-25
lines changed

5 files changed

+38
-25
lines changed

‎.github/workflows/main.yml

+1-1
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/72.1.1
17+
export ICU4C_RELEASE_LINK=https://github.com/apotocki/icu4c-iosx/releases/download/73.1.0
1818
scripts/build.sh
1919
for i in frameworks/*.xcframework/; do cd frameworks && zip -9 -r "$(basename -- $i).zip" $(basename -- $i) & done; wait
2020
cd frameworks

‎README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Boost C++ for iOS and Mac OS X (Intel & Apple Silicon M1) & Catalyst - arm64 / x86_64
22

3-
Supported version: 1.81.0 (use the appropriate tag to select the version)
3+
Supported version: 1.82.0 (use the appropriate tag to select the version)
44

55
This repo provides a universal script for building static Boost C++ libraries for use in iOS and Mac OS X & Catalyst applications.
6-
The latest supported Boost version is taken from: https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2
6+
The latest supported Boost version is taken from: https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2
77

88
## Building libraries
99
atomic, chrono, 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
@@ -25,7 +25,7 @@ graph_parallel, mpi, python
2525
- Manually
2626
```
2727
# clone the repo
28-
git clone -b 1.81.0 https://github.com/apotocki/boost-iosx
28+
git clone -b 1.82.0 https://github.com/apotocki/boost-iosx
2929
3030
# build libraries
3131
cd boost-iosx
@@ -37,14 +37,14 @@ graph_parallel, mpi, python
3737
- Use cocoapods. Add the following lines into your project's Podfile:
3838
```
3939
use_frameworks!
40-
pod 'boost-iosx', '~> 1.81.0'
40+
pod 'boost-iosx', '~> 1.82.0'
4141
# or optionally more precisely e.g.:
42-
# pod 'boost-iosx', :git => 'https://github.com/apotocki/boost-iosx', :tag => '1.81.0.3'
42+
# pod 'boost-iosx', :git => 'https://github.com/apotocki/boost-iosx', :tag => '1.82.0.0'
4343
```
4444
If you want to use particular boost libraries, specify them as in the following example for log and program_options libraries:
4545
```
46-
pod 'boost-iosx/log', '~> 1.81.0'
47-
pod 'boost-iosx/program_options', '~> 1.81.0'
46+
pod 'boost-iosx/log', '~> 1.82.0'
47+
pod 'boost-iosx/program_options', '~> 1.82.0'
4848
# note: Some libraries have dependencies on other Boost libraries. In that case, you should explicitly add all their dependencies to your Podfile.
4949
```
5050
Then install new dependencies:

‎boost-iosx.podspec

+1-1
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.81.0.3"
3+
s.version = "1.82.0.0"
44
s.summary = "Boost C++ libraries"
55
s.homepage = "https://github.com/apotocki/boost-iosx"
66
s.license = "Boost Software License"

‎scripts/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ platform :osx, '12.0'
33

44
target 'ICUdep' do
55
use_frameworks!
6-
pod 'icu4c-iosx'
6+
pod 'icu4c-iosx', :git => 'https://github.com/apotocki/icu4c-iosx', :submodules => 'true'
77
end

‎scripts/build.sh

+28-15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33
################## SETUP BEGIN
44
THREAD_COUNT=$(sysctl hw.ncpu | awk '{print $2}')
55
XCODE_ROOT=$( xcode-select -print-path )
6-
BOOST_VER=1.81.0
6+
BOOST_VER=1.82.0
77
################## SETUP END
88
DEVSYSROOT=$XCODE_ROOT/Platforms/iPhoneOS.platform/Developer
99
SIMSYSROOT=$XCODE_ROOT/Platforms/iPhoneSimulator.platform/Developer
@@ -34,6 +34,7 @@ if [[ ! -f boost/b2 ]]; then
3434
fi
3535

3636
############### ICU
37+
if true; then
3738
#export ICU4C_RELEASE_LINK=https://github.com/apotocki/icu4c-iosx/releases/download/72.1.1
3839
if [[ ! -d $SCRIPT_DIR/Pods/icu4c-iosx/product ]]; then
3940
if [[ ! -z "${ICU4C_RELEASE_LINK}" ]]; then
@@ -62,12 +63,13 @@ if [[ ! -d $SCRIPT_DIR/Pods/icu4c-iosx/product ]]; then
6263
pushd $SCRIPT_DIR
6364
pod repo update
6465
pod install --verbose
65-
pod update --verbose
66+
#pod update --verbose
6667
popd
6768
fi
6869
mkdir $SCRIPT_DIR/Pods/icu4c-iosx/product/lib
6970
fi
7071
ICU_PATH=$SCRIPT_DIR/Pods/icu4c-iosx/product
72+
fi
7173
############### ICU
7274

7375
pushd boost
@@ -97,8 +99,11 @@ patch tools/build/src/tools/features/instruction-set-feature.jam $SCRIPT_DIR/ins
9799

98100
LIBS_TO_BUILD="--with-atomic --with-chrono --with-container --with-context --with-contract --with-coroutine --with-date_time --with-exception --with-fiber --with-filesystem --with-graph --with-iostreams --with-json --with-locale --with-log --with-math --with-nowide --with-program_options --with-random --with-regex --with-serialization --with-stacktrace --with-system --with-test --with-thread --with-timer --with-type_erasure --with-wave --with-url"
99101

100-
B2_BUILD_OPTIONS="-j$THREAD_COUNT -sICU_PATH=\"$ICU_PATH\" address-model=64 release link=static runtime-link=shared define=BOOST_SPIRIT_THREADSAFE cxxflags=\"-std=c++20\""
102+
B2_BUILD_OPTIONS="-j$THREAD_COUNT address-model=64 release link=static runtime-link=shared define=BOOST_SPIRIT_THREADSAFE cxxflags=\"-std=c++20\""
101103

104+
if [[ ! -z "${ICU_PATH}" ]]; then
105+
B2_BUILD_OPTIONS="$B2_BUILD_OPTIONS -sICU_PATH=\"$ICU_PATH\""
106+
fi
102107

103108
if true; then
104109
if [[ -d bin.v2 ]]; then
@@ -142,9 +147,11 @@ using darwin : : clang++ -arch $1 -isysroot $MACSYSROOT/SDKs/MacOSX.sdk
142147
: <architecture>$(boost_arc $1)
143148
;
144149
EOF
145-
cp $ICU_PATH/frameworks/icudata.xcframework/macos-*/libicudata.a $ICU_PATH/lib/
146-
cp $ICU_PATH/frameworks/icui18n.xcframework/macos-*/libicui18n.a $ICU_PATH/lib/
147-
cp $ICU_PATH/frameworks/icuuc.xcframework/macos-*/libicuuc.a $ICU_PATH/lib/
150+
if [[ ! -z "${ICU_PATH}" ]]; then
151+
cp $ICU_PATH/frameworks/icudata.xcframework/macos-*/libicudata.a $ICU_PATH/lib/
152+
cp $ICU_PATH/frameworks/icui18n.xcframework/macos-*/libicui18n.a $ICU_PATH/lib/
153+
cp $ICU_PATH/frameworks/icuuc.xcframework/macos-*/libicuuc.a $ICU_PATH/lib/
154+
fi
148155
./b2 -j8 --stagedir=stage/macosx-$1 toolset=darwin architecture=$(boost_arc $1) abi=$(boost_abi $1) $B2_BUILD_OPTIONS $LIBS_TO_BUILD
149156
rm -rf bin.v2
150157
}
@@ -160,9 +167,11 @@ using darwin : catalyst : clang++ -arch $1 --target=$2 -isysroot $MACSYSROOT/SDK
160167
: <architecture>$(boost_arc $1)
161168
;
162169
EOF
163-
cp $ICU_PATH/frameworks/icudata.xcframework/ios-*-maccatalyst/libicudata.a $ICU_PATH/lib/
164-
cp $ICU_PATH/frameworks/icui18n.xcframework/ios-*-maccatalyst/libicui18n.a $ICU_PATH/lib/
165-
cp $ICU_PATH/frameworks/icuuc.xcframework/ios-*-maccatalyst/libicuuc.a $ICU_PATH/lib/
170+
if [[ ! -z "${ICU_PATH}" ]]; then
171+
cp $ICU_PATH/frameworks/icudata.xcframework/ios-*-maccatalyst/libicudata.a $ICU_PATH/lib/
172+
cp $ICU_PATH/frameworks/icui18n.xcframework/ios-*-maccatalyst/libicui18n.a $ICU_PATH/lib/
173+
cp $ICU_PATH/frameworks/icuuc.xcframework/ios-*-maccatalyst/libicuuc.a $ICU_PATH/lib/
174+
fi
166175
./b2 --stagedir=stage/catalyst-$1 toolset=darwin-catalyst architecture=$(boost_arc $1) abi=$(boost_abi $1) $B2_BUILD_OPTIONS $LIBS_TO_BUILD
167176
rm -rf bin.v2
168177
}
@@ -178,9 +187,11 @@ using darwin : ios : clang++ -arch arm64 -fembed-bitcode -isysroot $DEVSYSROOT/S
178187
: <architecture>arm <target-os>iphone
179188
;
180189
EOF
181-
cp $ICU_PATH/frameworks/icudata.xcframework/ios-arm64/libicudata.a $ICU_PATH/lib/
182-
cp $ICU_PATH/frameworks/icui18n.xcframework/ios-arm64/libicui18n.a $ICU_PATH/lib/
183-
cp $ICU_PATH/frameworks/icuuc.xcframework/ios-arm64/libicuuc.a $ICU_PATH/lib/
190+
if [[ ! -z "${ICU_PATH}" ]]; then
191+
cp $ICU_PATH/frameworks/icudata.xcframework/ios-arm64/libicudata.a $ICU_PATH/lib/
192+
cp $ICU_PATH/frameworks/icui18n.xcframework/ios-arm64/libicui18n.a $ICU_PATH/lib/
193+
cp $ICU_PATH/frameworks/icuuc.xcframework/ios-arm64/libicuuc.a $ICU_PATH/lib/
194+
fi
184195
./b2 --stagedir=stage/ios toolset=darwin-ios instruction-set=arm64 architecture=arm binary-format=mach-o abi=aapcs target-os=iphone define=_LITTLE_ENDIAN define=BOOST_TEST_NO_MAIN $B2_BUILD_OPTIONS $LIBS_TO_BUILD
185196
rm -rf bin.v2
186197
}
@@ -197,9 +208,11 @@ using darwin : iossim : clang++ -arch $1 -fembed-bitcode-marker -isysroot $SIMSY
197208
: <architecture>$(boost_arc $1) <target-os>iphone
198209
;
199210
EOF
200-
cp $ICU_PATH/frameworks/icudata.xcframework/ios-*-simulator/libicudata.a $ICU_PATH/lib/
201-
cp $ICU_PATH/frameworks/icui18n.xcframework/ios-*-simulator/libicui18n.a $ICU_PATH/lib/
202-
cp $ICU_PATH/frameworks/icuuc.xcframework/ios-*-simulator/libicuuc.a $ICU_PATH/lib/
211+
if [[ ! -z "${ICU_PATH}" ]]; then
212+
cp $ICU_PATH/frameworks/icudata.xcframework/ios-*-simulator/libicudata.a $ICU_PATH/lib/
213+
cp $ICU_PATH/frameworks/icui18n.xcframework/ios-*-simulator/libicui18n.a $ICU_PATH/lib/
214+
cp $ICU_PATH/frameworks/icuuc.xcframework/ios-*-simulator/libicuuc.a $ICU_PATH/lib/
215+
fi
203216
./b2 --stagedir=stage/iossim-$1 toolset=darwin-iossim architecture=$(boost_arc $1) abi=$(boost_abi $1) target-os=iphone define=BOOST_TEST_NO_MAIN $B2_BUILD_OPTIONS $LIBS_TO_BUILD
204217
rm -rf bin.v2
205218
}

0 commit comments

Comments
 (0)