Browse code

Allow empty repositories for build and systeminstall so that mulle-build isn't unhappy. Fix common-settings dependencies.

Nat! authored on 02-05-2017 16:43:00
Showing 4 changed files
... ...
@@ -31,7 +31,7 @@
31 31
 #
32 32
 MULLE_EXECUTABLE_VERSION_MAJOR=3
33 33
 MULLE_EXECUTABLE_VERSION_MINOR=5
34
-MULLE_EXECUTABLE_VERSION_PATCH=4
34
+MULLE_EXECUTABLE_VERSION_PATCH=5
35 35
 
36 36
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
37 37
 
... ...
@@ -69,7 +69,7 @@ HIDDEN_COMMANDS="\
69 69
    run           : run command with proper dependencies PATHs
70 70
    setting       : read or edit build settings
71 71
    status        : show status of repositories and brews
72
-   systeminstall : install dependencies as system headers
72
+   systeminstall : install dependencies as system libraries/headers
73 73
    tag           : tag fetched repositories
74 74
    uname         : mulle-bootstraps simplified uname(1)
75 75
    version       : print mulle-bootstrap version"
... ...
@@ -2341,7 +2341,7 @@ build_main()
2341 2341
    if [ ! -f "${BOOTSTRAP_DIR}.auto/build_order" ]
2342 2342
    then
2343 2343
       log_info "No repositories fetched, so nothing to build."
2344
-      return 1
2344
+      return 0  # not an error really, maybe only embedded stuff here
2345 2345
    fi
2346 2346
 
2347 2347
    build_complete_environment
... ...
@@ -38,6 +38,8 @@ build_complete_environment()
38 38
 {
39 39
    log_debug ":build_complete_environment:"
40 40
 
41
+   [ -z "${MULLE_BOOTSTRAP_SETTINGS_SH}" ] && . mulle-bootstrap-settings.sh
42
+
41 43
    if [ -z "${OPTION_CONFIGURATIONS}" ]
42 44
    then
43 45
       OPTION_CONFIGURATIONS="`read_config_setting "configurations" "Release"`"
... ...
@@ -340,7 +340,13 @@ install_main()
340 340
 
341 341
    if [ ! -d "${DEPENDENCIES_DIR}" ]
342 342
    then
343
-     fail "No dependencies have been created yet.
343
+      if [ ! -f "${BOOTSTRAP_DIR}.auto/build_order" ]
344
+      then
345
+         log_info "No repositories fetched, so nothing to build."
346
+         return 0  # not an error really
347
+      fi
348
+
349
+      fail "No dependencies have been created yet.
344 350
 Suggested fix:
345 351
    ${MULLE_EXECUTABLE} build"
346 352
    fi