Browse code

Nicer output if `ack` is not installed. CLEAN_BEFORE_BUILD is no longer a default Remove erroneous /usr/local from CMAKE_INSTALL_PREFIX

Nat! authored on 05-07-2016 14:47:38
Showing 4 changed files
... ...
@@ -20,6 +20,8 @@ eliminated.
20 20
 * cmake and configure always add `/usr/local/include` and link with `/usr/local/lib`
21 21
 (mostly due to brew installing dependencies there).
22 22
 * redid the verbosity logging with -v, -vv , -vvv, -t
23
+* clean before build is no longer the default
24
+
23 25
 
24 26
 0.26
25 27
 ===
... ...
@@ -35,7 +35,7 @@
35 35
 
36 36
 
37 37
 
38
-CLEAN_BEFORE_BUILD=`read_config_setting "clean_before_build" "YES"`
38
+CLEAN_BEFORE_BUILD=`read_config_setting "clean_before_build"`
39 39
 CONFIGURATIONS="`read_build_root_setting "configurations" "Release"`"
40 40
 N_CONFIGURATIONS="`echo "${CONFIGURATIONS}" | wc -l | awk '{ print $1 }'`"
41 41
 
... ...
@@ -633,7 +633,7 @@ ${C_MAGENTA}${C_BOLD}${sdk}${C_INFO} in \"${builddir}\" ..."
633 633
       logging_exekutor cmake "-DCMAKE_BUILD_TYPE=${mapped}" \
634 634
 "${sdkparameter}" \
635 635
 "-DDEPENDENCIES_DIR=${owd}/${REFERENCE_DEPENDENCY_SUBDIR}" \
636
-"-DCMAKE_INSTALL_PREFIX:PATH=${owd}/${BUILD_DEPENDENCY_SUBDIR}/usr/local"  \
636
+"-DCMAKE_INSTALL_PREFIX:PATH=${owd}/${BUILD_DEPENDENCY_SUBDIR}"  \
637 637
 "-DCMAKE_C_FLAGS=\
638 638
 -I${owd}/${REFERENCE_DEPENDENCY_SUBDIR}/${HEADER_DIR_NAME} \
639 639
 -I/usr/local/include \
... ...
@@ -821,7 +821,7 @@ ${librarylines}
821 821
 ${other_ldflags} \
822 822
 -isysroot ${sdkpath}" \
823 823
        logging_exekutor "${owd}/${srcdir}/configure" ${configureflags} \
824
-          --prefix "${owd}/${BUILD_DEPENDENCY_SUBDIR}/usr/local" >> "${logfile1}" \
824
+          --prefix "${owd}/${BUILD_DEPENDENCY_SUBDIR}" >> "${logfile1}" \
825 825
       || build_fail "${logfile1}" "configure"
826 826
 
827 827
       logging_exekutor make install > "${logfile2}" \
... ...
@@ -165,7 +165,7 @@ install_brews()
165 165
             brew_update_if_needed "${brew}"
166 166
             flag=$?
167 167
 
168
-            if [ $? -eq 2 ]
168
+            if [ $flag -eq 2 ]
169 169
             then
170 170
                log_info "No brewing being done."
171 171
                return 1
... ...
@@ -70,7 +70,7 @@ warn_scripts()
70 70
 
71 71
       if dir_has_files "$2"
72 72
       then
73
-         phases="`(find "$2"/* -name "project.pbxproj" -exec grep -q 'PBXShellScriptBuildPhase' '{}'  \; -print)`"
73
+         phases="`(find "$2"/* -name "project.pbxproj" -exec grep -q 'PBXShellScriptBuildPhase' '{}' \; -print)`"
74 74
          if [ ! -z "${phases}" ]
75 75
          then
76 76
             log_warning "This repository contains xcode projects with shellscript phases"
... ...
@@ -78,10 +78,16 @@ warn_scripts()
78 78
             ack=`which ack`
79 79
             if [ -z "${ack}" ]
80 80
             then
81
-               echo "brew install ack ; ack -A1 \"shellPath|shellScript\"" >&2
82
-               echo "$phases" >&2
81
+               log_warning "$phases" >&2
82
+
83
+               log_info "To view them inline install \"ack\""
84
+               case "`uname`" in
85
+                  Darwin|Linux)
86
+                     log_info "   brew install ack" >&2
87
+                     ;;
88
+               esac
83 89
             else
84
-               ack -A1 "shellPath|shellScript" `echo $phases | tr '\n' ' '` >&2
90
+               ack -A1 "shellPath|shellScript" `echo "${phases}" | tr '\n' ' '` >&2
85 91
             fi
86 92
             echo "" >&2
87 93
          fi