Browse Source

Merge remote-tracking branch 'upstream/master'

pull/452/head
Matt Demanett 7 years ago
parent
commit
ea58e6ed1e
9 changed files with 31 additions and 26 deletions
  1. +3
    -3
      manifests/FrozenWasteland.json
  2. +5
    -2
      manifests/Koralfx-Modules.json
  3. +3
    -3
      manifests/Ohmer.json
  4. +5
    -2
      manifests/Qwelk.json
  5. +1
    -1
      repos/BaconMusic
  6. +1
    -1
      repos/FrozenWasteland
  7. +1
    -1
      repos/Koralfx-Modules
  8. +1
    -1
      repos/Ohmer
  9. +11
    -12
      scripts/build_updates.py

+ 3
- 3
manifests/FrozenWasteland.json View File

@@ -5,8 +5,8 @@
"manualUrl": "https://github.com/almostEric/FrozenWasteland/blob/master/README.md", "manualUrl": "https://github.com/almostEric/FrozenWasteland/blob/master/README.md",
"sourceUrl": "https://github.com/almostEric/FrozenWasteland", "sourceUrl": "https://github.com/almostEric/FrozenWasteland",
"donateUrl": "https://paypal.me/FrozenWasteland", "donateUrl": "https://paypal.me/FrozenWasteland",
"latestVersion": "0.6.3",
"latestVersion": "0.6.4",
"status": "available", "status": "available",
"repoVersion": "0.6.3",
"buildTimestamp": 1522881009
"repoVersion": "0.6.4",
"buildTimestamp": 1523319164
} }

+ 5
- 2
manifests/Koralfx-Modules.json View File

@@ -6,5 +6,8 @@
"sourceUrl": "https://github.com/koralfx/Koralfx-Modules/", "sourceUrl": "https://github.com/koralfx/Koralfx-Modules/",
"manualUrl": "https://github.com/koralfx/Koralfx-Modules/blob/master/README.md", "manualUrl": "https://github.com/koralfx/Koralfx-Modules/blob/master/README.md",
"donateUrl": "https://www.paypal.me/koralfx/", "donateUrl": "https://www.paypal.me/koralfx/",
"repoVersion": "0.6.4"
}
"repoVersion": "0.6.7",
"latestVersion": "0.6.7",
"buildTimestamp": 1523318775,
"status": "available"
}

+ 3
- 3
manifests/Ohmer.json View File

@@ -6,8 +6,8 @@
"manualUrl": "https://github.com/DomiKamu/Ohmer-Modules/blob/master/README.md", "manualUrl": "https://github.com/DomiKamu/Ohmer-Modules/blob/master/README.md",
"sourceUrl": "https://github.com/DomiKamu/Ohmer-Modules", "sourceUrl": "https://github.com/DomiKamu/Ohmer-Modules",
"donateUrl": "https://www.paypal.me/DominiqueCAMUS", "donateUrl": "https://www.paypal.me/DominiqueCAMUS",
"latestVersion": "0.6.2",
"repoVersion": "0.6.2",
"latestVersion": "0.6.3",
"repoVersion": "0.6.3",
"status": "available", "status": "available",
"buildTimestamp": 1522751360
"buildTimestamp": 1523319082
} }

+ 5
- 2
manifests/Qwelk.json View File

@@ -4,5 +4,8 @@
"license": "MIT", "license": "MIT",
"manualUrl": "https://github.com/raincheque/qwelk/blob/master/README.md", "manualUrl": "https://github.com/raincheque/qwelk/blob/master/README.md",
"sourceUrl": "https://github.com/raincheque/qwelk", "sourceUrl": "https://github.com/raincheque/qwelk",
"repoVersion": "0.6.0"
}
"repoVersion": "0.6.0",
"latestVersion": "0.6.0",
"buildTimestamp": 1523319042,
"status": "available"
}

+ 1
- 1
repos/BaconMusic

@@ -1 +1 @@
Subproject commit b30dad642d8f57eed78d241a4251f96c1ec3319d
Subproject commit 6f235d1cff2b3d4cc8f334545ad36e8e0cbf1ccc

+ 1
- 1
repos/FrozenWasteland

@@ -1 +1 @@
Subproject commit 135ff85a6199da1cc85a5bf6291c7a9a5039e09a
Subproject commit aa1063616f61be21e338e4d5728a26a735870304

+ 1
- 1
repos/Koralfx-Modules

@@ -1 +1 @@
Subproject commit b0625c1ea1522ec4f8d61c6b3eb7f0d4ae5ef793
Subproject commit 4340525a669294b8b893b951294bf24463ad91f8

+ 1
- 1
repos/Ohmer

@@ -1 +1 @@
Subproject commit 288c90847d4c61c8d09f633db6d3b0b243fa1a8c
Subproject commit 6cbab4d071021e3205c557a6a53067c1691f41a6

+ 11
- 12
scripts/build_updates.py View File

@@ -4,31 +4,30 @@ import time
import os import os




def system(cmd):
if os.system(cmd):
raise Exception(f"Failed command: {cmd}")


def build_mac(slug): 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' 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}' 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): 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' 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}' 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): def build_lin(slug):
env = f'-e RACK_DIR=../../Rack-SDK' env = f'-e RACK_DIR=../../Rack-SDK'
make = f'make -j$(nproc) -C repos/{slug}' 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): def move_package(slug):


Loading…
Cancel
Save