Browse code

Fix toolcheck

Nat! authored on 02-04-2017 15:46:00
Showing 3 changed files
... ...
@@ -30,7 +30,7 @@
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 MULLE_EXECUTABLE_VERSION_MAJOR=3
32 32
 MULLE_EXECUTABLE_VERSION_MINOR=2
33
-MULLE_EXECUTABLE_VERSION_PATCH=0
33
+MULLE_EXECUTABLE_VERSION_PATCH=1
34 34
 
35 35
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
36 36
 
... ...
@@ -30,7 +30,7 @@
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 MULLE_EXECUTABLE_VERSION_MAJOR=3
32 32
 MULLE_EXECUTABLE_VERSION_MINOR=2
33
-MULLE_EXECUTABLE_VERSION_PATCH=0
33
+MULLE_EXECUTABLE_VERSION_PATCH=1
34 34
 
35 35
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
36 36
 
... ...
@@ -1862,9 +1862,13 @@ build_with_configuration_sdk_preferences()
1862 1862
                   log_fluff "There is no Xcode project in \"${srcdir}\""
1863 1863
                else
1864 1864
                   tools_environment_xcodebuild "${name}" "${srcdir}"
1865
-
1866
-                  build_xcodebuild_schemes_or_target "${configuration}" "${srcdir}" "${builddir}" "${name}" "${sdk}" "${project}"  || exit 1
1867
-                  return 0
1865
+                  if [ -z "${XCODEBUILD}" ]
1866
+                  then
1867
+                     log_warning "Found a Xcode project, but ${C_RESET}${C_BOLD}xcodebuild${C_WARNING} is not installed"
1868
+                  else
1869
+                     build_xcodebuild_schemes_or_target "${configuration}" "${srcdir}" "${builddir}" "${name}" "${sdk}" "${project}"  || exit 1
1870
+                     return 0
1871
+                  fi
1868 1872
                fi
1869 1873
             fi
1870 1874
          ;;
... ...
@@ -1877,12 +1881,12 @@ build_with_configuration_sdk_preferences()
1877 1881
             fi
1878 1882
             if [ -x "${srcdir}/configure" ]
1879 1883
             then
1884
+               tools_environment_make "${name}" "${srcdir}"
1885
+
1880 1886
                if [ -z "${MAKE}" ]
1881 1887
                then
1882
-                  log_warning "Found a configure, but make is not installed"
1888
+                  log_warning "Found a ./configure, but ${C_RESET}${C_BOLD}make${C_WARNING} is not installed"
1883 1889
                else
1884
-                  tools_environment_make "${name}" "${srcdir}"
1885
-
1886 1890
                   build_configure "${configuration}" "${srcdir}" "${builddir}" "${name}" "${sdk}"  || exit 1
1887 1891
                   return 0
1888 1892
                fi
... ...
@@ -1894,12 +1898,12 @@ build_with_configuration_sdk_preferences()
1894 1898
          cmake)
1895 1899
             if [ -f "${srcdir}/CMakeLists.txt" ]
1896 1900
             then
1901
+               tools_environment_cmake "${name}" "${srcdir}"
1902
+
1897 1903
                if [ -z "${CMAKE}" ]
1898 1904
                then
1899
-                  log_warning "Found a CMakeLists.txt, but cmake is not installed"
1905
+                  log_warning "Found a CMakeLists.txt, but ${C_RESET}${C_BOLD}cmake${C_WARNING} is not installed"
1900 1906
                else
1901
-                  tools_environment_cmake "${name}" "${srcdir}"
1902
-
1903 1907
                   build_cmake "${configuration}" "${srcdir}" "${builddir}" "${name}" "${sdk}"  || exit 1
1904 1908
                   return 0
1905 1909
                fi