Browse code

--debug, --release flags added

Nat! authored on 04-01-2017 11:40:53
Showing 4 changed files
... ...
@@ -1,3 +1,10 @@
1
+2.5.1
2
+===
3
+
4
+* Allow --debug and --release as shortcuts for -c Debug and -c Release, because
5
+I am lazy and I expect it.
6
+
7
+
1 8
 2.5.0
2 9
 ===
3 10
 
... ...
@@ -30,7 +30,7 @@
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 MULLE_BOOTSTRAP_VERSION_MAJOR=2
32 32
 MULLE_BOOTSTRAP_VERSION_MINOR=5
33
-MULLE_BOOTSTRAP_VERSION_PATCH=0
33
+MULLE_BOOTSTRAP_VERSION_PATCH=1
34 34
 
35 35
 MULLE_BOOTSTRAP_VERSION="${MULLE_BOOTSTRAP_VERSION_MAJOR}.${MULLE_BOOTSTRAP_VERSION_MINOR}.${MULLE_BOOTSTRAP_VERSION_PATCH}"
36 36
 MULLE_BOOTSTRAP_FAIL_PREFIX="mulle-bootstrap"
... ...
@@ -2169,8 +2169,9 @@ build_clones()
2169 2169
             then
2170 2170
                build_if_alive "${name}" "${srcdir}" || exit  1
2171 2171
             else
2172
-               if [ "${check_usr_local_include}" = "YES" ] && has_usr_local_include "${name}"
2172
+               if [ "${CHECK_USR_LOCAL_INCLUDE}" = "YES" ] && has_usr_local_include "${name}"
2173 2173
                then
2174
+                  log_info "${C_MAGENTA}${C_BOLD}${name}${C_INFO} is a system library, so not building it"
2174 2175
                   :
2175 2176
                else
2176 2177
                   fail "build failed for repository \"${name}\": not found in (\"${srcdir}\") ($PWD)"
... ...
@@ -2187,8 +2188,9 @@ build_clones()
2187 2188
          then
2188 2189
             build_if_alive "${name}" "${srcdir}"|| exit 1
2189 2190
          else
2190
-            if [ "${check_usr_local_include}" = "YES" ] && has_usr_local_include "${name}"
2191
+            if [ "${CHECK_USR_LOCAL_INCLUDE}" = "YES" ] && has_usr_local_include "${name}"
2191 2192
             then
2193
+               log_info "${C_MAGENTA}${C_BOLD}${name}${C_INFO} is a system library, so not building it"
2192 2194
                :
2193 2195
             else
2194 2196
                fail "Unknown repo ${name}"
... ...
@@ -2285,7 +2287,15 @@ build_main()
2285 2287
             [ $# -ne 0 ] || fail "core count missing"
2286 2288
 
2287 2289
             CORES="$1"
2288
-            ;;
2290
+         ;;
2291
+
2292
+         --debug)
2293
+            CONFIGURATIONS="Debug"
2294
+         ;;
2295
+
2296
+         --release)
2297
+            CONFIGURATIONS="Release"
2298
+         ;;
2289 2299
 
2290 2300
          -c|--configuration)
2291 2301
             shift
... ...
@@ -2339,7 +2349,7 @@ build_main()
2339 2349
    [ -z "${MULLE_BOOTSTRAP_REPOSITORIES_SH}" ] && . mulle-bootstrap-repositories.sh
2340 2350
    [ -z "${MULLE_BOOTSTRAP_SCRIPTS_SH}" ] && . mulle-bootstrap-scripts.sh
2341 2351
 
2342
-   check_usr_local_include="`read_config_setting "check_usr_local_include" "NO"`"
2352
+   CHECK_USR_LOCAL_INCLUDE="`read_config_setting "check_usr_local_include" "NO"`"
2343 2353
 
2344 2354
    remove_file_if_present "${CLONESFETCH_SUBDIR}/.build_done"
2345 2355
 
... ...
@@ -1441,7 +1441,7 @@ _common_main()
1441 1441
          ;;
1442 1442
 
1443 1443
          # build options with no parameters
1444
-         -K|--clean|-k|--no-clean|--use-prefix-libraries)
1444
+         -K|--clean|-k|--no-clean|--use-prefix-libraries|--debug|--release)
1445 1445
             if [ -z "${MULLE_BOOTSTRAP_WILL_BUILD}" ]
1446 1446
             then
1447 1447
                log_error "${MULLE_BOOTSTRAP_FAIL_PREFIX}: Unknown fetch option $1"