better build

SuperDumbTM · Nov 6, 2023 · 5654cfc · 5654cfc
1 parent 413c2d3
commit 5654cfc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
+    "terminal.integrated.defaultProfile.windows": "Command Prompt",
     "editor.rulers": [
         {
           "column": 80,

diff --git a/src/make.py b/src/make.py
@@ -26,30 +26,32 @@ def build(root: os.PathLike, args: argparse.Namespace):
     if args.release:
         pathlib.Path(os.path.join(root, f"{args.name}")).unlink(True)
 
-    subprocess.run(["pyinstaller",
-                    "-F",
-                    "-w",
-                    "--uac-admin",
-                    os.path.join(root, "src", "main.py"),
-                    f"--icon={args.icon}",
-                    f"-n{args.name}"
-                    ])
+    proc = subprocess.run(["pyinstaller",
+                           "-F",
+                           "-w",
+                           "--uac-admin",
+                           os.path.join(root, "src", "main.py"),
+                           f"--icon={args.icon}",
+                           f"-n{args.name}"
+                           ])
+    print(proc.returncode)
 
     # move the executable to the root directory
     shutil.move(os.path.join(root, "dist", args.name), root)
 
 
-parser = argparse.ArgumentParser()
-parser.add_argument("-r", "--release", action='store_true')
-parser.add_argument("-n", "--name", default=f"{int(time.time())}.exe")
-parser.add_argument("-i",
-                    "--icon",
-                    default=os.path.join(DIR_PIC, "icon.ico"),
-                    )
-args = parser.parse_args()
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-r", "--release", action='store_true')
+    parser.add_argument("-n", "--name", default=f"{int(time.time())}.exe")
+    parser.add_argument("-i",
+                        "--icon",
+                        default=os.path.join(DIR_PIC, "icon.ico"),
+                        )
+    args = parser.parse_args()
 
-if args.release:
-    args.name = "OneClick-Drivers-Installer.exe"
+    if args.release:
+        args.name = "OneClick-Drivers-Installer.exe"
 
-build(DIR_ROOT, args)
-clear_build_files(DIR_ROOT, args)
+    build(DIR_ROOT, args)
+    clear_build_files(DIR_ROOT, args)