Browse code

Merge branch 'master' of mulle-kybernetik.com:/scm/public_git/repositories/mulle-bootstrap Better .gitignore Add a README.md Less refreshes

Nat! authored on 11/10/2016 16:32:38
Showing 4 changed files
... ...
@@ -1,12 +1,36 @@
1 1
 .DS_Store
2 2
 *~.*
3 3
 *.chk
4
+*.xcworkspace
5
+xcuserdata/
4 6
 build/
5 7
 .repos/
6 8
 .bootstrap.auto/
7
-dependencies/
8 9
 .bootstrap.local/
10
+dependencies/
11
+addictions/
9 12
 mulle-bootstrap.sublime-workspace
10
-mulle-project
11 13
 relpath-python.sh
12
-relpath.shaddictions/
14
+relpath.sh
15
+
16
+tests/refresh-embedded/a/
17
+tests/refresh-embedded/b/
18
+tests/refresh-embedded/c/
19
+tests/refresh-embedded/d/
20
+tests/dependency/a/.bootstrap
21
+tests/dependency/b/.bootstrap
22
+tests/refresh-embedded/.bootstrap
23
+tests/refresh/a/
24
+tests/refresh/b/
25
+tests/refresh/c/
26
+tests/refresh/d/
27
+tests/refresh/e/
28
+tests/refresh/f/
29
+tests/refresh/g/
30
+tests/refresh/h/
31
+tests/refresh/main/.bootstrap
32
+tests/refresh/main/e/
33
+tests/refresh/main/g/
34
+tutorial/a/.bootstrap
35
+tutorial/b/.bootstrap
36
+tutorial/c/.bootstrap
... ...
@@ -106,9 +106,12 @@ bootstrap_nomagic_main()
106 106
 {
107 107
    local command
108 108
 
109
+
109 110
    command="$1"
110 111
    shift
111 112
 
113
+   log_fluff "::: $command begin :::"
114
+
112 115
    if [ "${command}" = "nomagic" ]
113 116
    then
114 117
       DONT_RECURSE=YES
... ...
@@ -130,10 +133,8 @@ bootstrap_nomagic_main()
130 130
       if [ -z "${DONT_RECURSE}" ]
131 131
       then
132 132
          fetch_main "$@" || exit 1
133
-         refresh_main    || exit 1
134 133
       else
135 134
          fetch_main --non-recursive "$@" || exit 1
136
-         refresh_main nonrecursive       || exit 1
137 135
       fi
138 136
       # used for option handling only
139 137
       MULLE_BOOTSTRAP_DID_FETCH="YES"
... ...
@@ -143,6 +144,8 @@ bootstrap_nomagic_main()
143 143
    then
144 144
       build_main "$@" || exit 1
145 145
    fi
146
+
147
+   log_fluff "::: $command end :::"
146 148
 }
147 149
 
148 150
 
... ...
@@ -428,7 +431,6 @@ bootstrap_main()
428 428
          . mulle-bootstrap-fetch.sh
429 429
 
430 430
          DONT_ASK_AFTER_WARNING=YES fetch_main "$@" || exit 1
431
-         refresh_main || exit 1
432 431
       ;;
433 432
 
434 433
       init)
435 434
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+# d
... ...
@@ -10,6 +10,16 @@ src/b.c
10 10
 )
11 11
 
12 12
 
13
+include_directories( BEFORE SYSTEM
14
+   dependencies/include
15
+)
16
+
17
+
18
+link_directories( ${CMAKE_BINARY_DIR}
19
+   dependencies/lib
20
+)
21
+
22
+
13 23
 target_link_libraries( b LINK_PUBLIC a)
14 24
 
15 25
 INSTALL(TARGETS b DESTINATION "lib")