Skip to content

Commit 924e5b9

Browse files
committed
Revert "Brief: add more pre/post steps for janet-pm building"
This reverts commit 6f189ab.
1 parent 6f189ab commit 924e5b9

File tree

5 files changed

+8
-247
lines changed

5 files changed

+8
-247
lines changed

spork/declare-cc.janet

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -266,15 +266,11 @@
266266
(def bd (build-dir))
267267
(def rules (get-rules))
268268
# Initialize build rules
269-
(build-rules/build-rule rules :install [])
269+
(build-rules/build-rule rules :install ["build" "pre-install"])
270270
(build-rules/build-rule rules :pre-install [])
271-
(build-rules/build-rule rules :post-install [])
272271
(build-rules/build-rule rules :build [])
273272
(build-rules/build-rule rules :pre-build [])
274-
(build-rules/build-rule rules :post-build [])
275-
(build-rules/build-rule rules :check [])
276273
(build-rules/build-rule rules :pre-check [])
277-
(build-rules/build-rule rules :post-check [])
278274
# Add hooks
279275
(def e (curenv))
280276
(defn- prebuild
@@ -283,59 +279,34 @@
283279
(os/mkdir bd)
284280
(os/mkdir (path/join bd "static"))
285281
(build-rules/build-run e "pre-build" (dyn :workers)))
286-
(defn- postbuild
287-
[]
288-
(build-rules/build-run e "post-build" (dyn :workers)))
289282
(defn- precheck
290283
[]
291284
(build-rules/build-run e "pre-check" (dyn :workers)))
292-
(defn- postcheck
293-
[]
294-
(build-rules/build-run e "post-check" (dyn :workers)))
295-
(defn- preinstall
296-
[]
297-
(build-rules/build-run e "pre-install" (dyn :workers)))
298-
(defn- postinstall
299-
[]
300-
(build-rules/build-run e "post-install" (dyn :workers)))
301-
(defn- preclean
302-
[]
303-
(build-rules/build-run e "pre-clean" (dyn :workers)))
304-
(defn- postclean
305-
[]
306-
(build-rules/build-run e "post-clean" (dyn :workers)))
307285
(defn build [&opt man target]
308286
(prebuild)
309287
(default target "build")
310-
(build-rules/build-run e target (dyn :workers))
311-
(postbuild))
288+
(build-rules/build-run e target (dyn :workers)))
312289
(defn install [manifest &]
313-
# (build) - removed since install in janet/src/boot/boot.janet calls build in the install hook
314-
(preinstall)
290+
(build)
315291
(with-dyns [*install-manifest* manifest]
316-
(build-rules/build-run e "install" (dyn :workers)))
317-
(postinstall))
292+
(build-rules/build-run e "install" (dyn :workers))))
318293
(defn check [&]
319294
(build)
320295
(precheck)
321-
(run-tests)
322-
(postcheck))
296+
(run-tests))
323297
(defn list-rules [&]
324298
(each k (sorted (filter string? (keys rules)))
325299
(print k)))
326300
(defn rule-tree [&]
327301
(show-rule-tree rules))
328302
(defn clean [&]
329-
(preclean)
330303
(print "removing directory " bd)
331-
(sh/rm bd)
332-
(postclean))
304+
(sh/rm bd))
333305
(defn clean-all [&]
334-
(preclean)
335306
(print "removing directory " br)
336-
(sh/rm br)
337-
(postclean))
307+
(sh/rm br))
338308
(defn run-task [task]
309+
(prebuild)
339310
(build-rules/build-run e task (dyn :workers)))
340311
(defglobal 'install install)
341312
(defglobal 'build build)

test-project/hello/init.janet

Lines changed: 0 additions & 2 deletions
This file was deleted.

test-project/project.janet

Lines changed: 0 additions & 44 deletions
This file was deleted.

test-project/test/test-hello.janet

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/suite-pm-pre-post.janet

Lines changed: 0 additions & 161 deletions
This file was deleted.

0 commit comments

Comments
 (0)