Browse code

Commit stuff for 0.12

Nat! authored on 01-12-2015 17:56:59
Showing 7 changed files
... ...
@@ -1,3 +1,16 @@
1
+0.12
2
+===
3
+   Run post-install.sh also on embedded repositories. Sometimes useful, when
4
+   you need ./configure to produce some headers.
5
+   Add parameters to "Executing script" line.
6
+   Add "checkout" git flags, to fine tune the clone. But use --recursive
7
+   per default.
8
+
9
+0.11
10
+===
11
+   Fixes another stale headers problem. Project is creeping towards a 1.0.
12
+
13
+
1 14
 0.10
2 15
 ===
3 16
    Fetch settings can be platform specific by using the `uname` as a file
... ...
@@ -29,7 +29,7 @@
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 
32
-VERSION=0.10.1
32
+VERSION=0.12
33 33
 
34 34
 #
35 35
 # This is the main user interface to mulle-bootstrap
... ...
@@ -84,13 +84,10 @@ dispense_headers()
84 84
          dst="${REFERENCE_DEPENDENCY_SUBDIR}${headers}"
85 85
          mkdir_if_missing "${dst}"
86 86
 
87
+         # this fails with more nested header set ups, need to fix!
88
+
87 89
          log_fluff "Copying \"${src}\" to \"${dst}\""
88
-         exekutor find "${src}" -xdev -mindepth 1 -maxdepth 1 -type d -print0 | \
89
-            exekutor xargs -0 -I % mv ${COPYMOVEFLAGS} -n % "${dst}"
90
-         [ $? -eq 0 ]  || exit 1
91
-         exekutor find "${src}" -xdev -mindepth 1 -maxdepth 1 \( -type f -o -type l \) -print0 | \
92
-            exekutor xargs -0 -I % mv ${COPYMOVEFLAGS} -f % "${dst}"
93
-         [ $? -eq 0 ]  || exit 1
90
+         exekutor cp -Ra ${COPYMOVEFLAGS} "${src}"/* "${dst}" || exit 1
94 91
 
95 92
          rmdir_safer "${src}"
96 93
       else
... ...
@@ -689,7 +689,10 @@ Use it ?"
689 689
          ;;
690 690
       esac
691 691
 
692
-      "${operation}" "${src}" "${dstdir}" "${tag}"
692
+      local scmflags
693
+
694
+      scmflags="`read_repo_setting "${name}" "checkout" "--recursive"`"
695
+      "${operation}" "${src}" "${dstdir}" "${tag}" "${scmflags}"
693 696
       mulle-bootstrap-warn-scripts.sh "${dstdir}/.bootstrap" "${dstdir}" || fail "Ok, aborted"  #sic
694 697
    fi
695 698
 }
... ...
@@ -893,6 +896,9 @@ install_embedded_repositories()
893 896
                   append_dir_to_gitignore_if_needed "${dstdir}"
894 897
                fi
895 898
             fi
899
+
900
+            run_build_settings_script "${name}" "${url}" "${dstdir}" "post-${COMMAND}" "$@"
901
+
896 902
          else
897 903
             log_fluff "\"${dstdir}\" already exists"
898 904
          fi
... ...
@@ -568,7 +568,7 @@ run_script()
568 568
 
569 569
    if [ -x "${script}" ]
570 570
    then
571
-      log_info "Executing script \"${script}\""
571
+      log_info "Executing script \"${script}\" $1"
572 572
       exekutor "${script}" "$@" || fail "script \"${script}\" did not run successfully"
573 573
    else
574 574
       if [ ! -e "${script}" ]
... ...
@@ -58,16 +58,18 @@ git_clone()
58 58
    local src
59 59
    local dst
60 60
    local tag
61
+   local flags
61 62
 
62 63
    src="$1"
63 64
    dst="$2"
64 65
    tag="$3"
66
+   flags="$4"
65 67
 
66 68
    [ ! -z "$src" ] || internal_fail "src is empty"
67 69
    [ ! -z "$dst" ] || internal_fail "dst is empty"
68 70
 
69 71
    log_info "Cloning ${C_MAGENTA}${src}${C_INFO} ..."
70
-   exekutor git clone ${GITFLAGS} "${src}" "${dst}" || fail "git clone of \"${src}\" into \"${dst}\" failed"
72
+   exekutor git clone ${flags} ${GITFLAGS} "${src}" "${dst}" || fail "git clone of \"${src}\" into \"${dst}\" failed"
71 73
 
72 74
    if [ "${tag}" != "" ]
73 75
    then
... ...
@@ -200,7 +200,7 @@ run_build_settings_script()
200 200
    script="`find_build_setting_file "${name}" "bin/${scriptname}.sh"`"
201 201
    if [ ! -z "${script}" ]
202 202
    then
203
-      run_script "${script}" "$@" || exit 1
203
+      run_script "${script}" "${name}" "${url}" "${srcdir}" "$@" || exit 1
204 204
    fi
205 205
 }
206 206