diff --git a/.gitignore b/.gitignore index 195f5e4..19e81cd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,11 @@ tmp/ bak/ venv*/ .vscode/ -build/ +build*/ +*.xcf conf.json* log/ module/ -dependencies/ \ No newline at end of file +dependencies/ +depends/ +logo_old.ico diff --git a/celeryMath/gui/build.py b/celeryMath/gui/build.py new file mode 100644 index 0000000..4cba79e --- /dev/null +++ b/celeryMath/gui/build.py @@ -0,0 +1,68 @@ +""" +Description: build script, using nuitka +Author: Rainyl +LastEditTime: 2022-08-04 17:33:48 +""" +from argparse import ArgumentParser +import os +import shutil + +CPUS = os.cpu_count() + +def main(version: str = "0.1", enable_debug=False, jobs=CPUS): + std_out = "--force-stdout-spec=celerymath_out.log " + std_err = "--force-stderr-spec=celerymath_error.log " + disable_console = "--windows-disable-console " + build_dir = "build" + debug = "" + if enable_debug: + disable_console = "" + build_dir = "build_debug" + std_out = "" + std_err = "" + # debug = "--debug " + cmd = ( + "nuitka " + "--clang " + # "--mingw64 " + # "--recompile-c-only " + "--standalone " + f"{debug}" + f"--output-dir={build_dir} " + "--follow-imports " + f"{disable_console}" + f"{std_out}" + f"{std_err}" + f"--jobs={jobs} " + "--windows-file-description=CeleryMath " + "--windows-company-name=rainyl@MODCT.org " + f"--windows-product-version={version} " + f"""--windows-product-name="CeleryMath_v{version}" """ + # "--show-progress " + # "--show-memory " + "--plugin-enable=pyside6 " + "--plugin-enable=numpy " + # "--plugin-enable=matplotlib " + # "--plugin-enable=multiprocessing " + # "--plugin-enable=upx " + "--windows-icon-from-ico=resources/icons/logo.ico " + "./celeryMath.py " + ) + + os.system(cmd) + + if not os.path.exists(f"{build_dir}/celeryMath.build/conf"): + os.mkdir(f"{build_dir}/celeryMath.build/conf") + shutil.copy( + "depends/onnxruntime_providers_shared.dll", + f"{build_dir}/celeryMath.build/onnxruntime/capi/", + ) + + +if __name__ == "__main__": + parser = ArgumentParser() + parser.add_argument("-v", dest="version", type=str, default="0.1") + parser.add_argument("--debug", dest="debug", action="store_true", help="enable build for debug") + parser.add_argument("-j", dest="jobs", type=int, default=CPUS) + args = parser.parse_args() + main(version=args.version, enable_debug=args.debug, jobs=args.jobs) diff --git a/celeryMath/gui/build_nuitka.ps1 b/celeryMath/gui/build_nuitka.ps1 deleted file mode 100644 index 1128159..0000000 --- a/celeryMath/gui/build_nuitka.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -nuitka --mingw64 --standalone --output-dir=build ` ---show-progress --show-memory ` ---plugin-enable=pyside6 ` ---plugin-enable=numpy ` ---nofollow-import-to=matplotlib ` ---nofollow-import-to=PySide6.QtQml,PySide6.QtQuick ` ---nofollow-import-to=black ` ---windows-icon-from-ico="resources/icons/logo.ico" ` ---windows-company-name="rainyl@MODCT.org" ` ---windows-product-name="CeleryMath" ` ---windows-file-version="0.1.2.0" ` ---windows-product-version="0.1.2.0" ` ---windows-file-description="CeleryMath" ` ---windows-disable-console ` -./celeryMath.py - -New-Item build/celeryMath.dist/conf -ItemType Directory -ea 0 -New-Item build/celeryMath.dist/log -ItemType Directory -ea 0 diff --git a/celeryMath/gui/resources/icons/logo.ico b/celeryMath/gui/resources/icons/logo.ico index db2df68..9dda813 100644 Binary files a/celeryMath/gui/resources/icons/logo.ico and b/celeryMath/gui/resources/icons/logo.ico differ diff --git a/celeryMath/gui/resources/icons/logo.png b/celeryMath/gui/resources/icons/logo.png index c81c6b4..54990fa 100644 Binary files a/celeryMath/gui/resources/icons/logo.png and b/celeryMath/gui/resources/icons/logo.png differ diff --git a/celeryMath/gui/resources/icons/logo.svg b/celeryMath/gui/resources/icons/logo.svg new file mode 100644 index 0000000..55e3b9b --- /dev/null +++ b/celeryMath/gui/resources/icons/logo.svg @@ -0,0 +1,127 @@ + + + +fx