Group AppRun v2 related code

appimagebuilder/commands/setup_runtime.py

@@ -9,7 +9,7 @@
 #
 #  The above copyright notice and this permission notice shall be included in
 #  all copies or substantial portions of the Software.
-from appimagebuilder.modules.setup.apprun2 import AppRunV2Setup
+from appimagebuilder.modules.setup.apprun_2.apprun2 import AppRunV2Setup
 from appimagebuilder.commands.command import Command
 
 

appimagebuilder/modules/setup/apprun_2/__init__.py

@@ -0,0 +1,11 @@
+#  Copyright  2022 Alexis Lopez Zubieta
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a
+#  copy of this software and associated documentation files (the "Software"),
+#  to deal in the Software without restriction, including without limitation the
+#  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+#  sell copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.

appimagebuilder/modules/setup/apprun2.py → appimagebuilder/modules/setup/apprun_2/apprun2.py

@@ -1,3 +1,15 @@
+#  Copyright  2022 Alexis Lopez Zubieta
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a
+#  copy of this software and associated documentation files (the "Software"),
+#  to deal in the Software without restriction, including without limitation the
+#  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+#  sell copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+
 #  Copyright  2021 Alexis Lopez Zubieta
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a
@@ -22,13 +34,13 @@
 
 from appimagebuilder.utils import elf, file_utils
 from appimagebuilder.utils.finder import Finder
-from . import helpers
-from .apprun_binaries_resolver import AppRunBinariesResolver
-from .environment import Environment
-from .executables import BinaryExecutable, InterpretedExecutable
-from .executables_patcher import ExecutablesPatcher
-from .executables_scanner import ExecutablesScanner
-from ...context import Context
+from appimagebuilder.modules.setup import helpers
+from appimagebuilder.modules.setup.apprun_binaries_resolver import AppRunBinariesResolver
+from appimagebuilder.modules.setup.environment import Environment
+from appimagebuilder.modules.setup.apprun_2.executables import BinaryExecutable, InterpretedExecutable
+from appimagebuilder.modules.setup.apprun_2.executables_patcher import ExecutablesPatcher
+from appimagebuilder.modules.setup.apprun_2.executables_scanner import ExecutablesScanner
+from appimagebuilder.context import Context
 
 
 class AppRunV2SetupError(RuntimeError):

appimagebuilder/modules/setup/executables_scanner.py → appimagebuilder/modules/setup/apprun_2/executables_scanner.py

@@ -1,3 +1,15 @@
+#  Copyright  2022 Alexis Lopez Zubieta
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a
+#  copy of this software and associated documentation files (the "Software"),
+#  to deal in the Software without restriction, including without limitation the
+#  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+#  sell copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+
 #  Copyright  2020 Alexis Lopez Zubieta
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a
@@ -12,7 +24,7 @@
 import logging
 import os
 
-from appimagebuilder.modules.setup.executables import (
+from appimagebuilder.modules.setup.apprun_2.executables import (
     Executable,
     BinaryExecutable,
     InterpretedExecutable,

tests/builder/runtime/test_executables.py

@@ -13,7 +13,7 @@
 from pathlib import Path
 from unittest import TestCase
 
-from appimagebuilder.modules.setup.executables import (
+from appimagebuilder.modules.setup.apprun_2.executables import (
     InterpretedExecutable,
 )
 

tests/builder/runtime/test_executables_scanner.py

@@ -14,11 +14,11 @@
 from pathlib import Path
 from unittest import TestCase
 
-from appimagebuilder.modules.setup.executables import (
+from appimagebuilder.modules.setup.apprun_2.executables import (
     BinaryExecutable,
     InterpretedExecutable,
 )
-from appimagebuilder.modules.setup.executables_scanner import ExecutablesScanner
+from appimagebuilder.modules.setup.apprun_2.executables_scanner import ExecutablesScanner
 from appimagebuilder.utils.finder import Finder
 
 

tests/modules/setup/test_executables_patcher.py

@@ -3,7 +3,7 @@
 import tempfile
 import unittest
 
-from appimagebuilder.modules.setup.executables_patcher import ExecutablesPatcher
+from appimagebuilder.modules.setup.apprun_2.executables_patcher import ExecutablesPatcher
 
 
 class TestExecutablesPatcher(unittest.TestCase):

tests/modules/setup/test_executables_scanner.py

@@ -24,7 +24,7 @@
 import tempfile
 from unittest import TestCase
 
-from appimagebuilder.modules.setup.executables_scanner import ExecutablesScanner
+from appimagebuilder.modules.setup.apprun_2.executables_scanner import ExecutablesScanner
 
 
 class TestExecutablesScanner(TestCase):