From 3a6d7fd84c620ddfa51dd2bd6d18f95cacc67617 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 7 Mar 2019 17:14:14 +0100 Subject: [PATCH] Move nimble to nim --- .gitmodules | 22 +++++++++++----------- libretro/retro_frontend | 2 +- nim/blobsets | 1 + nim/carn_layouter | 1 + {nimble => nim}/fetch_and_copy | 0 {nimble => nim}/icy_client | 0 {nimble => nim}/imap_report | 0 nim/musicbrainz_playlist_generator | 1 + {nimble => nim}/nim | 0 {nimble => nim}/nim-genode | 0 {nimble => nim}/nim-monero | 0 {nimble => nim}/ninep | 0 {nimble => nim}/spry_genode | 0 nimble/Tuprules.tup | 2 -- nimble/binaries.tup | 11 ----------- nimble/blobsets | 1 - nimble/carn_layouter | 1 - nimble/musicbrainz_playlist_generator | 1 - nimble/package.tup | 8 -------- 19 files changed, 15 insertions(+), 36 deletions(-) create mode 160000 nim/blobsets create mode 160000 nim/carn_layouter rename {nimble => nim}/fetch_and_copy (100%) rename {nimble => nim}/icy_client (100%) rename {nimble => nim}/imap_report (100%) create mode 160000 nim/musicbrainz_playlist_generator rename {nimble => nim}/nim (100%) rename {nimble => nim}/nim-genode (100%) rename {nimble => nim}/nim-monero (100%) rename {nimble => nim}/ninep (100%) rename {nimble => nim}/spry_genode (100%) delete mode 100644 nimble/Tuprules.tup delete mode 100644 nimble/binaries.tup delete mode 160000 nimble/blobsets delete mode 160000 nimble/carn_layouter delete mode 160000 nimble/musicbrainz_playlist_generator delete mode 100644 nimble/package.tup diff --git a/.gitmodules b/.gitmodules index ab64d4734..94f1d2576 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,20 +1,20 @@ [submodule "submodules/musicbrainz_playlist_generator"] - path = nimble/musicbrainz_playlist_generator + path = nim/musicbrainz_playlist_generator url = git@github.com:ehmry/musicbrainz_playlist_generator.git [submodule "nimble/icy_client"] - path = nimble/icy_client + path = nim/icy_client url = git@github.com:ehmry/icy_client.git [submodule "nim-genode"] - path = nimble/nim-genode + path = nim/nim-genode url = git@github.com:ehmry/nim-genode.git [submodule "nimble/imap_report"] - path = nimble/imap_report + path = nim/imap_report url = git@github.com:ehmry/imap_report.git [submodule "nimble/blobsets"] - path = nimble/blobsets + path = nim/blobsets url = git@github.com:ehmry/blobsets.git [submodule "nimble/ninep"] - path = nimble/ninep + path = nim/ninep url = git@github.com:ehmry/ninep.git [submodule "libretro/libretro-common"] path = libretro/libretro-common @@ -65,7 +65,7 @@ path = lib/libflif/upstream url = https://github.com:FLIF-hub/FLIF [submodule "nimble/nim-monero"] - path = nimble/nim-monero + path = nim/nim-monero url = git@git.fuzzlabs.org:emery/nim-monero.git [submodule "libretro/cores/scummvm/upstream"] path = libretro/cores/scummvm/upstream @@ -83,14 +83,14 @@ path = app/trojita url = git://anongit.kde.org/trojita.git [submodule "nimble/fetch_and_copy"] - path = nimble/fetch_and_copy + path = nim/fetch_and_copy url = git@github.com:ehmry/fetch_and_copy.git [submodule "nimble/nim"] - path = nimble/nim + path = nim/nim url = https://github.com/nim-lang/nim.git [submodule "nimble/spry_genode"] - path = nimble/spry_genode + path = nim/spry_genode url = git@github.com:ehmry/spry_genode.git [submodule "nimble/carn"] - path = nimble/carn_layouter + path = nim/carn_layouter url = git@github.com:ehmry/fibonacci.git diff --git a/libretro/retro_frontend b/libretro/retro_frontend index 7ab61573e..6c4cb16a6 160000 --- a/libretro/retro_frontend +++ b/libretro/retro_frontend @@ -1 +1 @@ -Subproject commit 7ab61573ed5656a0899898bfb8af11b19ccc1f3f +Subproject commit 6c4cb16a657f62c126df6917e06bb64b77514620 diff --git a/nim/blobsets b/nim/blobsets new file mode 160000 index 000000000..943ac2d6d --- /dev/null +++ b/nim/blobsets @@ -0,0 +1 @@ +Subproject commit 943ac2d6d692e7d5ccf1e6ee57c3e811f157e810 diff --git a/nim/carn_layouter b/nim/carn_layouter new file mode 160000 index 000000000..75cf89f0a --- /dev/null +++ b/nim/carn_layouter @@ -0,0 +1 @@ +Subproject commit 75cf89f0abe715074b959b737e14bdb20c4ea412 diff --git a/nimble/fetch_and_copy b/nim/fetch_and_copy similarity index 100% rename from nimble/fetch_and_copy rename to nim/fetch_and_copy diff --git a/nimble/icy_client b/nim/icy_client similarity index 100% rename from nimble/icy_client rename to nim/icy_client diff --git a/nimble/imap_report b/nim/imap_report similarity index 100% rename from nimble/imap_report rename to nim/imap_report diff --git a/nim/musicbrainz_playlist_generator b/nim/musicbrainz_playlist_generator new file mode 160000 index 000000000..ecbce567e --- /dev/null +++ b/nim/musicbrainz_playlist_generator @@ -0,0 +1 @@ +Subproject commit ecbce567ebbcd1292b1ffdf3d0277512edeaa938 diff --git a/nimble/nim b/nim/nim similarity index 100% rename from nimble/nim rename to nim/nim diff --git a/nimble/nim-genode b/nim/nim-genode similarity index 100% rename from nimble/nim-genode rename to nim/nim-genode diff --git a/nimble/nim-monero b/nim/nim-monero similarity index 100% rename from nimble/nim-monero rename to nim/nim-monero diff --git a/nimble/ninep b/nim/ninep similarity index 100% rename from nimble/ninep rename to nim/ninep diff --git a/nimble/spry_genode b/nim/spry_genode similarity index 100% rename from nimble/spry_genode rename to nim/spry_genode diff --git a/nimble/Tuprules.tup b/nimble/Tuprules.tup deleted file mode 100644 index 9ef5f489c..000000000 --- a/nimble/Tuprules.tup +++ /dev/null @@ -1,2 +0,0 @@ -NIMBLE_BINARIES_INCLUDE = $(TUP_CWD)/binaries.tup -NIMBLE_PACKAGE_INCLUDE = $(TUP_CWD)/package.tup diff --git a/nimble/binaries.tup b/nimble/binaries.tup deleted file mode 100644 index 243478501..000000000 --- a/nimble/binaries.tup +++ /dev/null @@ -1,11 +0,0 @@ -# Drop the relase flag with the line "NIM_RELEASE_FLAG=" -NIM_RELEASE_FLAG = -d:release - -!nim_build = |> ^o Nimble %B^ nimble cpp $(NIM_RELEASE_FLAG) --os:genode -d:posix -o:%B %f |> %B ./ - -: foreach src/*.nim |> !nim_build |> {output} -: foreach {output} |> !strip_to_depot |> {binary} - -ifdef DEPOT_KEY -: {binary} |> !publish_bin |> -endif diff --git a/nimble/blobsets b/nimble/blobsets deleted file mode 160000 index efc67ada4..000000000 --- a/nimble/blobsets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit efc67ada420f1d33ae7d7dd03bc666626162df31 diff --git a/nimble/carn_layouter b/nimble/carn_layouter deleted file mode 160000 index 1e572f2b9..000000000 --- a/nimble/carn_layouter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1e572f2b9bb5847e62357053b55123bbfb3b09a7 diff --git a/nimble/musicbrainz_playlist_generator b/nimble/musicbrainz_playlist_generator deleted file mode 160000 index bbf399999..000000000 --- a/nimble/musicbrainz_playlist_generator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bbf399999915de4d618daebb3334061603dccaa5 diff --git a/nimble/package.tup b/nimble/package.tup deleted file mode 100644 index 493d6fc08..000000000 --- a/nimble/package.tup +++ /dev/null @@ -1,8 +0,0 @@ -include_rules - -: archives | ./ |> !archives_to_depot |> {package} -: runtime | ./ |> !runtime_to_depot |> {package} - -ifdef DEPOT_KEY -: {package} |> !publish_pkg |> -endif