diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-08-26 13:41:39 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-08-26 15:53:15 +0300 |
| commit | cd431f3f8bca937d4d0ff5b165e556d719329085 (patch) | |
| tree | 3decb5d2e9113498d31e5b683a07e2a6408f2c41 | |
| parent | 5a6cad9799be32889c85ebd71c70a03fe4a2a861 (diff) | |
Move definitions of commonly used target types to root.build
| -rw-r--r-- | build/root.build | 11 | ||||
| -rw-r--r-- | doc/buildfile | 6 | ||||
| -rw-r--r-- | tests/ci/buildfile | 7 | ||||
| -rw-r--r-- | tests/submit/buildfile | 5 | ||||
| -rw-r--r-- | www/buildfile | 16 |
5 files changed, 15 insertions, 30 deletions
diff --git a/build/root.build b/build/root.build index 2502705..ce8ca41 100644 --- a/build/root.build +++ b/build/root.build @@ -31,6 +31,17 @@ using bash brep/bash{*}: install.subdirs = true +# Define commonly used target types. +# +define css: file +css{*}: extension = css + +define xhtml: doc +xhtml{*}: extension = xhtml + +define common_testscript: file +common_testscript{*}: extension = testscript + # All exe{} in tests/ are, well, tests. Also don't link whole archives # by default there. # diff --git a/doc/buildfile b/doc/buildfile index f4721c9..4b2305e 100644 --- a/doc/buildfile +++ b/doc/buildfile @@ -7,12 +7,6 @@ brep-clean \ brep-load \ brep-migrate -define css: file -css{*}: extension = css - -define xhtml: doc -xhtml{*}: extension = xhtml - ./: {man1 xhtml}{$cmds} \ css{common pre-box man} \ file{man-*} diff --git a/tests/ci/buildfile b/tests/ci/buildfile index 6ed5d5b..280e364 100644 --- a/tests/ci/buildfile +++ b/tests/ci/buildfile @@ -2,17 +2,14 @@ # copyright : Copyright (c) 2014-2019 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -define common: file -common{*}: extension = testscript - dir = ../../brep/handler/ci/ include $dir commons = data -./: testscript{* -{$commons}} common{$commons} {*/ -test/}{**} \ - $dir/exe{brep-ci-dir} $dir/exe{brep-ci-load} \ +./: testscript{* -{$commons}} common_testscript{$commons} {*/ -test/}{**} \ + $dir/exe{brep-ci-dir} $dir/exe{brep-ci-load} \ doc{README} file{hello.tar.gz} testscript{ci-dir}@./: test = $out_base/$dir/brep-ci-dir diff --git a/tests/submit/buildfile b/tests/submit/buildfile index e4dc657..aaffede 100644 --- a/tests/submit/buildfile +++ b/tests/submit/buildfile @@ -2,16 +2,13 @@ # copyright : Copyright (c) 2014-2019 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -define common: file -common{*}: extension = testscript - dir = ../../brep/handler/submit/ include $dir commons = data -./: testscript{* -{$commons}} common{$commons} {*/ -test/}{**} \ +./: testscript{* -{$commons}} common_testscript{$commons} {*/ -test/}{**} \ $dir/exe{brep-submit-dir} $dir/exe{brep-submit-git} file{hello.tar.gz} \ doc{README} diff --git a/www/buildfile b/www/buildfile index e189202..6c2f15f 100644 --- a/www/buildfile +++ b/www/buildfile @@ -2,13 +2,7 @@ # copyright : Copyright (c) 2014-2019 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -define css: file - -css{*}: -{ - extension = css - install = data/www/ -} +css{*} xhtml{*}: install = data/www/ define scss: file @@ -18,12 +12,4 @@ scss{*}: install = data/www/ } -define xhtml: file - -xhtml{*}: -{ - extension = xhtml - install = data/www/ -} - ./: css{*} scss{*} xhtml{*} |