From 1a7fbedf56a4c7a6afb683851dde5d34bbb48b86 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Thu, 2 Oct 2014 14:16:00 +0000 Subject: Split morph out of tools morph now contains distbuild and morph-cache-server, so the distbuild stratum can go away, and anything that needs it can now use morph. --- strata/distbuild.morph | 23 --------- strata/morph-utils.morph | 82 ++++++++++++++++++++++++++++++ strata/morph-utils/cmdtest.morph | 6 +++ strata/morph-utils/pyfilesystem.morph | 6 +++ strata/morph-utils/python-coveragepy.morph | 6 +++ strata/morph-utils/python-ttystatus.morph | 6 +++ strata/tools.morph | 65 ----------------------- strata/tools/cmdtest.morph | 6 --- strata/tools/pyfilesystem.morph | 6 --- strata/tools/python-coveragepy.morph | 6 --- strata/tools/python-ttystatus.morph | 6 --- strata/trove.morph | 16 +----- 12 files changed, 107 insertions(+), 127 deletions(-) delete mode 100644 strata/distbuild.morph create mode 100644 strata/morph-utils.morph create mode 100644 strata/morph-utils/cmdtest.morph create mode 100644 strata/morph-utils/pyfilesystem.morph create mode 100644 strata/morph-utils/python-coveragepy.morph create mode 100644 strata/morph-utils/python-ttystatus.morph delete mode 100644 strata/tools/cmdtest.morph delete mode 100644 strata/tools/pyfilesystem.morph delete mode 100644 strata/tools/python-coveragepy.morph delete mode 100644 strata/tools/python-ttystatus.morph (limited to 'strata') diff --git a/strata/distbuild.morph b/strata/distbuild.morph deleted file mode 100644 index 36306d9c..00000000 --- a/strata/distbuild.morph +++ /dev/null @@ -1,23 +0,0 @@ -name: distbuild -kind: stratum -description: Morph distributed build software -build-depends: -- morph: strata/foundation.morph -- morph: strata/core.morph -- morph: strata/tools.morph -chunks: -- name: bottle - repo: upstream:bottle - ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f - unpetrify-ref: baserock/morph - build-depends: [] -- name: morph-cache-server - repo: baserock:baserock/morph-cache-server - ref: cc5f95fa563c4817cdcffc428da18e263bd02ae2 - unpetrify-ref: master - build-depends: [] -- name: flup - repo: upstream:flup - ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 - unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph new file mode 100644 index 00000000..d7389a6c --- /dev/null +++ b/strata/morph-utils.morph @@ -0,0 +1,82 @@ +name: morph-utils +kind: stratum +build-depends: +- morph: strata/core.morph +chunks: +- name: python-ttystatus + morph: strata/morph-utils/python-ttystatus.morph + repo: upstream:python-ttystatus + ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 + unpetrify-ref: baserock/morph + build-depends: [] +- name: python-markdown + repo: upstream:python-markdown + ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6 + unpetrify-ref: baserock/morph + build-depends: [] +- name: git-fat + morph: strata/tools/git-fat.morph + repo: upstream:git-fat + ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 + unpetrify-ref: baserock/morph + build-depends: [] +- name: six + repo: upstream:six + ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa + unpetrify-ref: baserock/morph + build-depends: [] +- name: pyfilesystem + morph: strata/morph-utils/pyfilesystem.morph + repo: upstream:pyfilesystem + ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 + unpetrify-ref: baserock/morph + build-depends: + - six +- name: python-coveragepy + morph: strata/morph-utils/python-coveragepy.morph + repo: upstream:python-coveragepy + ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 + unpetrify-ref: baserock/morph + build-depends: [] +- name: python-coverage-test-runner + repo: upstream:python-coverage-test-runner + ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 + unpetrify-ref: baserock/morph + build-depends: + - python-coveragepy +- name: cliapp + repo: upstream:cliapp + ref: cec20cedd062a3aef1b04f997e77b45090c07806 + unpetrify-ref: baserock/morph + build-depends: + - python-coverage-test-runner +- name: cmdtest + morph: strata/morph-utils/cmdtest.morph + repo: upstream:cmdtest + ref: 62fa7e08f76a5b6bb8410add49c40656b3e73acd + unpetrify-ref: baserock/morph + build-depends: + - cliapp + - python-ttystatus + - python-markdown +- name: bottle + repo: upstream:bottle + ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f + unpetrify-ref: baserock/morph + build-depends: [] +- name: flup + repo: upstream:flup + ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 + unpetrify-ref: baserock/morph + build-depends: [] +- name: morph + repo: baserock:baserock/morph + ref: b98cfd4e0673cee64e61abee714f12dd220c8a2e + unpetrify-ref: master + build-depends: + - cliapp + - cmdtest + - python-coverage-test-runner + - pyfilesystem + - bottle + - flup diff --git a/strata/morph-utils/cmdtest.morph b/strata/morph-utils/cmdtest.morph new file mode 100644 index 00000000..3e1c71c6 --- /dev/null +++ b/strata/morph-utils/cmdtest.morph @@ -0,0 +1,6 @@ +name: cmdtest +kind: chunk +build-commands: +- python setup.py build +install-commands: +- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/morph-utils/pyfilesystem.morph b/strata/morph-utils/pyfilesystem.morph new file mode 100644 index 00000000..a4931dfa --- /dev/null +++ b/strata/morph-utils/pyfilesystem.morph @@ -0,0 +1,6 @@ +name: pyfilesystem +kind: chunk +build-commands: +- python setup.py build +install-commands: +- python setup.py install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/strata/morph-utils/python-coveragepy.morph b/strata/morph-utils/python-coveragepy.morph new file mode 100644 index 00000000..ed5e3d87 --- /dev/null +++ b/strata/morph-utils/python-coveragepy.morph @@ -0,0 +1,6 @@ +name: python-coveragepy +kind: chunk +build-commands: +- python setup.py build +install-commands: +- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/morph-utils/python-ttystatus.morph b/strata/morph-utils/python-ttystatus.morph new file mode 100644 index 00000000..e45ef7a8 --- /dev/null +++ b/strata/morph-utils/python-ttystatus.morph @@ -0,0 +1,6 @@ +name: python-ttystatus +kind: chunk +build-commands: +- python setup.py build +install-commands: +- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/tools.morph b/strata/tools.morph index bddd9800..333b173f 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -4,49 +4,6 @@ description: Extra development tools included in the devel system build-depends: - morph: strata/foundation.morph chunks: -- name: six - repo: upstream:six - ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-ttystatus - morph: strata/tools/python-ttystatus.morph - repo: upstream:python-ttystatus - ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-coveragepy - morph: strata/tools/python-coveragepy.morph - repo: upstream:python-coveragepy - ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 - unpetrify-ref: baserock/morph - build-depends: [] -- name: python-coverage-test-runner - repo: upstream:python-coverage-test-runner - ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 - unpetrify-ref: baserock/morph - build-depends: - - python-coveragepy -- name: cliapp - repo: upstream:cliapp - ref: cec20cedd062a3aef1b04f997e77b45090c07806 - unpetrify-ref: baserock/morph - build-depends: - - python-coverage-test-runner -- name: python-markdown - repo: upstream:python-markdown - ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6 - unpetrify-ref: baserock/morph - build-depends: [] -- name: cmdtest - morph: strata/tools/cmdtest.morph - repo: upstream:cmdtest - ref: 62fa7e08f76a5b6bb8410add49c40656b3e73acd - unpetrify-ref: baserock/morph - build-depends: - - cliapp - - python-ttystatus - - python-markdown - name: coreutils morph: strata/tools/coreutils.morph repo: upstream:coreutils @@ -91,28 +48,6 @@ chunks: ref: fffb8558208586338587027c265fd0eca44466be unpetrify-ref: baserock/morph build-depends: [] -- name: pyfilesystem - morph: strata/tools/pyfilesystem.morph - repo: upstream:pyfilesystem - ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 - unpetrify-ref: baserock/morph - build-depends: - - six -- name: morph - repo: baserock:baserock/morph - ref: 963dca9868938241740d63ec1475c5f887513e0c - unpetrify-ref: master - build-depends: - - cliapp - - cmdtest - - python-coverage-test-runner - - pyfilesystem -- name: git-fat - morph: strata/tools/git-fat.morph - repo: upstream:git-fat - ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 - unpetrify-ref: baserock/morph - build-depends: [] - name: pv repo: upstream:pv ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a diff --git a/strata/tools/cmdtest.morph b/strata/tools/cmdtest.morph deleted file mode 100644 index 3e1c71c6..00000000 --- a/strata/tools/cmdtest.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: cmdtest -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/tools/pyfilesystem.morph b/strata/tools/pyfilesystem.morph deleted file mode 100644 index a4931dfa..00000000 --- a/strata/tools/pyfilesystem.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: pyfilesystem -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/strata/tools/python-coveragepy.morph b/strata/tools/python-coveragepy.morph deleted file mode 100644 index ed5e3d87..00000000 --- a/strata/tools/python-coveragepy.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-coveragepy -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/tools/python-ttystatus.morph b/strata/tools/python-ttystatus.morph deleted file mode 100644 index e45ef7a8..00000000 --- a/strata/tools/python-ttystatus.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-ttystatus -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/trove.morph b/strata/trove.morph index f69dd029..634e5bfc 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -3,17 +3,8 @@ kind: stratum description: Trove software build-depends: - morph: strata/tools.morph +- morph: strata/morph-utils.morph chunks: -- name: bottle - repo: upstream:bottle - ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f - unpetrify-ref: baserock/morph - build-depends: [] -- name: morph-cache-server - repo: baserock:baserock/morph-cache-server - ref: acefe33868585cf31cda53474a3004da42e00896 - unpetrify-ref: master - build-depends: [] - name: lua morph: strata/trove/lua.morph repo: upstream:lua @@ -214,11 +205,6 @@ chunks: unpetrify-ref: baserock/morph build-depends: - pcre -- name: flup - repo: upstream:flup - ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 - unpetrify-ref: baserock/morph - build-depends: [] - name: lua-scrypt morph: strata/trove/lua-scrypt.morph repo: upstream:lua-scrypt -- cgit v1.2.1