2020-02-02 05:25:06 +00:00
|
|
|
import os
|
|
|
|
import shutil
|
|
|
|
import sys
|
|
|
|
import sysconfig
|
|
|
|
from pathlib import Path
|
|
|
|
import cx_Freeze
|
|
|
|
|
|
|
|
is_64bits = sys.maxsize > 2 ** 32
|
|
|
|
|
|
|
|
folder = "exe.{platform}-{version}".format(platform=sysconfig.get_platform(),
|
|
|
|
version=sysconfig.get_python_version())
|
|
|
|
buildfolder = Path("build", folder)
|
|
|
|
sbuildfolder = str(buildfolder)
|
|
|
|
libfolder = Path(buildfolder, "lib")
|
|
|
|
library = Path(libfolder, "library.zip")
|
|
|
|
print("Outputting to: " + str(buildfolder))
|
|
|
|
compress = False
|
2020-04-07 02:18:26 +00:00
|
|
|
icon="icon.ico"
|
2020-05-01 16:51:08 +00:00
|
|
|
|
|
|
|
if os.path.exists("X:/pw.txt"):
|
|
|
|
print("Using signtool")
|
|
|
|
with open("X:/pw.txt") as f:
|
|
|
|
pw = f.read()
|
2020-08-24 02:35:32 +00:00
|
|
|
signtool = r'signtool sign /f X:/_SITS_Zertifikat_.pfx /p ' + pw + r' /fd sha256 /tr http://timestamp.digicert.com/ '
|
2020-05-01 16:51:08 +00:00
|
|
|
else:
|
|
|
|
signtool = None
|
|
|
|
|
2020-02-02 05:25:06 +00:00
|
|
|
from hashlib import sha3_512
|
|
|
|
import base64
|
|
|
|
|
|
|
|
def _threaded_hash(filepath):
|
|
|
|
hasher = sha3_512()
|
|
|
|
hasher.update(open(filepath, "rb").read())
|
|
|
|
return base64.b85encode(hasher.digest()).decode()
|
|
|
|
|
|
|
|
os.makedirs(buildfolder, exist_ok=True)
|
|
|
|
|
|
|
|
def manifest_creation():
|
|
|
|
hashes = {}
|
|
|
|
manifestpath = os.path.join(buildfolder, "manifest.json")
|
|
|
|
from concurrent.futures import ThreadPoolExecutor
|
|
|
|
pool = ThreadPoolExecutor()
|
|
|
|
for dirpath, dirnames, filenames in os.walk(buildfolder):
|
|
|
|
for filename in filenames:
|
|
|
|
path = os.path.join(dirpath, filename)
|
|
|
|
hashes[os.path.relpath(path, start=buildfolder)] = pool.submit(_threaded_hash, path)
|
|
|
|
import json
|
|
|
|
manifest = {"buildtime": buildtime.isoformat(sep=" ", timespec="seconds")}
|
|
|
|
manifest["hashes"] = {path: hash.result() for path, hash in hashes.items()}
|
|
|
|
json.dump(manifest, open(manifestpath, "wt"), indent=4)
|
|
|
|
print("Created Manifest")
|
|
|
|
|
WebUI (#100)
* Object-Oriented base changes for web-ui prep
* remove debug raise
* optimize broadcast to serialize once
* Implement WebUI socket, static assets, and classes
- Still need to wrap logging functions and send output to UI
- UI commands are successfully being sent to the server
* GUI operational. Wrap logging functions, implement server address selection on GUI, automatically launch web browser when client websocket is served
* Update MultiServer status when a user disconnects / reconnects
* Implement colored item and hint checks, improve GUI readability
* Fix improper formatting on received items
* Update SNES connection status on disconnect / reconnect. Implement itemFound, prevent accidentally printing JS objects
* Minor text change for itemFound
* Fixed a very wrong comment
* Fixed client commands not working, fixed un-helpful error messages appearing in GUI
* Fix a bug causing a failure to connect to a multiworld server if a previously existing cached address was present and the client was loaded without an address passed in
* Convert WebUI to React /w Redux. WebSocket communications not yet operational.
* WebUI fully converted to React / Redux.
- Websocket communication operational
- Added a button to connect to the multiserver which appears only when a SNES is connected and a server connection is not active
* Restore some features lost in WebUI
- Restore (found) notification on hints if the item has already been obtained
- Restore (x/y) indicator on received items, which indicates the number of items the client is waiting to receive from the client in a queue
* Fix a grammatical UI big causing player names to show only an apostrophe when possessive
* Add support for multiple SNES Devices, and switching between them
* freeze support for client
* make sure flask works when frozen
* UI Improvements
- Hint messages now actually show a found status via ✔ and ❌ emoji
- Active player name is always a different color than other players (orange for now)
- Add a toggle to show only entries relevant to the active player
- Added a WidgetArea
- Added a notes widget
* Received items now marked as relevant
* Include production build for deployment
* Notes now survive a browser close. Minimum width applied to monitor to prevent CSS issues.
* include webUi folder in setup.py
* Bugfixes for Monitor
- Fix a bug causing the monitor window to grow beyond it's intended content limit
- Reduced monitor content limit to 200 items
- Ensured each monitor entry has a unique key
* Prevent eslint from yelling at me about stupid things
* Add button to collapse sidebar, press enter on empty server input to disconnect on purpose
* WebUI is now aware of client disconnect, message log limit increased to 350, fix !missing output
* Update WebUI to v2.2.1
- Added color to WebUI for entrance-span
- Make !missing show total count at bottom of list to match /missing behavior
* Fix a bug causing clients version <= 2.2.0 to crash when anyone asks for a hint
- Also fix a bug in the WebUI causing the entrance location to always show as "somewhere"
* Update WebUI color palette (this cost me $50)
* allow text console input alongside web-ui
* remove Flask
a bit overkill for what we're doing
* remove jinja2
* Update WebUI to work with new hosting mechanism
* with flask gone, we no longer need subprocess shenanigans
* If multiple web ui clients try to run, at least present a working console
* Update MultiClient and WebUI to handle multiple clients simultaneously.
- The port on which the websocket for the WebUI is hosted is not chosen randomly from 5000 - 5999. This port is passed to the browser so it knows which MultiClient to connect to
- Removed failure condition if a web server is already running, as there is no need to run more than one web server on a single system. If an exception is thrown while attempting to launch a web server, a check is made for the port being unavailable. If the port is unavailable, it probably means the user is launching a second MultiClient. A web browser is then opened with a connection to the correct webui_socket_port.
- Add a /web command to the MultiClient to repoen the appropriate browser window and get params in case a user accidentally closes the tab
* Use proper name for WebUI
* move webui into /data with other data files
* make web ui optional
This is mostly for laptop users wanting to preserve some battery, should not be needed outside of that.
* fix direct server start
* re-add connection timer
* fix indentation
Co-authored-by: Chris <chris@legendserver.info>
2020-06-03 19:29:43 +00:00
|
|
|
|
2020-02-02 21:36:55 +00:00
|
|
|
scripts = {"MultiClient.py" : "BerserkerMultiClient",
|
|
|
|
"MultiMystery.py" : "BerserkerMultiMystery",
|
|
|
|
"MultiServer.py" : "BerserkerMultiServer",
|
|
|
|
"gui.py" : "BerserkerMultiCreator",
|
|
|
|
"Mystery.py" : "BerserkerMystery"}
|
|
|
|
|
|
|
|
exes = []
|
|
|
|
|
|
|
|
for script, scriptname in scripts.items():
|
|
|
|
exes.append(cx_Freeze.Executable(
|
|
|
|
script=script,
|
2020-04-07 02:18:26 +00:00
|
|
|
targetName=scriptname + ("" if sys.platform == "linux" else ".exe"),
|
WebUI (#100)
* Object-Oriented base changes for web-ui prep
* remove debug raise
* optimize broadcast to serialize once
* Implement WebUI socket, static assets, and classes
- Still need to wrap logging functions and send output to UI
- UI commands are successfully being sent to the server
* GUI operational. Wrap logging functions, implement server address selection on GUI, automatically launch web browser when client websocket is served
* Update MultiServer status when a user disconnects / reconnects
* Implement colored item and hint checks, improve GUI readability
* Fix improper formatting on received items
* Update SNES connection status on disconnect / reconnect. Implement itemFound, prevent accidentally printing JS objects
* Minor text change for itemFound
* Fixed a very wrong comment
* Fixed client commands not working, fixed un-helpful error messages appearing in GUI
* Fix a bug causing a failure to connect to a multiworld server if a previously existing cached address was present and the client was loaded without an address passed in
* Convert WebUI to React /w Redux. WebSocket communications not yet operational.
* WebUI fully converted to React / Redux.
- Websocket communication operational
- Added a button to connect to the multiserver which appears only when a SNES is connected and a server connection is not active
* Restore some features lost in WebUI
- Restore (found) notification on hints if the item has already been obtained
- Restore (x/y) indicator on received items, which indicates the number of items the client is waiting to receive from the client in a queue
* Fix a grammatical UI big causing player names to show only an apostrophe when possessive
* Add support for multiple SNES Devices, and switching between them
* freeze support for client
* make sure flask works when frozen
* UI Improvements
- Hint messages now actually show a found status via ✔ and ❌ emoji
- Active player name is always a different color than other players (orange for now)
- Add a toggle to show only entries relevant to the active player
- Added a WidgetArea
- Added a notes widget
* Received items now marked as relevant
* Include production build for deployment
* Notes now survive a browser close. Minimum width applied to monitor to prevent CSS issues.
* include webUi folder in setup.py
* Bugfixes for Monitor
- Fix a bug causing the monitor window to grow beyond it's intended content limit
- Reduced monitor content limit to 200 items
- Ensured each monitor entry has a unique key
* Prevent eslint from yelling at me about stupid things
* Add button to collapse sidebar, press enter on empty server input to disconnect on purpose
* WebUI is now aware of client disconnect, message log limit increased to 350, fix !missing output
* Update WebUI to v2.2.1
- Added color to WebUI for entrance-span
- Make !missing show total count at bottom of list to match /missing behavior
* Fix a bug causing clients version <= 2.2.0 to crash when anyone asks for a hint
- Also fix a bug in the WebUI causing the entrance location to always show as "somewhere"
* Update WebUI color palette (this cost me $50)
* allow text console input alongside web-ui
* remove Flask
a bit overkill for what we're doing
* remove jinja2
* Update WebUI to work with new hosting mechanism
* with flask gone, we no longer need subprocess shenanigans
* If multiple web ui clients try to run, at least present a working console
* Update MultiClient and WebUI to handle multiple clients simultaneously.
- The port on which the websocket for the WebUI is hosted is not chosen randomly from 5000 - 5999. This port is passed to the browser so it knows which MultiClient to connect to
- Removed failure condition if a web server is already running, as there is no need to run more than one web server on a single system. If an exception is thrown while attempting to launch a web server, a check is made for the port being unavailable. If the port is unavailable, it probably means the user is launching a second MultiClient. A web browser is then opened with a connection to the correct webui_socket_port.
- Add a /web command to the MultiClient to repoen the appropriate browser window and get params in case a user accidentally closes the tab
* Use proper name for WebUI
* move webui into /data with other data files
* make web ui optional
This is mostly for laptop users wanting to preserve some battery, should not be needed outside of that.
* fix direct server start
* re-add connection timer
* fix indentation
Co-authored-by: Chris <chris@legendserver.info>
2020-06-03 19:29:43 +00:00
|
|
|
icon=icon,
|
|
|
|
))
|
2020-02-02 05:25:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
import datetime
|
|
|
|
|
2020-07-09 14:16:31 +00:00
|
|
|
buildtime = datetime.datetime.utcnow()
|
2020-02-02 05:25:06 +00:00
|
|
|
|
|
|
|
cx_Freeze.setup(
|
2020-04-07 02:18:26 +00:00
|
|
|
name="BerserkerMultiWorld",
|
2020-02-02 05:25:06 +00:00
|
|
|
version=f"{buildtime.year}.{buildtime.month}.{buildtime.day}.{buildtime.hour}",
|
2020-04-07 02:18:26 +00:00
|
|
|
description="BerserkerMultiWorld",
|
2020-02-02 21:36:55 +00:00
|
|
|
executables=exes,
|
2020-02-02 05:25:06 +00:00
|
|
|
options={
|
|
|
|
"build_exe": {
|
2020-08-24 02:35:32 +00:00
|
|
|
"includes": [],
|
2020-02-02 05:25:06 +00:00
|
|
|
"zip_include_packages": ["*"],
|
2020-08-25 11:22:47 +00:00
|
|
|
"zip_exclude_packages": [],
|
2020-02-02 05:25:06 +00:00
|
|
|
"include_files": [],
|
|
|
|
"include_msvcr": True,
|
|
|
|
"replace_paths": [("*", "")],
|
|
|
|
"optimize": 2,
|
|
|
|
"build_exe": buildfolder
|
|
|
|
},
|
|
|
|
},
|
|
|
|
)
|
|
|
|
|
|
|
|
|
2020-08-25 11:22:47 +00:00
|
|
|
def installfile(path, keep_content=False):
|
2020-02-02 05:25:06 +00:00
|
|
|
lbuildfolder = buildfolder
|
|
|
|
print('copying', path, '->', lbuildfolder)
|
|
|
|
if path.is_dir():
|
|
|
|
lbuildfolder /= path.name
|
2020-08-25 11:22:47 +00:00
|
|
|
if lbuildfolder.is_dir() and not keep_content:
|
2020-02-02 05:25:06 +00:00
|
|
|
shutil.rmtree(lbuildfolder)
|
2020-08-25 11:22:47 +00:00
|
|
|
shutil.copytree(path, lbuildfolder, dirs_exist_ok=True)
|
2020-02-02 05:25:06 +00:00
|
|
|
elif path.is_file():
|
|
|
|
shutil.copy(path, lbuildfolder)
|
|
|
|
else:
|
|
|
|
print('Warning,', path, 'not found')
|
|
|
|
|
|
|
|
|
2020-02-22 19:04:22 +00:00
|
|
|
extra_data = ["LICENSE", "data", "EnemizerCLI", "host.yaml", "QUsb2Snes", "meta.yaml"]
|
2020-02-02 05:25:06 +00:00
|
|
|
|
|
|
|
for data in extra_data:
|
|
|
|
installfile(Path(data))
|
|
|
|
|
2020-04-11 14:31:40 +00:00
|
|
|
os.makedirs(buildfolder / "Players", exist_ok=True)
|
2020-08-22 23:03:09 +00:00
|
|
|
shutil.copyfile("playerSettings.yaml", buildfolder / "Players" / "playerSettings.yaml")
|
2020-02-02 05:25:06 +00:00
|
|
|
|
2020-04-11 14:36:13 +00:00
|
|
|
qusb2sneslog = buildfolder / "QUsb2Snes" / "log.txt"
|
|
|
|
if os.path.exists(qusb2sneslog):
|
|
|
|
os.remove(qusb2sneslog)
|
|
|
|
|
2020-05-01 16:51:08 +00:00
|
|
|
if signtool:
|
|
|
|
for exe in exes:
|
|
|
|
print(f"Signing {exe.targetName}")
|
|
|
|
os.system(signtool+exe.targetName)
|
|
|
|
|
|
|
|
|
2020-02-02 05:25:06 +00:00
|
|
|
manifest_creation()
|