From 915b837065fc8a48e84e0aa8beffc3d079b89eef Mon Sep 17 00:00:00 2001 From: Matt Demanett Date: Mon, 9 Apr 2018 19:39:36 -0400 Subject: [PATCH 1/3] Reviews 2018 04 09 (#449) * Updates FrozenWasteland submodule commit. * Post-review update of ImpromptuModular pointer and manifest. * Reviewed squinkylabls-plug1; updated pointer and manifest. * Reviewed Ohmer; updated pointer and manifest. * Reviewed BaconMusic; updated pointer and manifest. * Reviewed Koralfx-Modules; updated pointer and manifest. * Reviewed trowaSoft; updated pointer and manifest to 0.6.1. * Reviewed Qwelk at 0.6.0; added repo pointer and update manifest. * Reviewed Erratic at 0.6.0; added repo pointer and manifest. * Review and update FrozenWasteland. * Review and update Ohmer. * Review and update Koralfx. --- manifests/FrozenWasteland.json | 2 +- manifests/Koralfx-Modules.json | 2 +- manifests/Ohmer.json | 2 +- repos/FrozenWasteland | 2 +- repos/Koralfx-Modules | 2 +- repos/Ohmer | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/FrozenWasteland.json b/manifests/FrozenWasteland.json index 3af29c7b..53de1751 100644 --- a/manifests/FrozenWasteland.json +++ b/manifests/FrozenWasteland.json @@ -7,6 +7,6 @@ "donateUrl": "https://paypal.me/FrozenWasteland", "latestVersion": "0.6.3", "status": "available", - "repoVersion": "0.6.3", + "repoVersion": "0.6.4", "buildTimestamp": 1522881009 } \ No newline at end of file diff --git a/manifests/Koralfx-Modules.json b/manifests/Koralfx-Modules.json index e5568ed9..32aa1905 100644 --- a/manifests/Koralfx-Modules.json +++ b/manifests/Koralfx-Modules.json @@ -6,5 +6,5 @@ "sourceUrl": "https://github.com/koralfx/Koralfx-Modules/", "manualUrl": "https://github.com/koralfx/Koralfx-Modules/blob/master/README.md", "donateUrl": "https://www.paypal.me/koralfx/", - "repoVersion": "0.6.4" + "repoVersion": "0.6.7" } diff --git a/manifests/Ohmer.json b/manifests/Ohmer.json index a5e2204f..1eb60b6a 100644 --- a/manifests/Ohmer.json +++ b/manifests/Ohmer.json @@ -7,7 +7,7 @@ "sourceUrl": "https://github.com/DomiKamu/Ohmer-Modules", "donateUrl": "https://www.paypal.me/DominiqueCAMUS", "latestVersion": "0.6.2", - "repoVersion": "0.6.2", + "repoVersion": "0.6.3", "status": "available", "buildTimestamp": 1522751360 } \ No newline at end of file diff --git a/repos/FrozenWasteland b/repos/FrozenWasteland index 135ff85a..aa106361 160000 --- a/repos/FrozenWasteland +++ b/repos/FrozenWasteland @@ -1 +1 @@ -Subproject commit 135ff85a6199da1cc85a5bf6291c7a9a5039e09a +Subproject commit aa1063616f61be21e338e4d5728a26a735870304 diff --git a/repos/Koralfx-Modules b/repos/Koralfx-Modules index b0625c1e..4340525a 160000 --- a/repos/Koralfx-Modules +++ b/repos/Koralfx-Modules @@ -1 +1 @@ -Subproject commit b0625c1ea1522ec4f8d61c6b3eb7f0d4ae5ef793 +Subproject commit 4340525a669294b8b893b951294bf24463ad91f8 diff --git a/repos/Ohmer b/repos/Ohmer index 288c9084..6cbab4d0 160000 --- a/repos/Ohmer +++ b/repos/Ohmer @@ -1 +1 @@ -Subproject commit 288c90847d4c61c8d09f633db6d3b0b243fa1a8c +Subproject commit 6cbab4d071021e3205c557a6a53067c1691f41a6 From 48a1c7f745b26689cf44677822701f7210898cba Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Mon, 9 Apr 2018 19:45:40 -0400 Subject: [PATCH 2/3] Update BaconMusic repo --- repos/BaconMusic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/BaconMusic b/repos/BaconMusic index b30dad64..6f235d1c 160000 --- a/repos/BaconMusic +++ b/repos/BaconMusic @@ -1 +1 @@ -Subproject commit b30dad642d8f57eed78d241a4251f96c1ec3319d +Subproject commit 6f235d1cff2b3d4cc8f334545ad36e8e0cbf1ccc From 981b46e47d26506659d57b1d7ee1b22dba6fa00a Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Mon, 9 Apr 2018 20:17:59 -0400 Subject: [PATCH 3/3] Update builds --- manifests/FrozenWasteland.json | 4 ++-- manifests/Koralfx-Modules.json | 7 +++++-- manifests/Ohmer.json | 4 ++-- manifests/Qwelk.json | 7 +++++-- scripts/build_updates.py | 23 +++++++++++------------ 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/manifests/FrozenWasteland.json b/manifests/FrozenWasteland.json index 53de1751..b44ab128 100644 --- a/manifests/FrozenWasteland.json +++ b/manifests/FrozenWasteland.json @@ -5,8 +5,8 @@ "manualUrl": "https://github.com/almostEric/FrozenWasteland/blob/master/README.md", "sourceUrl": "https://github.com/almostEric/FrozenWasteland", "donateUrl": "https://paypal.me/FrozenWasteland", - "latestVersion": "0.6.3", + "latestVersion": "0.6.4", "status": "available", "repoVersion": "0.6.4", - "buildTimestamp": 1522881009 + "buildTimestamp": 1523319164 } \ No newline at end of file diff --git a/manifests/Koralfx-Modules.json b/manifests/Koralfx-Modules.json index 32aa1905..9f04964e 100644 --- a/manifests/Koralfx-Modules.json +++ b/manifests/Koralfx-Modules.json @@ -6,5 +6,8 @@ "sourceUrl": "https://github.com/koralfx/Koralfx-Modules/", "manualUrl": "https://github.com/koralfx/Koralfx-Modules/blob/master/README.md", "donateUrl": "https://www.paypal.me/koralfx/", - "repoVersion": "0.6.7" -} + "repoVersion": "0.6.7", + "latestVersion": "0.6.7", + "buildTimestamp": 1523318775, + "status": "available" +} \ No newline at end of file diff --git a/manifests/Ohmer.json b/manifests/Ohmer.json index 1eb60b6a..8b1e2f1d 100644 --- a/manifests/Ohmer.json +++ b/manifests/Ohmer.json @@ -6,8 +6,8 @@ "manualUrl": "https://github.com/DomiKamu/Ohmer-Modules/blob/master/README.md", "sourceUrl": "https://github.com/DomiKamu/Ohmer-Modules", "donateUrl": "https://www.paypal.me/DominiqueCAMUS", - "latestVersion": "0.6.2", + "latestVersion": "0.6.3", "repoVersion": "0.6.3", "status": "available", - "buildTimestamp": 1522751360 + "buildTimestamp": 1523319082 } \ No newline at end of file diff --git a/manifests/Qwelk.json b/manifests/Qwelk.json index 604bc875..cea6b8f2 100644 --- a/manifests/Qwelk.json +++ b/manifests/Qwelk.json @@ -4,5 +4,8 @@ "license": "MIT", "manualUrl": "https://github.com/raincheque/qwelk/blob/master/README.md", "sourceUrl": "https://github.com/raincheque/qwelk", - "repoVersion": "0.6.0" -} + "repoVersion": "0.6.0", + "latestVersion": "0.6.0", + "buildTimestamp": 1523319042, + "status": "available" +} \ No newline at end of file diff --git a/scripts/build_updates.py b/scripts/build_updates.py index 3660d5c5..ee9406f9 100644 --- a/scripts/build_updates.py +++ b/scripts/build_updates.py @@ -4,31 +4,30 @@ import time import os +def system(cmd): + if os.system(cmd): + raise Exception(f"Failed command: {cmd}") + + def build_mac(slug): env = f'CC=x86_64-apple-darwin15-clang CXX=x86_64-apple-darwin15-clang++-libc++ STRIP=x86_64-apple-darwin15-strip RACK_DIR=../../Rack-SDK' make = f'{env} make -j$(nproc) -C repos/{slug}' - if os.system(f'{make} clean'): - raise Exception(f"Could not clean Mac build of {slug}") - if os.system(f'{make} dist'): - raise Exception(f"Could not make Mac build of {slug}") + system(f'{make} clean') + system(f'{make} dist') def build_win(slug): env = f'CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ STRIP=x86_64-w64-mingw32-strip RACK_DIR=../../Rack-SDK' make = f'{env} make -j$(nproc) -C repos/{slug}' - if os.system(f'{make} clean'): - raise Exception(f"Could not clean Windows build of {slug}") - if os.system(f'{make} dist'): - raise Exception(f"Could not make Windows build of {slug}") + system(f'{make} clean') + system(f'{make} dist') def build_lin(slug): env = f'-e RACK_DIR=../../Rack-SDK' make = f'make -j$(nproc) -C repos/{slug}' - if os.system(f'docker run --rm -v $(pwd):/mnt -u vortico {env} a0b9c87ec456 {make} clean'): - raise Exception(f"Could not clean Linux build of {slug}") - if os.system(f'docker run --rm -v $(pwd):/mnt -u vortico {env} a0b9c87ec456 {make} dist'): - raise Exception(f"Could not make Linux build of {slug}") + system(f'docker run --rm -v $(pwd):/mnt -u vortico {env} a0b9c87ec456 {make} clean') + system(f'docker run --rm -v $(pwd):/mnt -u vortico {env} a0b9c87ec456 {make} dist') def move_package(slug):