Skip to content
Snippets Groups Projects
Commit 26623817 authored by Simon McVittie's avatar Simon McVittie
Browse files

Use the C version of pressure-vessel-wrap by default

parent 5e87c742
No related branches found
No related tags found
No related merge requests found
...@@ -93,10 +93,10 @@ PRIMARY_ARCH_DEPENDENCIES = { ...@@ -93,10 +93,10 @@ PRIMARY_ARCH_DEPENDENCIES = {
SCRIPTS = [ SCRIPTS = [
'pressure-vessel-test-ui', 'pressure-vessel-test-ui',
'pressure-vessel-unruntime', 'pressure-vessel-unruntime',
'pressure-vessel-wrap' 'pressure-vessel-wrap.sh'
] ]
EXECUTABLES = [ EXECUTABLES = [
'pressure-vessel-wrap-c' 'pressure-vessel-wrap'
] ]
TOOLS = [ TOOLS = [
'capsule-capture-libs', 'capsule-capture-libs',
......
...@@ -39,7 +39,7 @@ if version == 'auto' ...@@ -39,7 +39,7 @@ if version == 'auto'
endif endif
scripts = [ scripts = [
'pressure-vessel-wrap', 'pressure-vessel-wrap.sh',
'pressure-vessel-test-ui', 'pressure-vessel-test-ui',
'pressure-vessel-unruntime', 'pressure-vessel-unruntime',
] ]
...@@ -201,7 +201,7 @@ configure_file( ...@@ -201,7 +201,7 @@ configure_file(
) )
executable( executable(
'pressure-vessel-wrap-c', 'pressure-vessel-wrap',
sources : [ sources : [
'src/glib-backports.c', 'src/glib-backports.c',
'src/glib-backports.h', 'src/glib-backports.h',
......
...@@ -73,10 +73,11 @@ class Gui: ...@@ -73,10 +73,11 @@ class Gui:
row += 1 row += 1
self.native_check = Gtk.CheckButton.new_with_label( self.script_check = Gtk.CheckButton.new_with_label(
'Use native-code version of pressure-vessel-wrap' 'Use old shell script version of pressure-vessel-wrap'
) )
self.grid.attach(self.native_check, 1, row, 1, 1) self.script_check.set_active(False)
self.grid.attach(self.script_check, 1, row, 1, 1)
row += 1 row += 1
...@@ -114,8 +115,8 @@ class Gui: ...@@ -114,8 +115,8 @@ class Gui:
def run_cb(self, _ignored=None): def run_cb(self, _ignored=None):
if self.native_check.get_active(): if self.script_check.get_active():
wrap = 'pressure-vessel-wrap-c' wrap = 'pressure-vessel-wrap.sh'
else: else:
wrap = 'pressure-vessel-wrap' wrap = 'pressure-vessel-wrap'
......
...@@ -100,8 +100,8 @@ if [ -n "${PRESSURE_VESSEL_WRAP_GUI+set}" ]; then ...@@ -100,8 +100,8 @@ if [ -n "${PRESSURE_VESSEL_WRAP_GUI+set}" ]; then
exec "${here}/pressure-vessel-test-ui" ${options+"${options[@]}"} "$@" exec "${here}/pressure-vessel-test-ui" ${options+"${options[@]}"} "$@"
fi fi
if [ -n "${PRESSURE_VESSEL_WRAP_NATIVE+set}" ]; then if [ -n "${PRESSURE_VESSEL_WRAP_SHELL+set}" ]; then
exec "${here}/pressure-vessel-wrap-c" ${options+"${options[@]}"} "$@" exec "${here}/pressure-vessel-wrap.sh" ${options+"${options[@]}"} "$@"
fi fi
exec "$here/pressure-vessel-wrap" ${options+"${options[@]}"} "$@" exec "$here/pressure-vessel-wrap" ${options+"${options[@]}"} "$@"
......
File moved
...@@ -77,7 +77,7 @@ class TapTest: ...@@ -77,7 +77,7 @@ class TapTest:
EXES = [ EXES = [
'pressure-vessel-wrap-c', 'pressure-vessel-wrap',
] ]
WRAPPED = [ WRAPPED = [
'bwrap', 'bwrap',
...@@ -88,7 +88,7 @@ MULTIARCH = [ ...@@ -88,7 +88,7 @@ MULTIARCH = [
] ]
SCRIPTS = [ SCRIPTS = [
'pressure-vessel-unruntime', 'pressure-vessel-unruntime',
'pressure-vessel-wrap', 'pressure-vessel-wrap.sh',
] ]
LD_SO = [ LD_SO = [
('x86_64-linux-gnu', '/lib64/ld-linux-x86-64.so.2'), ('x86_64-linux-gnu', '/lib64/ld-linux-x86-64.so.2'),
......
...@@ -37,6 +37,8 @@ cd "$G_TEST_SRCDIR" ...@@ -37,6 +37,8 @@ cd "$G_TEST_SRCDIR"
n=0 n=0
for shell_script in \ for shell_script in \
*.sh \ *.sh \
pressure-vessel-unruntime \
pressure-vessel-unruntime-test-ui \
sysroot/*.sh \ sysroot/*.sh \
t/*.sh \ t/*.sh \
; do ; do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment