Browse code

assert failing cat with old repos

Nat! authored on 06-09-2016 16:01:15
Showing 2 changed files
... ...
@@ -1,8 +1,22 @@
1 1
 2.0
2 2
 ===
3 3
 
4
-YOUR OLD STUFF MAY NOT RUN ANYMORE!
5
-Do a `mulle-bootstrap dist clean`. 
4
+## YOUR OLD STUFF MAY NOT RUN ANYMORE
5
+
6
+Do a `mulle-bootstrap dist clean`.
7
+
8
+## YOUR OLD SETTINGS MAY NOT WORK ANYMORE!
9
+
10
+Move all repo specific setting directories from
11
+
12
+`.bootstrap/settings/<reponame> `
13
+
14
+to
15
+
16
+`.bootstrap/<reponame>`
17
+
18
+
19
+## Changes
6 20
 
7 21
 * Add pre-build.sh script phase (for libcurl really)
8 22
 * Brew formulas are now installed locally into "addictions". A folder which
... ...
@@ -26,6 +40,8 @@ inheritance scheme.
26 40
 * renamed build setting OTHER_CPPFLAGS to OTHER_CXXFLAGS (!)
27 41
 * UNAME is now simplified and lowercased(!)
28 42
 * redid the settings merge and inheritance logic. It's now a bit more scrutable.
43
+* removed build_order from settings
44
+
29 45
 
30 46
 
31 47
 1.1
... ...
@@ -317,7 +317,7 @@ mark_all_embedded_repositories_zombies()
317 317
 
318 318
       for symlink in `ls -1d "${path}/"*`
319 319
       do
320
-         i="`cat "$symlink"`"
320
+         i="`cat "$symlink"`" || fail "Old style mulle-bootstrap files detected, dist-clean it"
321 321
          name="`basename -- "$i"`"
322 322
          exekutor touch "${zombiepath}/${name}"
323 323
       done