Browse Source

Move caching and build-recording code into private part of build.sh

Alois Mahdal 6 years ago
parent
commit
a8266e3479
2 changed files with 41 additions and 41 deletions
  1. 41
    7
      src/include/build.sh
  2. 0
    34
      src/include/mkit.sh

+ 41
- 7
src/include/build.sh View File

17
     test -n "$ftype"    || ftype=$(__guess_ftype "$dstpath")
17
     test -n "$ftype"    || ftype=$(__guess_ftype "$dstpath")
18
     debug_var srcpath dstpath ftype
18
     debug_var srcpath dstpath ftype
19
     <"$srcpath" __build1_ftype "$ftype" >"$dstpath"
19
     <"$srcpath" __build1_ftype "$ftype" >"$dstpath"
20
-    rec_built "$dstpath"
20
+    __rec_built "$dstpath"
21
 }
21
 }
22
 
22
 
23
 __build1_ftype() {
23
 __build1_ftype() {
100
     # arguments).
100
     # arguments).
101
     #
101
     #
102
     local name=$1
102
     local name=$1
103
-    local_get "$name" && return 0
104
-    "$name" | local_putb "$name"
105
-    local_get "$name"
103
+    __local_get "$name" && return 0
104
+    "$name" | __local_putb "$name"
105
+    __local_get "$name"
106
+}
107
+
108
+__local_putb() {
109
+    #
110
+    # Make file $1 in $MKIT_LOCAL from stdin and mark as built
111
+    #
112
+    local fpath=$1
113
+    __local_put "$fpath" && __rec_built "$MKIT_LOCAL/$fpath"
114
+}
115
+
116
+__local_put() {
117
+    #
118
+    # Make file $1 in $MKIT_LOCAL from stdin
119
+    #
120
+    local fpath="$MKIT_LOCAL/$1"
121
+    { mkdir -p "${fpath%/*}" && cat >"$fpath"; } \
122
+     || die "cannot write to local cache: $fpath"
123
+}
124
+
125
+__local_get() {
126
+    #
127
+    # Read file $1 in $MKIT_LOCAL
128
+    #
129
+    local fpath="$MKIT_LOCAL/$1"
130
+    cat "$fpath" 2>/dev/null
131
+}
132
+
133
+__rec_built() {
134
+    #
135
+    # Record file $1 for deletion on `clean`
136
+    #
137
+    local file=$1
138
+    mkdir -p "$MKIT_LOCAL"
139
+    echo "$file" >> "$MKIT_LOCAL/built.lst"
106
 }
140
 }
107
 
141
 
108
 _mkit_data() {
142
 _mkit_data() {
177
     mv "${MKIT_PROJ_PKGNAME}-$version.tar.gz" \
211
     mv "${MKIT_PROJ_PKGNAME}-$version.tar.gz" \
178
        "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz" \
212
        "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz" \
179
      || die "could not rename tarball"
213
      || die "could not rename tarball"
180
-    rec_built "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz"
214
+    __rec_built "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz"
181
 
215
 
182
     # read content of each mandatory file from debian_skel
216
     # read content of each mandatory file from debian_skel
183
     #
217
     #
191
             mkdir -p "$(dirname "$dftgt")"
225
             mkdir -p "$(dirname "$dftgt")"
192
             __build1 "$dfsrc" "$dftgt" debstuff
226
             __build1 "$dfsrc" "$dftgt" debstuff
193
         done
227
         done
194
-    rec_built debian
228
+    __rec_built debian
195
 }
229
 }
196
 
230
 
197
 dist() {
231
 dist() {
214
     echo -n "$git_lasthash" > "$dirname/.mkit/git_lasthash"
248
     echo -n "$git_lasthash" > "$dirname/.mkit/git_lasthash"
215
     tar -cf "$dirname.tar" "$dirname"
249
     tar -cf "$dirname.tar" "$dirname"
216
     gzip -f "$dirname.tar"      # see above FIXME
250
     gzip -f "$dirname.tar"      # see above FIXME
217
-    rec_built "$dirname.tar.gz"
251
+    __rec_built "$dirname.tar.gz"
218
     rm -rf "$dirname"
252
     rm -rf "$dirname"
219
 }
253
 }
220
 
254
 

+ 0
- 34
src/include/mkit.sh View File

125
      || die "bad mkit.ini version: $their_ver does not match $MKIT_VERSION"
125
      || die "bad mkit.ini version: $their_ver does not match $MKIT_VERSION"
126
 }
126
 }
127
 
127
 
128
-local_putb() {
129
-    #
130
-    # Make file $1 in $MKIT_LOCAL from stdin and mark as built
131
-    #
132
-    local fpath=$1
133
-    local_put "$fpath" && rec_built "$MKIT_LOCAL/$fpath"
134
-}
135
-
136
-local_put() {
137
-    #
138
-    # Make file $1 in $MKIT_LOCAL from stdin
139
-    #
140
-    local fpath="$MKIT_LOCAL/$1"
141
-    { mkdir -p "${fpath%/*}" && cat >"$fpath"; } \
142
-     || die "cannot write to local cache: $fpath"
143
-}
144
-
145
-local_get() {
146
-    #
147
-    # Read file $1 in $MKIT_LOCAL
148
-    #
149
-    local fpath="$MKIT_LOCAL/$1"
150
-    cat "$fpath" 2>/dev/null
151
-}
152
-
153
 mkit_init() {
128
 mkit_init() {
154
     #
129
     #
155
     # Do basic initialization
130
     # Do basic initialization
163
     __chkiniversion
138
     __chkiniversion
164
 }
139
 }
165
 
140
 
166
-rec_built() {
167
-    #
168
-    # Record file $1 for deletion on `clean`
169
-    #
170
-    local file=$1
171
-    mkdir -p "$MKIT_LOCAL"
172
-    echo "$file" >> "$MKIT_LOCAL/built.lst"
173
-}
174
-
175
 route() {
141
 route() {
176
     #
142
     #
177
     # Call correct function based on $1
143
     # Call correct function based on $1