diff --git a/debian/copyright b/debian/copyright index d50b123c53cc082f10225fad2c4c0fee16e6f3b9..505e2ee8115cb257058300db3ffa13ec80a9cf9b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,7 +10,7 @@ Copyright: License: Expat Files: - src/* + pressure-vessel/* subprojects/* tests/shellcheck.sh Copyright: @@ -19,7 +19,7 @@ Copyright: License: LGPL-2.1+ Files: - src/try-setlocale.* + pressure-vessel/try-setlocale.* Copyright: 2019 Collabora Ltd. License: Expat diff --git a/meson.build b/meson.build index f416bf49db27138cdd4bf7c3ea0cad6f5863e8c7..e8c03bbc017af198e2db04f158b5b138a736de33 100644 --- a/meson.build +++ b/meson.build @@ -121,7 +121,7 @@ project_warning_cflags = [ project_include_dirs = include_directories( '.', - 'src', + 'pressure-vessel', 'subprojects', ) @@ -209,7 +209,7 @@ add_project_arguments( language : 'c', ) -subdir('src') +subdir('pressure-vessel') if get_option('man') subdir('man') diff --git a/src/adverb.c b/pressure-vessel/adverb.c similarity index 100% rename from src/adverb.c rename to pressure-vessel/adverb.c diff --git a/src/bwrap-lock.c b/pressure-vessel/bwrap-lock.c similarity index 100% rename from src/bwrap-lock.c rename to pressure-vessel/bwrap-lock.c diff --git a/src/bwrap-lock.h b/pressure-vessel/bwrap-lock.h similarity index 100% rename from src/bwrap-lock.h rename to pressure-vessel/bwrap-lock.h diff --git a/src/bwrap.c b/pressure-vessel/bwrap.c similarity index 100% rename from src/bwrap.c rename to pressure-vessel/bwrap.c diff --git a/src/bwrap.h b/pressure-vessel/bwrap.h similarity index 100% rename from src/bwrap.h rename to pressure-vessel/bwrap.h diff --git a/src/com.steampowered.PressureVessel.Launcher1.xml b/pressure-vessel/com.steampowered.PressureVessel.Launcher1.xml similarity index 100% rename from src/com.steampowered.PressureVessel.Launcher1.xml rename to pressure-vessel/com.steampowered.PressureVessel.Launcher1.xml diff --git a/src/elf-utils.c b/pressure-vessel/elf-utils.c similarity index 100% rename from src/elf-utils.c rename to pressure-vessel/elf-utils.c diff --git a/src/elf-utils.h b/pressure-vessel/elf-utils.h similarity index 100% rename from src/elf-utils.h rename to pressure-vessel/elf-utils.h diff --git a/src/flatpak-bwrap-private.h b/pressure-vessel/flatpak-bwrap-private.h similarity index 100% rename from src/flatpak-bwrap-private.h rename to pressure-vessel/flatpak-bwrap-private.h diff --git a/src/flatpak-bwrap.c b/pressure-vessel/flatpak-bwrap.c similarity index 100% rename from src/flatpak-bwrap.c rename to pressure-vessel/flatpak-bwrap.c diff --git a/src/flatpak-common-types-private.h b/pressure-vessel/flatpak-common-types-private.h similarity index 100% rename from src/flatpak-common-types-private.h rename to pressure-vessel/flatpak-common-types-private.h diff --git a/src/flatpak-context-private.h b/pressure-vessel/flatpak-context-private.h similarity index 100% rename from src/flatpak-context-private.h rename to pressure-vessel/flatpak-context-private.h diff --git a/src/flatpak-context.c b/pressure-vessel/flatpak-context.c similarity index 100% rename from src/flatpak-context.c rename to pressure-vessel/flatpak-context.c diff --git a/src/flatpak-error.h b/pressure-vessel/flatpak-error.h similarity index 100% rename from src/flatpak-error.h rename to pressure-vessel/flatpak-error.h diff --git a/src/flatpak-exports-private.h b/pressure-vessel/flatpak-exports-private.h similarity index 100% rename from src/flatpak-exports-private.h rename to pressure-vessel/flatpak-exports-private.h diff --git a/src/flatpak-exports.c b/pressure-vessel/flatpak-exports.c similarity index 100% rename from src/flatpak-exports.c rename to pressure-vessel/flatpak-exports.c diff --git a/src/flatpak-run-private.h b/pressure-vessel/flatpak-run-private.h similarity index 100% rename from src/flatpak-run-private.h rename to pressure-vessel/flatpak-run-private.h diff --git a/src/flatpak-run.c b/pressure-vessel/flatpak-run.c similarity index 100% rename from src/flatpak-run.c rename to pressure-vessel/flatpak-run.c diff --git a/src/flatpak-utils-base-private.h b/pressure-vessel/flatpak-utils-base-private.h similarity index 100% rename from src/flatpak-utils-base-private.h rename to pressure-vessel/flatpak-utils-base-private.h diff --git a/src/flatpak-utils-base.c b/pressure-vessel/flatpak-utils-base.c similarity index 100% rename from src/flatpak-utils-base.c rename to pressure-vessel/flatpak-utils-base.c diff --git a/src/flatpak-utils-private.h b/pressure-vessel/flatpak-utils-private.h similarity index 100% rename from src/flatpak-utils-private.h rename to pressure-vessel/flatpak-utils-private.h diff --git a/src/flatpak-utils.c b/pressure-vessel/flatpak-utils.c similarity index 100% rename from src/flatpak-utils.c rename to pressure-vessel/flatpak-utils.c diff --git a/src/glib-backports.c b/pressure-vessel/glib-backports.c similarity index 100% rename from src/glib-backports.c rename to pressure-vessel/glib-backports.c diff --git a/src/glib-backports.h b/pressure-vessel/glib-backports.h similarity index 100% rename from src/glib-backports.h rename to pressure-vessel/glib-backports.h diff --git a/src/launch.c b/pressure-vessel/launch.c similarity index 100% rename from src/launch.c rename to pressure-vessel/launch.c diff --git a/src/launcher.c b/pressure-vessel/launcher.c similarity index 100% rename from src/launcher.c rename to pressure-vessel/launcher.c diff --git a/src/launcher.h b/pressure-vessel/launcher.h similarity index 100% rename from src/launcher.h rename to pressure-vessel/launcher.h diff --git a/src/locking.md b/pressure-vessel/locking.md similarity index 96% rename from src/locking.md rename to pressure-vessel/locking.md index e0034334187c62a5e22b72e8a018d82ef32e574b..7916752b08a8a8923c24148d9f69051e3747fafb 100644 --- a/src/locking.md +++ b/pressure-vessel/locking.md @@ -3,7 +3,7 @@ pressure-vessel file locking model pressure-vessel uses fcntl locks to guard concurrent access to runtimes. They are `F_OFD_SETLK` locks if possible, falling back to POSIX -process-oriented `F_SETLK` locks on older kernels. See `src/bwrap-lock.c` +process-oriented `F_SETLK` locks on older kernels. See `bwrap-lock.c` for full details. Do not use `flock(2)`, `flock(1)` or `lockf(3)` to interact with diff --git a/src/meson.build b/pressure-vessel/meson.build similarity index 100% rename from src/meson.build rename to pressure-vessel/meson.build diff --git a/src/resolve-in-sysroot.c b/pressure-vessel/resolve-in-sysroot.c similarity index 100% rename from src/resolve-in-sysroot.c rename to pressure-vessel/resolve-in-sysroot.c diff --git a/src/resolve-in-sysroot.h b/pressure-vessel/resolve-in-sysroot.h similarity index 100% rename from src/resolve-in-sysroot.h rename to pressure-vessel/resolve-in-sysroot.h diff --git a/src/runtime.c b/pressure-vessel/runtime.c similarity index 99% rename from src/runtime.c rename to pressure-vessel/runtime.c index 365cf559fa701bef4463bd70f24f4e8259bfaf34..679b5b1b98a77aa8f9a766a0be80d505b39a4757 100644 --- a/src/runtime.c +++ b/pressure-vessel/runtime.c @@ -17,7 +17,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#include "src/runtime.h" +#include "runtime.h" #include <sysexits.h> diff --git a/src/runtime.h b/pressure-vessel/runtime.h similarity index 100% rename from src/runtime.h rename to pressure-vessel/runtime.h diff --git a/src/tree-copy.c b/pressure-vessel/tree-copy.c similarity index 100% rename from src/tree-copy.c rename to pressure-vessel/tree-copy.c diff --git a/src/tree-copy.h b/pressure-vessel/tree-copy.h similarity index 100% rename from src/tree-copy.h rename to pressure-vessel/tree-copy.h diff --git a/src/try-setlocale.c b/pressure-vessel/try-setlocale.c similarity index 100% rename from src/try-setlocale.c rename to pressure-vessel/try-setlocale.c diff --git a/src/utils.c b/pressure-vessel/utils.c similarity index 100% rename from src/utils.c rename to pressure-vessel/utils.c diff --git a/src/utils.h b/pressure-vessel/utils.h similarity index 100% rename from src/utils.h rename to pressure-vessel/utils.h diff --git a/src/wrap-interactive.c b/pressure-vessel/wrap-interactive.c similarity index 100% rename from src/wrap-interactive.c rename to pressure-vessel/wrap-interactive.c diff --git a/src/wrap-interactive.h b/pressure-vessel/wrap-interactive.h similarity index 100% rename from src/wrap-interactive.h rename to pressure-vessel/wrap-interactive.h diff --git a/src/wrap.c b/pressure-vessel/wrap.c similarity index 100% rename from src/wrap.c rename to pressure-vessel/wrap.c diff --git a/tests/adverb.py b/tests/adverb.py index e1ee267a13bda3093d48599d755b62ad4896b665..9088e43e7d7b9b76e7cb2ba3eb9ab94810e7ed44 100755 --- a/tests/adverb.py +++ b/tests/adverb.py @@ -33,7 +33,7 @@ class TestAdverb(BaseTest): self.adverb = self.command_prefix + [ os.path.join( self.top_builddir, - 'src', + 'pressure-vessel', 'pressure-vessel-adverb' ), ] diff --git a/tests/containers.py b/tests/containers.py index e011a1d5896431784be3895c1d0b4390ceb0680a..eb3f933d12dd29e5c2e499caca46e5077ecfa60a 100755 --- a/tests/containers.py +++ b/tests/containers.py @@ -180,7 +180,7 @@ class TestContainers(BaseTest): 'pressure-vessel-wrap', ): shutil.copy2( - os.path.join(cls.top_builddir, 'src', exe), + os.path.join(cls.top_builddir, 'pressure-vessel', exe), os.path.join(cls.pv_dir, 'bin', exe), ) @@ -219,11 +219,11 @@ class TestContainers(BaseTest): ) else: logger.info( - 'Copying just-built %s from %s/src', + 'Copying just-built %s from %s/pressure-vessel', exe, cls.top_builddir, ) shutil.copy2( - os.path.join(cls.top_builddir, 'src', exe), + os.path.join(cls.top_builddir, 'pressure-vessel', exe), os.path.join(cls.pv_dir, 'bin', exe), ) diff --git a/tests/invocation.py b/tests/invocation.py index 4578f341e6ff49caa73aeca09690a4aa1faa0be0..ce0a7be8a2a8d741dcb1d874933629ab6503ad5c 100755 --- a/tests/invocation.py +++ b/tests/invocation.py @@ -35,7 +35,7 @@ class TestInvocation(BaseTest): super().setUp() self.pv_wrap = os.path.join( - self.top_builddir, 'src', 'pressure-vessel-wrap', + self.top_builddir, 'pressure-vessel', 'pressure-vessel-wrap', ) artifacts = os.getenv('AUTOPKGTEST_ARTIFACTS') diff --git a/tests/launcher.py b/tests/launcher.py index eca7f80090fd8555d73fc9c888c43460feaf4939..fbfa410aa667e14749ad750d08c774b77e705dc4 100755 --- a/tests/launcher.py +++ b/tests/launcher.py @@ -41,14 +41,14 @@ class TestLauncher(BaseTest): self.launcher = self.command_prefix + [ os.path.join( self.top_builddir, - 'src', + 'pressure-vessel', 'pressure-vessel-launcher' ), ] self.launch = self.command_prefix + [ os.path.join( self.top_builddir, - 'src', + 'pressure-vessel', 'pressure-vessel-launch', ), ]