<fix> fix build problem

anonymousException · Jun 5, 2024 · eb7bae6 · eb7bae6
1 parent c998a25
commit eb7bae6
Show file tree

Hide file tree

Showing 36 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/Nuitak-publish.yml b/.github/workflows/Nuitak-publish.yml
@@ -32,12 +32,12 @@ jobs:
         standalone: true
         enable-plugins: pyside6
         windows-icon-from-ico: src/main.ico
+        noinclude-data-files: src\resource
 
     - run: mkdir dist\windows
+    - run: xcopy src\resource dist\windows\resource /E
     - run: xcopy build\main.dist dist\windows /E
     - run: xcopy src\supported_language dist\windows\supported_language\
-    - run: xcopy src\unrpyc_python3 dist\windows\unrpyc_python3\
-    - run: xcopy src\unrpyc_python2 dist\windows\unrpyc_python2\
     - run: xcopy src\qm dist\windows\qm\
     - run: xcopy src\custom_engine dist\windows\custom_engine\
     - run: copy src\custom.txt dist\windows\custom.txt

diff --git a/.github/workflows/Pyinstaller-publish.yml b/.github/workflows/Pyinstaller-publish.yml
@@ -24,8 +24,7 @@ jobs:
         spec: "main.spec"
 
     - run: cp -r src/supported_language src/dist/windows/main
-    - run: cp -r src/unrpyc_python3 src/dist/windows/main
-    - run: cp -r src/unrpyc_python2 src/dist/windows/main
+    - run: cp -r src/resource src/dist/windows/main
     - run: cp -r src/qm src/dist/windows/main
     - run: cp src/custom.txt src/dist/windows/main/custom.txt
     - run: cp src/hook_unrpa.rpy src/dist/windows/main/hook_unrpa.rpy

diff --git a/src/game_unpacker_form.py b/src/game_unpacker_form.py
@@ -82,9 +82,9 @@ def run(self):
                                  creationflags=0x08000000, text=True, encoding='utf-8')
             zip_dir(self.dir + '/renpy/common', self.dir + '/common_backup.zip')
             if is_python2(self.path):
-                copy_files_under_directory_to_directory(os.getcwd() + '/unrpyc_python2', self.dir)
+                copy_files_under_directory_to_directory(os.getcwd() + '/resource/unrpyc_python2', self.dir)
             else:
-                copy_files_under_directory_to_directory(os.getcwd() + '/unrpyc_python3', self.dir)
+                copy_files_under_directory_to_directory(os.getcwd() + '/resource/unrpyc_python3', self.dir)
             command = get_unrpyc_command(self.path)
             if self.is_over_write:
                 command = command + ' --clobber'

diff --git a/src/unrpyc_python2/decompiler/__init__.py → ...rce/unrpyc_python2/decompiler/__init__.py b/src/unrpyc_python2/decompiler/__init__.py → ...rce/unrpyc_python2/decompiler/__init__.py
diff --git a/src/unrpyc_python2/decompiler/astdump.py → ...urce/unrpyc_python2/decompiler/astdump.py b/src/unrpyc_python2/decompiler/astdump.py → ...urce/unrpyc_python2/decompiler/astdump.py
diff --git a/...nrpyc_python2/decompiler/atldecompiler.py → ...nrpyc_python2/decompiler/atldecompiler.py b/...nrpyc_python2/decompiler/atldecompiler.py → ...nrpyc_python2/decompiler/atldecompiler.py
diff --git a/src/unrpyc_python2/decompiler/codegen.py → ...urce/unrpyc_python2/decompiler/codegen.py b/src/unrpyc_python2/decompiler/codegen.py → ...urce/unrpyc_python2/decompiler/codegen.py
diff --git a/src/unrpyc_python2/decompiler/magic.py → ...source/unrpyc_python2/decompiler/magic.py b/src/unrpyc_python2/decompiler/magic.py → ...source/unrpyc_python2/decompiler/magic.py
diff --git a/src/unrpyc_python2/decompiler/renpycompat.py → .../unrpyc_python2/decompiler/renpycompat.py b/src/unrpyc_python2/decompiler/renpycompat.py → .../unrpyc_python2/decompiler/renpycompat.py
diff --git a/...yc_python2/decompiler/screendecompiler.py → ...yc_python2/decompiler/screendecompiler.py b/...yc_python2/decompiler/screendecompiler.py → ...yc_python2/decompiler/screendecompiler.py
diff --git a/...nrpyc_python2/decompiler/sl2decompiler.py → ...nrpyc_python2/decompiler/sl2decompiler.py b/...nrpyc_python2/decompiler/sl2decompiler.py → ...nrpyc_python2/decompiler/sl2decompiler.py
diff --git a/..._python2/decompiler/testcasedecompiler.py → ..._python2/decompiler/testcasedecompiler.py b/..._python2/decompiler/testcasedecompiler.py → ..._python2/decompiler/testcasedecompiler.py
diff --git a/src/unrpyc_python2/decompiler/translate.py → ...ce/unrpyc_python2/decompiler/translate.py b/src/unrpyc_python2/decompiler/translate.py → ...ce/unrpyc_python2/decompiler/translate.py
diff --git a/src/unrpyc_python2/decompiler/util.py → ...esource/unrpyc_python2/decompiler/util.py b/src/unrpyc_python2/decompiler/util.py → ...esource/unrpyc_python2/decompiler/util.py
diff --git a/src/unrpyc_python2/deobfuscate.py → src/resource/unrpyc_python2/deobfuscate.py b/src/unrpyc_python2/deobfuscate.py → src/resource/unrpyc_python2/deobfuscate.py
diff --git a/src/unrpyc_python2/unrpyc.py → src/resource/unrpyc_python2/unrpyc.py b/src/unrpyc_python2/unrpyc.py → src/resource/unrpyc_python2/unrpyc.py
diff --git a/src/unrpyc_python3/decompiler/__init__.py → ...rce/unrpyc_python3/decompiler/__init__.py b/src/unrpyc_python3/decompiler/__init__.py → ...rce/unrpyc_python3/decompiler/__init__.py
diff --git a/...piler/__pycache__/__init__.cpython-39.pyc → ...piler/__pycache__/__init__.cpython-39.pyc b/...piler/__pycache__/__init__.cpython-39.pyc → ...piler/__pycache__/__init__.cpython-39.pyc
diff --git a/...mpiler/__pycache__/astdump.cpython-39.pyc → ...mpiler/__pycache__/astdump.cpython-39.pyc b/...mpiler/__pycache__/astdump.cpython-39.pyc → ...mpiler/__pycache__/astdump.cpython-39.pyc
diff --git a/...mpiler/__pycache__/codegen.cpython-39.pyc → ...mpiler/__pycache__/codegen.cpython-39.pyc b/...mpiler/__pycache__/codegen.cpython-39.pyc → ...mpiler/__pycache__/codegen.cpython-39.pyc
diff --git a/...compiler/__pycache__/magic.cpython-39.pyc → ...compiler/__pycache__/magic.cpython-39.pyc b/...compiler/__pycache__/magic.cpython-39.pyc → ...compiler/__pycache__/magic.cpython-39.pyc
diff --git a/...pycache__/screendecompiler.cpython-39.pyc → ...pycache__/screendecompiler.cpython-39.pyc b/...pycache__/screendecompiler.cpython-39.pyc → ...pycache__/screendecompiler.cpython-39.pyc
diff --git a/.../__pycache__/sl2decompiler.cpython-39.pyc → .../__pycache__/sl2decompiler.cpython-39.pyc b/.../__pycache__/sl2decompiler.cpython-39.pyc → .../__pycache__/sl2decompiler.cpython-39.pyc
diff --git a/...cache__/testcasedecompiler.cpython-39.pyc → ...cache__/testcasedecompiler.cpython-39.pyc b/...cache__/testcasedecompiler.cpython-39.pyc → ...cache__/testcasedecompiler.cpython-39.pyc
diff --git a/...iler/__pycache__/translate.cpython-39.pyc → ...iler/__pycache__/translate.cpython-39.pyc b/...iler/__pycache__/translate.cpython-39.pyc → ...iler/__pycache__/translate.cpython-39.pyc
diff --git a/...ecompiler/__pycache__/util.cpython-39.pyc → ...ecompiler/__pycache__/util.cpython-39.pyc b/...ecompiler/__pycache__/util.cpython-39.pyc → ...ecompiler/__pycache__/util.cpython-39.pyc
diff --git a/src/unrpyc_python3/decompiler/astdump.py → ...urce/unrpyc_python3/decompiler/astdump.py b/src/unrpyc_python3/decompiler/astdump.py → ...urce/unrpyc_python3/decompiler/astdump.py
diff --git a/src/unrpyc_python3/decompiler/codegen.py → ...urce/unrpyc_python3/decompiler/codegen.py b/src/unrpyc_python3/decompiler/codegen.py → ...urce/unrpyc_python3/decompiler/codegen.py
diff --git a/src/unrpyc_python3/decompiler/magic.py → ...source/unrpyc_python3/decompiler/magic.py b/src/unrpyc_python3/decompiler/magic.py → ...source/unrpyc_python3/decompiler/magic.py
diff --git a/...yc_python3/decompiler/screendecompiler.py → ...yc_python3/decompiler/screendecompiler.py b/...yc_python3/decompiler/screendecompiler.py → ...yc_python3/decompiler/screendecompiler.py
diff --git a/...nrpyc_python3/decompiler/sl2decompiler.py → ...nrpyc_python3/decompiler/sl2decompiler.py b/...nrpyc_python3/decompiler/sl2decompiler.py → ...nrpyc_python3/decompiler/sl2decompiler.py
diff --git a/..._python3/decompiler/testcasedecompiler.py → ..._python3/decompiler/testcasedecompiler.py b/..._python3/decompiler/testcasedecompiler.py → ..._python3/decompiler/testcasedecompiler.py
diff --git a/src/unrpyc_python3/decompiler/translate.py → ...ce/unrpyc_python3/decompiler/translate.py b/src/unrpyc_python3/decompiler/translate.py → ...ce/unrpyc_python3/decompiler/translate.py
diff --git a/src/unrpyc_python3/decompiler/util.py → ...esource/unrpyc_python3/decompiler/util.py b/src/unrpyc_python3/decompiler/util.py → ...esource/unrpyc_python3/decompiler/util.py
diff --git a/src/unrpyc_python3/deobfuscate.py → src/resource/unrpyc_python3/deobfuscate.py b/src/unrpyc_python3/deobfuscate.py → src/resource/unrpyc_python3/deobfuscate.py
diff --git a/src/unrpyc_python3/unrpyc.py → src/resource/unrpyc_python3/unrpyc.py b/src/unrpyc_python3/unrpyc.py → src/resource/unrpyc_python3/unrpyc.py