Browse code

* recognize .MAKE analog to .CC, if so desired

Nat! authored on 19-09-2017 16:06:04
Showing 4 changed files
... ...
@@ -31,7 +31,7 @@
31 31
 #
32 32
 MULLE_EXECUTABLE_VERSION_MAJOR=3
33 33
 MULLE_EXECUTABLE_VERSION_MINOR=12
34
-MULLE_EXECUTABLE_VERSION_PATCH=2
34
+MULLE_EXECUTABLE_VERSION_PATCH=3
35 35
 
36 36
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
37 37
 
... ...
@@ -3,9 +3,12 @@
3 3
 	[
4 4
 		{
5 5
 			"path": ".",
6
-         "file_exclude_patterns": [ "*~", "*~.*", "*.chk", ".DS_Store", "*.sublime-workspace" ],
6
+         "file_exclude_patterns": [ "*~", "*~.*", "*.chk", ".DS_Store", "*.sublime-workspace", "tmp.*" ],
7 7
 	 "folder_exclude_patterns": [
8 8
 		"package",
9
+		"build",
10
+		".repos",
11
+		"mulle-bootstrap_3.12.2",
9 12
 		".bootstrap*",
10 13
 		".git*",
11 14
 	 ],
... ...
@@ -614,36 +614,36 @@ bootstrap_auto_final()
614 614
    local clones
615 615
 
616 616
    clones="`read_root_setting "repositories"`"
617
-   if [ -z "${clones}" ]
618
-   then
619
-      log_fluff "There is apparently nothing to build."
620
-      return
621
-   fi
622
-
623 617
    order=""
624
-   missing="`read_setting "${REPOS_DIR}/.missing"`"
625 618
 
626
-   IFS="
619
+   if [ ! -z "${clones}" ]
620
+   then
621
+      missing="`read_setting "${REPOS_DIR}/.missing"`"
622
+
623
+     IFS="
627 624
 "
628
-   for clone in ${clones}
629
-   do
630
-      IFS="${DEFAULT_IFS}"
625
+      for clone in ${clones}
626
+      do
627
+         IFS="${DEFAULT_IFS}"
631 628
 
632
-      parse_clone "${clone}"
629
+         parse_clone "${clone}"
633 630
 
634
-      #
635
-      # don't build optional missing stuff
636
-      #
637
-      if ! echo "${missing}" | fgrep -s -x -q "${name}"
638
-      then
639
-         order="`add_line "${order}" "${name}"`"
640
-      fi
641
-   done
631
+         #
632
+         # don't build optional missing stuff
633
+         #
634
+         if ! echo "${missing}" | fgrep -s -x -q "${name}"
635
+         then
636
+            order="`add_line "${order}" "${name}"`"
637
+         fi
638
+      done
642 639
 
643
-   # get rid of temporary file now
644
-   remove_file_if_present "${REPOS_DIR}/.missing"
640
+      # get rid of temporary file now
641
+      remove_file_if_present "${REPOS_DIR}/.missing"
645 642
 
646
-   IFS="${DEFAULT_IFS}"
643
+      IFS="${DEFAULT_IFS}"
644
+   else
645
+      log_fluff "There is apparently nothing to build."
646
+   fi
647 647
 
648 648
    redirect_exekutor "${BOOTSTRAP_DIR}.auto/build_order" echo "${order}"
649 649
 
... ...
@@ -112,8 +112,32 @@ find_make()
112 112
    local defaultname="${2:-make}"
113 113
 
114 114
    local toolname
115
+   local filename
116
+
117
+   toolname="`read_build_setting "${name}" "make"`"
118
+   if [ -z "${toolname}" -a "${OPTION_USE_CC_CXX}" = "YES" ]
119
+   then
120
+      filename="${srcdir}/.MAKE.${UNAME}"
121
+      toolname="`cat "${filename}" 2>/dev/null`"
122
+
123
+      if [ -z "${toolname}" ]
124
+      then
125
+         filename="${srcdir}/.MAKE"
126
+         toolname="`cat "${filename}" 2>/dev/null`"
127
+
128
+         if [ ! -z "${toolname}" ]
129
+         then
130
+            log_verbose "${C_RESET_BOLD}MAKE${C_VERBOSE} set to \
131
+${C_MAGENTA}${C_BOLD}${toolname}${C_VERBOSE} found in \"${filename}\""
132
+         fi
133
+      fi
134
+   fi
135
+
136
+   if [ -z "${toolname}" ]
137
+   then
138
+      toolname="${defaultname}"
139
+   fi
115 140
 
116
-   toolname=`read_build_setting "${name}" "make" "${defaultname}"`
117 141
    verify_binary "${toolname}" "make" "${defaultname}"
118 142
 }
119 143
 
... ...
@@ -142,11 +166,19 @@ find_compiler()
142 166
    compiler="`read_build_setting "${name}" "${compiler_name}"`"
143 167
    if [ -z "${compiler}" -a "${OPTION_USE_CC_CXX}" = "YES" ]
144 168
    then
145
-      filename="${srcdir}/.${compiler_name}"
169
+      filename="${srcdir}/.${compiler_name}.${UNAME}"
146 170
       compiler="`cat "${filename}" 2>/dev/null`"
147
-      if [  ! -z "${compiler}" ]
171
+
172
+      if [ -z "${compiler}" ]
148 173
       then
149
-         log_verbose "Compiler ${C_RESET_BOLD}${compiler_name}${C_VERBOSE} set to ${C_MAGENTA}${C_BOLD}${compiler}${C_VERBOSE} found in \"${filename}\""
174
+         filename="${srcdir}/.${compiler_name}"
175
+         compiler="`cat "${filename}" 2>/dev/null`"
176
+
177
+         if [ ! -z "${compiler}" ]
178
+         then
179
+            log_verbose "Compiler ${C_RESET_BOLD}${compiler_name}${C_VERBOSE} \
180
+set to ${C_MAGENTA}${C_BOLD}${compiler}${C_VERBOSE} found in \"${filename}\""
181
+         fi
150 182
       fi
151 183
    fi
152 184
 
... ...
@@ -2660,7 +2692,6 @@ build_main()
2660 2692
    #
2661 2693
    if [ ! -f "${REPOS_DIR}/.build_done" ]
2662 2694
    then
2663
-      remove_file_if_present "${REPOS_DIR}/.build_done.orig"
2664 2695
       _create_file_if_missing "${REPOS_DIR}/.build_done"
2665 2696
 
2666 2697
       log_fluff "Cleaning dependencies directory as \"${DEPENDENCIES_DIR}\""
... ...
@@ -2694,9 +2725,6 @@ build_main()
2694 2725
       write_protect_directory "${DEPENDENCIES_DIR}"
2695 2726
    else
2696 2727
       log_fluff "No dependencies have been generated"
2697
-
2698
-      remove_file_if_present "${REPOS_DIR}/.build_done.orig"
2699
-      remove_file_if_present "${REPOS_DIR}/.build_done"
2700 2728
    fi
2701 2729
 
2702 2730
    log_debug "::: build end :::"