Skip to content

Commit cfe5409

Browse files
committed
Updated changelog
Reordered --debug flag placement in help & param parser Added build variant sub-directory to target output directory (closes #35)
1 parent 84e9ad2 commit cfe5409

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

boost.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ OPTIONS:
9393
-h | --help
9494
Display these options and exit.
9595
96-
-debug
97-
Build a debug variant.
98-
9996
-ios
10097
Build for the iOS platform.
10198
@@ -213,6 +210,9 @@ OPTIONS:
213210
directly in the 'Headers' directory.
214211
Added for compatibility with projects that expect this structure.
215212
213+
--debug
214+
Build a debug variant.
215+
216216
--clean
217217
Just clean up build artifacts, but don't actually build anything.
218218
(all other parameters are ignored)
@@ -268,10 +268,6 @@ parseArgs()
268268
exit
269269
;;
270270

271-
-debug)
272-
BUILD_VARIANT=debug
273-
;;
274-
275271
-ios)
276272
BUILD_IOS=1
277273
;;
@@ -378,6 +374,10 @@ parseArgs()
378374
UNIVERSAL=1
379375
;;
380376

377+
--debug)
378+
BUILD_VARIANT=debug
379+
;;
380+
381381
--clean)
382382
CLEAN=1
383383
;;
@@ -1066,9 +1066,9 @@ BOOST_VERSION2="${BOOST_VERSION//./_}"
10661066
BOOST_TARBALL="$CURRENT_DIR/boost_$BOOST_VERSION2.tar.bz2"
10671067
BOOST_SRC="$SRCDIR/boost_${BOOST_VERSION2}"
10681068
OUTPUT_DIR="$CURRENT_DIR/build/boost/$BOOST_VERSION"
1069-
IOS_OUTPUT_DIR="$OUTPUT_DIR/ios"
1070-
TVOS_OUTPUT_DIR="$OUTPUT_DIR/tvos"
1071-
MACOS_OUTPUT_DIR="$OUTPUT_DIR/macos"
1069+
IOS_OUTPUT_DIR="$OUTPUT_DIR/ios/$BUILD_VARIANT"
1070+
TVOS_OUTPUT_DIR="$OUTPUT_DIR/tvos/$BUILD_VARIANT"
1071+
MACOS_OUTPUT_DIR="$OUTPUT_DIR/macos/$BUILD_VARIANT"
10721072
IOS_BUILD_DIR="$IOS_OUTPUT_DIR/build"
10731073
TVOS_BUILD_DIR="$TVOS_OUTPUT_DIR/build"
10741074
MACOS_BUILD_DIR="$MACOS_OUTPUT_DIR/build"

changelog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
-- 2018-12-19 --
2+
* Added ability to compile debug variant (pr#35)
3+
14
-- 2018-09-20 --
25
* Added support for building 32/64-bit macOS universal
36
* Fixed macOS target problem that caused user-config.jam to be ignored

0 commit comments

Comments
 (0)