The Wait Is Over. (#49)
* Move submodule to Godot * Update submodule AGAIN. * Update project files. * Remove WearableAnimatedSprite from prototypes. * Remove content repo resource copier. * Update submodule. * Fix resource handling. * Content.Client compiles by commenting out hands GUI. * Update submodule. * Fix prototype textures and update submodule. * Update Submodule. * Update submodule SOME MORE! * Random WiP shit I guess * Make omnisharp not choke on buildchecker. * Update submodule. * Highly WiP broken HandsGui code. * Ok maybe let's not insult omnisharp. * Fix annoying Omnisharp warning. * Update submodule. * Update submodule. * Hey I forgot to push this but it didn't conflict! * Fix hands GUI on godot. * Update submodule. * Obligatory submodule update. * Work on exports. * Work on exports. * Update submodule. * Update submodule. * Fix dumb case mismatch between content and engine * work pls. * This maybe. * Now! * Update submodule. * update submodule. * Some WiP work on exporting aaah. * OK READY FOR THE BUILDS SERVER. * Probably should've made those commits in a different order. * DO THE THING * update submodule. * Updates for effects system. * Update submodule. * Make file/line numbers show up on Windows Godot. * Set submodule to master.
This commit is contained in:
Pieter-Jan Briers
committed by
GitHub
GitHub
parent
128728bfcb
commit
6704245a41
@@ -21,30 +21,66 @@ except ImportError:
|
||||
Fore = ColorDummy()
|
||||
Style = ColorDummy()
|
||||
|
||||
p = os.path.join
|
||||
|
||||
SHARED_IGNORED_RESOURCES = {
|
||||
"ss13model.7z",
|
||||
"ResourcePack.zip",
|
||||
"buildResourcePack.py",
|
||||
"CONTENT_GOES_HERE"
|
||||
}
|
||||
CLIENT_IGNORED_RESOURCES = {
|
||||
"Maps",
|
||||
"emotes.xml"
|
||||
}
|
||||
SERVER_IGNORED_RESOURCES = {
|
||||
"Textures",
|
||||
"Fonts"
|
||||
}
|
||||
|
||||
GODOT = None
|
||||
|
||||
def main():
|
||||
global GODOT
|
||||
parser = argparse.ArgumentParser(
|
||||
description="Packages the SS14 content repo for release on all platforms.")
|
||||
parser.add_argument("--platform",
|
||||
"-p",
|
||||
action="store",
|
||||
choices=["windows", "mac", "linux"],
|
||||
nargs="*",
|
||||
help="Which platform to build for. If not provided, all platforms will be built")
|
||||
|
||||
parser.add_argument("--godot",
|
||||
action="store",
|
||||
help="Path to the Godot executable used for exporting.")
|
||||
|
||||
parser.add_argument("--windows-godot-build",
|
||||
action="store")
|
||||
|
||||
args = parser.parse_args()
|
||||
platforms = args.platform
|
||||
GODOT = args.godot
|
||||
if not GODOT:
|
||||
print("No Godot executable passed.")
|
||||
exit(1)
|
||||
|
||||
if not platforms:
|
||||
platforms = ["windows", "mac", "linux"]
|
||||
|
||||
if os.path.exists("release"):
|
||||
print(Fore.BLUE+Style.DIM + "Cleaning old release packages (release/)..." + Style.RESET_ALL)
|
||||
print(Fore.BLUE+Style.DIM +
|
||||
"Cleaning old release packages (release/)..." + Style.RESET_ALL)
|
||||
shutil.rmtree("release")
|
||||
|
||||
os.mkdir("release")
|
||||
|
||||
if "windows" in platforms:
|
||||
wipe_bin()
|
||||
build_windows()
|
||||
if not args.windows_godot_build:
|
||||
print("No --window-godot-build passed")
|
||||
exit(1)
|
||||
build_windows(args.windows_godot_build)
|
||||
|
||||
if "linux" in platforms:
|
||||
wipe_bin()
|
||||
@@ -54,58 +90,85 @@ def main():
|
||||
wipe_bin()
|
||||
build_macos()
|
||||
|
||||
|
||||
def wipe_bin():
|
||||
print(Fore.BLUE + Style.DIM +
|
||||
"Clearing old build artifacts (if any)..." + Style.RESET_ALL)
|
||||
if os.path.exists(p("engine", "bin")):
|
||||
shutil.rmtree(p("engine", "bin"))
|
||||
|
||||
if os.path.exists("bin"):
|
||||
print(Fore.BLUE + Style.DIM + "Clearing old build artifacts..." + Style.RESET_ALL)
|
||||
shutil.rmtree("bin")
|
||||
|
||||
def build_windows():
|
||||
|
||||
def build_windows(godot_build):
|
||||
# Run a full build.
|
||||
print(Fore.GREEN + "Building project for Windows x86..." + Style.RESET_ALL)
|
||||
print(Fore.GREEN + "Building project for Windows x64..." + Style.RESET_ALL)
|
||||
subprocess.run(["msbuild",
|
||||
"SpaceStation14Content.sln",
|
||||
"/m",
|
||||
"/p:Configuration=Release",
|
||||
"/p:Platform=x86",
|
||||
"/p:Platform=x64",
|
||||
"/nologo",
|
||||
"/v:m",
|
||||
"/p:TargetOS=Windows",
|
||||
"/t:Rebuild"
|
||||
], check=True)
|
||||
|
||||
# Package client.
|
||||
print(Fore.GREEN + "Packaging Windows x86 client..." + Style.RESET_ALL)
|
||||
package_zip(os.path.join("bin", "Client"),
|
||||
os.path.join("release", "SS14.Client_windows_x86.zip"))
|
||||
print(Fore.GREEN + "Packaging Windows x64 client..." + Style.RESET_ALL)
|
||||
|
||||
print(Fore.GREEN + "Packaging Windows x86 server..." + Style.RESET_ALL)
|
||||
package_zip(os.path.join("bin", "Server"),
|
||||
os.path.join("release", "SS14.Server_windows_x86.zip"))
|
||||
os.makedirs("bin/win_export", exist_ok=True)
|
||||
subprocess.run([GODOT,
|
||||
"--verbose",
|
||||
"--export-debug",
|
||||
"win",
|
||||
"../../bin/win_export/SS14.Client.exe"],
|
||||
cwd="engine/SS14.Client.Godot")
|
||||
|
||||
client_zip = zipfile.ZipFile(p("release", "SS14.Client_Windows_x64.zip"), "w", compression=zipfile.ZIP_DEFLATED)
|
||||
client_zip.writestr("spess.bat", "cd godot\ncall SS14.Client.exe --path SS14.Client.Godot")
|
||||
client_zip.write(p("bin", "win_export"), "godot")
|
||||
client_zip.write(p("bin", "win_export", "SS14.Client.pck"), p("godot", "SS14.Client.pck"))
|
||||
copy_dir_into_zip(godot_build, "godot", client_zip)
|
||||
copy_dir_into_zip(p("engine", "bin", "Client"), p("bin", "Client"), client_zip)
|
||||
copy_resources(p("bin", "Client", "Resources"), client_zip, server=False)
|
||||
client_zip.close()
|
||||
|
||||
print(Fore.GREEN + "Packaging Windows x64 server..." + Style.RESET_ALL)
|
||||
server_zip = zipfile.ZipFile(p("release", "SS14.Server_Windows_x64.zip"), "w", compression=zipfile.ZIP_DEFLATED)
|
||||
copy_dir_into_zip(p("engine", "bin", "Server"), "", server_zip)
|
||||
copy_resources(p("Resources"), server_zip, server=True)
|
||||
server_zip.close()
|
||||
|
||||
|
||||
def build_linux():
|
||||
print(Fore.GREEN + "Building project for Linux x86..." + Style.RESET_ALL)
|
||||
print(Fore.GREEN + "Building project for Linux x64..." + Style.RESET_ALL)
|
||||
subprocess.run(["msbuild",
|
||||
"SpaceStation14Content.sln",
|
||||
"/m",
|
||||
"/p:Configuration=Release",
|
||||
"/p:Platform=x86",
|
||||
"/p:Platform=x64",
|
||||
"/nologo",
|
||||
"/v:m",
|
||||
"/p:TargetOS=Linux",
|
||||
"/t:Rebuild"
|
||||
], check=True)
|
||||
], check=True)
|
||||
|
||||
# NOTE: Temporarily disabled because I can't test it.
|
||||
# Package client.
|
||||
print(Fore.GREEN + "Packaging Linux x86 client..." + Style.RESET_ALL)
|
||||
package_zip(os.path.join("bin", "Client"), os.path.join("release", "SS14.Client_linux_x86.zip"))
|
||||
#print(Fore.GREEN + "Packaging Linux x64 client..." + Style.RESET_ALL)
|
||||
# package_zip(p("bin", "Client"), p(
|
||||
# "release", "SS14.Client_linux_x64.zip"))
|
||||
|
||||
print(Fore.GREEN + "Packaging Linux x64 server..." + Style.RESET_ALL)
|
||||
server_zip = zipfile.ZipFile(p("release", "SS14.Server_Linux_x64.zip"), "w", compression=zipfile.ZIP_DEFLATED)
|
||||
copy_dir_into_zip(p("engine", "bin", "Server"), "", server_zip)
|
||||
copy_resources(p("Resources"), server_zip, server=True)
|
||||
server_zip.close()
|
||||
|
||||
print(Fore.GREEN + "Packaging Linux x86 server..." + Style.RESET_ALL)
|
||||
package_zip(os.path.join("bin", "Server"), os.path.join("release", "SS14.Server_linux_x86.zip"))
|
||||
|
||||
|
||||
def build_macos():
|
||||
# Haha this is gonna suck.
|
||||
print(Fore.GREEN + "Building project for MacOS x64..." + Style.RESET_ALL)
|
||||
subprocess.run(["msbuild",
|
||||
"SpaceStation14Content.sln",
|
||||
@@ -116,56 +179,95 @@ def build_macos():
|
||||
"/v:m",
|
||||
"/p:TargetOS=MacOS",
|
||||
"/t:Rebuild"
|
||||
], check=True)
|
||||
], check=True)
|
||||
|
||||
print(Fore.GREEN + "Packaging MacOS x64 client..." + Style.RESET_ALL)
|
||||
# Client has to go in an app bundle.
|
||||
bundle = os.path.join("bin", "app", "Space Station 14.app")
|
||||
shutil.copytree(os.path.join("BuildFiles", "Mac", "Space Station 14.app"),
|
||||
bundle)
|
||||
subprocess.run(GODOT,
|
||||
"--verbose",
|
||||
"--export-debug",
|
||||
"mac",
|
||||
"../../release/mac_export.zip",
|
||||
cwd="engine/SS14.Client.Godot",
|
||||
check=True)
|
||||
|
||||
_copytree(os.path.join("bin", "Client"),
|
||||
os.path.join(bundle, "Contents", "MacOS"))
|
||||
_copytree(p("engine", "bin", "Client"),
|
||||
p(bundle, "Contents", "MacOS", "bin", "Client"))
|
||||
|
||||
package_zip(os.path.join("bin", "app"),
|
||||
os.path.join("release", "SS14.Client_MacOS.zip"))
|
||||
copy_resources(p(bundle, "Contents",
|
||||
"MacOS", "bin", "Client", "Resources"), server=False)
|
||||
|
||||
os.makedirs(p(bundle, "Contents", "MacOS",
|
||||
"SS14.Client.Godot"), exist_ok=True)
|
||||
|
||||
_copytree(p("engine", "SS14.Client.Godot"),
|
||||
p(bundle, "Contents", "MacOS", "SS14.Client.Godot"))
|
||||
|
||||
package_zip(p("bin", "mac_app"),
|
||||
p("release", "SS14.Client_MacOS.zip"))
|
||||
|
||||
print(Fore.GREEN + "Packaging MacOS x64 server..." + Style.RESET_ALL)
|
||||
package_zip(os.path.join("bin", "Server"),
|
||||
os.path.join("release", "SS14.Server_MacOS.zip"))
|
||||
copy_resources(p("engine", "bin",
|
||||
"Server", "Resources"), server=True)
|
||||
|
||||
package_zip(p("engine", "bin", "Server"),
|
||||
p("release", "SS14.Server_MacOS.zip"))
|
||||
|
||||
|
||||
def copy_resources(target, zipf, server):
|
||||
# Content repo goes FIRST so that it won't override engine files as that's forbidden.
|
||||
do_resource_copy(target, "Resources", zipf, server)
|
||||
do_resource_copy(target, p("engine", "Resources"), zipf, server)
|
||||
|
||||
|
||||
def do_resource_copy(target, source, zipf, server):
|
||||
for filename in os.listdir(source):
|
||||
if filename in SHARED_IGNORED_RESOURCES \
|
||||
or filename in (SERVER_IGNORED_RESOURCES if server else CLIENT_IGNORED_RESOURCES):
|
||||
continue
|
||||
|
||||
path = p(source, filename)
|
||||
target_path = p(target, filename)
|
||||
if os.path.isdir(path):
|
||||
copy_dir_into_zip(path, target_path, zipf)
|
||||
|
||||
# Hack copied from Stack Overflow to get around the fact that
|
||||
# shutil.copytree doesn't allow copying into existing directories.
|
||||
def _copytree(src, dst, symlinks=False, ignore=None):
|
||||
for item in os.listdir(src):
|
||||
s = os.path.join(src, item)
|
||||
d = os.path.join(dst, item)
|
||||
if os.path.isdir(s):
|
||||
shutil.copytree(s, d, symlinks, ignore)
|
||||
else:
|
||||
shutil.copy2(s, d)
|
||||
zipf.write(path, target_path)
|
||||
|
||||
def package_zip(directory, zipname):
|
||||
with zipfile.ZipFile(zipname, "w", zipfile.ZIP_DEFLATED) as zipf:
|
||||
for dirs, _, files in os.walk(directory):
|
||||
relpath = os.path.relpath(dirs, directory)
|
||||
if relpath != ".":
|
||||
# Write directory node except for root level.
|
||||
zipf.write(dirs, relpath)
|
||||
|
||||
for filename in files:
|
||||
zippath = os.path.join(relpath, filename)
|
||||
filepath = os.path.join(dirs, filename)
|
||||
def zip_entry_exists(zipf, name):
|
||||
try:
|
||||
# Trick ZipInfo into sanitizing the name for us so this awful module stops spewing warnings.
|
||||
zinfo = zipfile.ZipInfo.from_file("Resources", name)
|
||||
zipf.getinfo(zinfo.filename)
|
||||
except KeyError:
|
||||
return False
|
||||
return True
|
||||
|
||||
message = "{dim}{diskroot}{sep}{zipfile}{dim} -> {ziproot}{sep}{zipfile}".format(
|
||||
sep=os.sep + Style.NORMAL,
|
||||
dim=Style.DIM,
|
||||
diskroot=directory,
|
||||
ziproot=zipname,
|
||||
zipfile=os.path.normpath(zippath))
|
||||
|
||||
print(Fore.CYAN + message + Style.RESET_ALL)
|
||||
zipf.write(filepath, zippath)
|
||||
def copy_dir_into_zip(directory, basepath, zipf):
|
||||
if basepath and not zip_entry_exists(zipf, basepath):
|
||||
zipf.write(directory, basepath)
|
||||
|
||||
for root, _, files in os.walk(directory):
|
||||
relpath = os.path.relpath(root, directory)
|
||||
if relpath != "." and not zip_entry_exists(zipf, p(basepath, relpath)):
|
||||
zipf.write(root, p(basepath, relpath))
|
||||
|
||||
for filename in files:
|
||||
zippath = p(basepath, relpath, filename)
|
||||
filepath = p(root, filename)
|
||||
|
||||
message = "{dim}{diskroot}{sep}{zipfile}{dim} -> {ziproot}{sep}{zipfile}".format(
|
||||
sep=os.sep + Style.NORMAL,
|
||||
dim=Style.DIM,
|
||||
diskroot=directory,
|
||||
ziproot=zipf.filename,
|
||||
zipfile=os.path.normpath(zippath))
|
||||
|
||||
print(Fore.CYAN + message + Style.RESET_ALL)
|
||||
zipf.write(filepath, zippath)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
Reference in New Issue
Block a user