Browse code

more debug output, fix failing xcodebuild

Nat! authored on 10-07-2017 19:34:17
Showing 4 changed files
... ...
@@ -1,3 +1,9 @@
1
+### 3.8.5
2
+
3
+* fix broken xcode build path
4
+* allow some plural synonmys for setting, config, expansion command
5
+
6
+
1 7
 ### 3.8.4
2 8
 
3 9
 * fix `Abort now (y/N) > y` not really aborting
... ...
@@ -31,7 +31,7 @@
31 31
 #
32 32
 MULLE_EXECUTABLE_VERSION_MAJOR=3
33 33
 MULLE_EXECUTABLE_VERSION_MINOR=8
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
 
... ...
@@ -483,7 +483,7 @@ bootstrap_main()
483 483
          clean_main "$@" || exit 1
484 484
       ;;
485 485
 
486
-      config)
486
+      config|configs|configurations)
487 487
          . mulle-bootstrap-settings.sh
488 488
 
489 489
          config_main "$@" || exit 1
... ...
@@ -507,13 +507,13 @@ bootstrap_main()
507 507
          emancipate_main "$@" || exit 1
508 508
       ;;
509 509
 
510
-      expansion)
510
+      expansion|expansions)
511 511
          . mulle-bootstrap-settings.sh
512 512
 
513 513
          expansion_main "$@" || exit 1
514 514
       ;;
515 515
 
516
-      paths)
516
+      path|paths)
517 517
          . mulle-bootstrap-paths.sh
518 518
 
519 519
          paths_main "$@" || exit 1
... ...
@@ -552,7 +552,7 @@ bootstrap_main()
552 552
          run_main "$@" || exit 1
553 553
       ;;
554 554
 
555
-      setting)
555
+      setting|settings)
556 556
          . mulle-bootstrap-settings.sh
557 557
 
558 558
          setting_main "$@" || exit 1
... ...
@@ -882,6 +882,8 @@ build_cmake_flags()
882 882
 #
883 883
 build_cmake()
884 884
 {
885
+   log_debug "build_cmake" "$*"
886
+
885 887
    local configuration="$1"
886 888
    local srcdir="$2"
887 889
    local builddir="$3"
... ...
@@ -1142,6 +1144,8 @@ ${C_MAGENTA}${C_BOLD}${sdk}${C_INFO} in \"${builddir}\" ..."
1142 1144
 #
1143 1145
 build_configure()
1144 1146
 {
1147
+   log_debug "build_configure" "$*"
1148
+
1145 1149
    local configuration
1146 1150
    local srcdir
1147 1151
    local builddir
... ...
@@ -1444,6 +1448,8 @@ fixup_header_path()
1444 1448
 
1445 1449
 build_xcodebuild()
1446 1450
 {
1451
+   log_debug "build_xcodebuild" "$*"
1452
+
1447 1453
    local configuration
1448 1454
    local srcdir
1449 1455
    local builddir
... ...
@@ -1789,6 +1795,8 @@ FRAMEWORK_SEARCH_PATHS='${dependencies_framework_search_path}'"
1789 1795
 
1790 1796
 build_xcodebuild_schemes_or_target()
1791 1797
 {
1798
+   log_debug "build_xcodebuild_schemes_or_target" "$*"
1799
+
1792 1800
    local builddir
1793 1801
    local name
1794 1802
    local project
... ...
@@ -1827,7 +1835,7 @@ build_xcodebuild_schemes_or_target()
1827 1835
    done
1828 1836
    IFS="${DEFAULT_IFS}"
1829 1837
 
1830
-   if [ "${targets}" = "" -a "${schemes}" = "" ]
1838
+   if [ -z "${targets}" -a -z "${schemes}" ]
1831 1839
    then
1832 1840
       log_fluff "Building project \"${project}\" ..."
1833 1841
       build_xcodebuild "$@"
... ...
@@ -1845,6 +1853,8 @@ run_log_build_script()
1845 1853
 
1846 1854
 build_script()
1847 1855
 {
1856
+   log_debug "build_script" "$*"
1857
+
1848 1858
    local script
1849 1859
 
1850 1860
    script="$1"
... ...
@@ -1931,6 +1941,8 @@ ${C_MAGENTA}${C_BOLD}${sdk}${C_INFO}${info} in \
1931 1941
 
1932 1942
 build_with_configuration_sdk_preferences()
1933 1943
 {
1944
+   log_debug "build_with_configuration_sdk_preferences" "$*"
1945
+
1934 1946
    local name
1935 1947
    local configuration
1936 1948
    local sdk
... ...
@@ -1983,6 +1995,8 @@ build_with_configuration_sdk_preferences()
1983 1995
          ;;
1984 1996
 
1985 1997
          xcodebuild)
1998
+            tools_environment_xcodebuild "${name}" "${srcdir}"
1999
+
1986 2000
             if [ ! -z "${XCODEBUILD}" ]
1987 2001
             then
1988 2002
                project="`(cd "${srcdir}" ; find_xcodeproj "${name}")`"
... ...
@@ -1991,7 +2005,6 @@ build_with_configuration_sdk_preferences()
1991 2005
                then
1992 2006
                   log_fluff "There is no Xcode project in \"${srcdir}\""
1993 2007
                else
1994
-                  tools_environment_xcodebuild "${name}" "${srcdir}"
1995 2008
                   if [ -z "${XCODEBUILD}" ]
1996 2009
                   then
1997 2010
                      log_warning "Found a Xcode project, but ${C_RESET}${C_BOLD}xcodebuild${C_WARNING} is not installed"
... ...
@@ -2000,6 +2013,8 @@ build_with_configuration_sdk_preferences()
2000 2013
                      return 0
2001 2014
                   fi
2002 2015
                fi
2016
+            else
2017
+               log_fluff "No xcodebuild found, that's unusual"
2003 2018
             fi
2004 2019
          ;;
2005 2020
 
... ...
@@ -2042,8 +2057,12 @@ build_with_configuration_sdk_preferences()
2042 2057
             fi
2043 2058
          ;;
2044 2059
 
2060
+         "")
2061
+            # ignore empty
2062
+         ;;
2063
+
2045 2064
          *)
2046
-            fail "Unknown build preference \"$1\""
2065
+            fail "Unknown build preference \"${preference}\""
2047 2066
          ;;
2048 2067
       esac
2049 2068
    done
... ...
@@ -2054,6 +2073,8 @@ build_with_configuration_sdk_preferences()
2054 2073
 
2055 2074
 build()
2056 2075
 {
2076
+   log_debug "build" "$*"
2077
+
2057 2078
    local name
2058 2079
    local srcdir
2059 2080
 
... ...
@@ -2093,6 +2114,8 @@ configure"`"
2093 2114
       esac
2094 2115
    fi
2095 2116
 
2117
+   log_fluff "Build preferences for ${UNAME} are: `echo ${preferences}`"
2118
+
2096 2119
    local configurations
2097 2120
    local configuration
2098 2121
    local sdks
... ...
@@ -2135,6 +2158,8 @@ configure"`"
2135 2158
 #
2136 2159
 build_wrapper()
2137 2160
 {
2161
+   log_debug "build_wrapper" "$*"
2162
+
2138 2163
    local srcdir
2139 2164
    local name
2140 2165
 
... ...
@@ -2192,6 +2217,8 @@ build_wrapper()
2192 2217
 
2193 2218
 force_rebuild()
2194 2219
 {
2220
+   log_debug "force_rebuild" "$*"
2221
+
2195 2222
    local from="$1"
2196 2223
    local to="$2"
2197 2224
 
... ...
@@ -2224,6 +2251,8 @@ force_rebuild()
2224 2251
 
2225 2252
 build_if_alive()
2226 2253
 {
2254
+   log_debug "build_if_alive" "$*"
2255
+
2227 2256
    local name
2228 2257
    local stashdir
2229 2258
 
... ...
@@ -2257,6 +2286,8 @@ ${BUILT}"
2257 2286
 
2258 2287
 build_stashes()
2259 2288
 {
2289
+   log_debug "build_stashes" "$*"
2290
+
2260 2291
    local name
2261 2292
 
2262 2293
    IFS="
... ...
@@ -2362,6 +2393,8 @@ have_tars()
2362 2393
 
2363 2394
 install_tars()
2364 2395
 {
2396
+   log_debug "install_tars" "$*"
2397
+
2365 2398
    local tarballs
2366 2399
    local tar
2367 2400
 
... ...
@@ -485,7 +485,7 @@ list_build_directories()
485 485
    log_info "$PWD"
486 486
    IFS="
487 487
 "
488
-   for filename in `ls -1 "${directory}"` 
488
+   for filename in `ls -1 "${directory}"`
489 489
    do
490 490
       path="${directory}/${filename}"
491 491
       if [ -d "${path}" ]