tui: move from "clients/tui/" to "src/nmtui/"

.gitignore

@@ -68,8 +68,6 @@ test-*.trs
 /src/nm-dispatcher/org.freedesktop.nm_dispatcher.service
 /src/nm-dispatcher/tests/test-dispatcher-envp
 
-/clients/tui/nmtui
-
 /data/NetworkManager.service
 /data/NetworkManager-wait-online.service
 /data/NetworkManager-dispatcher.service
@@ -163,6 +161,8 @@ test-*.trs
 /src/nm-initrd-generator/tests/test-dt-reader
 /src/nm-initrd-generator/tests/test-ibft-reader
 
+/src/nmtui/nmtui
+
 /src/nm-cloud-setup/nm-cloud-setup
 /src/nm-cloud-setup/nm-cloud-setup.service
 /src/nm-cloud-setup/tests/test-cloud-setup-general
@@ -301,6 +301,7 @@ test-*.trs
 /clients/common/tests/test-general
 /clients/common/tests/test-libnm-core-aux
 /clients/nm-online
+/clients/tui/nmtui
 /dispatcher/nm-avahi-autoipd.action
 /dispatcher/nm-dispatcher
 /dispatcher/nmdbus-dispatcher.*

Makefile.am

@@ -4605,10 +4605,6 @@ $(src_nm_online_nm_online_OBJECTS): $(src_libnm_client_public_mkenums_h)
 
 EXTRA_DIST += src/nm-online/meson.build
 
-###############################################################################
-
-EXTRA_DIST += clients/meson.build
-
 ###############################################################################
 # src/libnmc-base
 ###############################################################################
@@ -4910,108 +4906,108 @@ endif
 EXTRA_DIST += src/libnmt-newt/meson.build
 
 ###############################################################################
-# clients/tui
+# src/nmtui
 ###############################################################################
 
 if BUILD_NMTUI
 
-bin_PROGRAMS += clients/tui/nmtui
+bin_PROGRAMS += src/nmtui/nmtui
 
-clients_tui_nmtui_SOURCES = \
-	clients/tui/nmtui.c \
-	clients/tui/nmtui.h \
-	clients/tui/nmtui-connect.c \
-	clients/tui/nmtui-connect.h \
-	clients/tui/nmtui-edit.c \
-	clients/tui/nmtui-edit.h \
-	clients/tui/nmtui-hostname.c \
-	clients/tui/nmtui-hostname.h \
+src_nmtui_nmtui_SOURCES = \
+	src/nmtui/nmtui.c \
+	src/nmtui/nmtui.h \
+	src/nmtui/nmtui-connect.c \
+	src/nmtui/nmtui-connect.h \
+	src/nmtui/nmtui-edit.c \
+	src/nmtui/nmtui-edit.h \
+	src/nmtui/nmtui-hostname.c \
+	src/nmtui/nmtui-hostname.h \
 	\
-	clients/tui/nm-editor-bindings.c \
-	clients/tui/nm-editor-bindings.h \
-	clients/tui/nm-editor-utils.c \
-	clients/tui/nm-editor-utils.h \
+	src/nmtui/nm-editor-bindings.c \
+	src/nmtui/nm-editor-bindings.h \
+	src/nmtui/nm-editor-utils.c \
+	src/nmtui/nm-editor-utils.h \
 	\
-	clients/tui/nmt-address-list.c \
-	clients/tui/nmt-address-list.h \
-	clients/tui/nmt-connect-connection-list.c \
-	clients/tui/nmt-connect-connection-list.h \
-	clients/tui/nmt-device-entry.c \
-	clients/tui/nmt-device-entry.h \
-	clients/tui/nmt-edit-connection-list.c \
-	clients/tui/nmt-edit-connection-list.h \
-	clients/tui/nmt-editor-grid.c \
-	clients/tui/nmt-editor-grid.h \
-	clients/tui/nmt-editor-page.c \
-	clients/tui/nmt-editor-page.h \
-	clients/tui/nmt-editor-page-device.c \
-	clients/tui/nmt-editor-page-device.h \
-	clients/tui/nmt-editor-section.c \
-	clients/tui/nmt-editor-section.h \
-	clients/tui/nmt-editor.c \
-	clients/tui/nmt-editor.h \
-	clients/tui/nmt-ip-entry.c \
-	clients/tui/nmt-ip-entry.h \
-	clients/tui/nmt-mac-entry.c \
-	clients/tui/nmt-mac-entry.h \
-	clients/tui/nmt-mtu-entry.c \
-	clients/tui/nmt-mtu-entry.h \
-	clients/tui/nmt-page-bond.c \
-	clients/tui/nmt-page-bond.h \
-	clients/tui/nmt-page-bridge.c \
-	clients/tui/nmt-page-bridge.h \
-	clients/tui/nmt-page-bridge-port.c \
-	clients/tui/nmt-page-bridge-port.h \
-	clients/tui/nmt-page-dsl.c \
-	clients/tui/nmt-page-dsl.h \
-	clients/tui/nmt-page-ethernet.c \
-	clients/tui/nmt-page-ethernet.h \
-	clients/tui/nmt-page-infiniband.c \
-	clients/tui/nmt-page-infiniband.h \
-	clients/tui/nmt-page-ip-tunnel.c \
-	clients/tui/nmt-page-ip-tunnel.h \
-	clients/tui/nmt-page-ip4.c \
-	clients/tui/nmt-page-ip4.h \
-	clients/tui/nmt-page-ip6.c \
-	clients/tui/nmt-page-ip6.h \
-	clients/tui/nmt-page-ppp.c \
-	clients/tui/nmt-page-ppp.h \
-	clients/tui/nmt-page-team.c \
-	clients/tui/nmt-page-team.h \
-	clients/tui/nmt-page-team-port.c \
-	clients/tui/nmt-page-team-port.h \
-	clients/tui/nmt-page-vlan.c \
-	clients/tui/nmt-page-vlan.h \
-	clients/tui/nmt-page-wifi.c \
-	clients/tui/nmt-page-wifi.h \
-	clients/tui/nmt-password-dialog.c \
-	clients/tui/nmt-password-dialog.h \
-	clients/tui/nmt-password-fields.c \
-	clients/tui/nmt-password-fields.h \
-	clients/tui/nmt-route-editor.c \
-	clients/tui/nmt-route-editor.h \
-	clients/tui/nmt-route-entry.c \
-	clients/tui/nmt-route-entry.h \
-	clients/tui/nmt-route-table.c \
-	clients/tui/nmt-route-table.h \
-	clients/tui/nmt-slave-list.c \
-	clients/tui/nmt-slave-list.h \
-	clients/tui/nmt-utils.c \
-	clients/tui/nmt-utils.h \
-	clients/tui/nmt-widget-list.c \
-	clients/tui/nmt-widget-list.h \
+	src/nmtui/nmt-address-list.c \
+	src/nmtui/nmt-address-list.h \
+	src/nmtui/nmt-connect-connection-list.c \
+	src/nmtui/nmt-connect-connection-list.h \
+	src/nmtui/nmt-device-entry.c \
+	src/nmtui/nmt-device-entry.h \
+	src/nmtui/nmt-edit-connection-list.c \
+	src/nmtui/nmt-edit-connection-list.h \
+	src/nmtui/nmt-editor-grid.c \
+	src/nmtui/nmt-editor-grid.h \
+	src/nmtui/nmt-editor-page.c \
+	src/nmtui/nmt-editor-page.h \
+	src/nmtui/nmt-editor-page-device.c \
+	src/nmtui/nmt-editor-page-device.h \
+	src/nmtui/nmt-editor-section.c \
+	src/nmtui/nmt-editor-section.h \
+	src/nmtui/nmt-editor.c \
+	src/nmtui/nmt-editor.h \
+	src/nmtui/nmt-ip-entry.c \
+	src/nmtui/nmt-ip-entry.h \
+	src/nmtui/nmt-mac-entry.c \
+	src/nmtui/nmt-mac-entry.h \
+	src/nmtui/nmt-mtu-entry.c \
+	src/nmtui/nmt-mtu-entry.h \
+	src/nmtui/nmt-page-bond.c \
+	src/nmtui/nmt-page-bond.h \
+	src/nmtui/nmt-page-bridge.c \
+	src/nmtui/nmt-page-bridge.h \
+	src/nmtui/nmt-page-bridge-port.c \
+	src/nmtui/nmt-page-bridge-port.h \
+	src/nmtui/nmt-page-dsl.c \
+	src/nmtui/nmt-page-dsl.h \
+	src/nmtui/nmt-page-ethernet.c \
+	src/nmtui/nmt-page-ethernet.h \
+	src/nmtui/nmt-page-infiniband.c \
+	src/nmtui/nmt-page-infiniband.h \
+	src/nmtui/nmt-page-ip-tunnel.c \
+	src/nmtui/nmt-page-ip-tunnel.h \
+	src/nmtui/nmt-page-ip4.c \
+	src/nmtui/nmt-page-ip4.h \
+	src/nmtui/nmt-page-ip6.c \
+	src/nmtui/nmt-page-ip6.h \
+	src/nmtui/nmt-page-ppp.c \
+	src/nmtui/nmt-page-ppp.h \
+	src/nmtui/nmt-page-team.c \
+	src/nmtui/nmt-page-team.h \
+	src/nmtui/nmt-page-team-port.c \
+	src/nmtui/nmt-page-team-port.h \
+	src/nmtui/nmt-page-vlan.c \
+	src/nmtui/nmt-page-vlan.h \
+	src/nmtui/nmt-page-wifi.c \
+	src/nmtui/nmt-page-wifi.h \
+	src/nmtui/nmt-password-dialog.c \
+	src/nmtui/nmt-password-dialog.h \
+	src/nmtui/nmt-password-fields.c \
+	src/nmtui/nmt-password-fields.h \
+	src/nmtui/nmt-route-editor.c \
+	src/nmtui/nmt-route-editor.h \
+	src/nmtui/nmt-route-entry.c \
+	src/nmtui/nmt-route-entry.h \
+	src/nmtui/nmt-route-table.c \
+	src/nmtui/nmt-route-table.h \
+	src/nmtui/nmt-slave-list.c \
+	src/nmtui/nmt-slave-list.h \
+	src/nmtui/nmt-utils.c \
+	src/nmtui/nmt-utils.h \
+	src/nmtui/nmt-widget-list.c \
+	src/nmtui/nmt-widget-list.h \
 	$(NULL)
 
-clients_tui_nmtui_CPPFLAGS = \
+src_nmtui_nmtui_CPPFLAGS = \
 	$(clients_cppflags) \
 	$(NEWT_CFLAGS) \
 	$(NULL)
 
-clients_tui_nmtui_LDFLAGS = \
+src_nmtui_nmtui_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-clients_tui_nmtui_LDADD = \
+src_nmtui_nmtui_LDADD = \
 	src/libnmt-newt/libnmt-newt.a \
 	src/libnmc-setting/libnmc-setting.la \
 	src/libnmc-base/libnmc-base.la \
@@ -5027,10 +5023,14 @@ clients_tui_nmtui_LDADD = \
 	$(NEWT_LIBS) \
 	$(NULL)
 
-$(clients_tui_nmtui_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(clients_tui_nmtui_OBJECTS): $(src_libnm_client_public_mkenums_h)
+$(src_nmtui_nmtui_OBJECTS): $(src_libnm_core_public_mkenums_h)
+$(src_nmtui_nmtui_OBJECTS): $(src_libnm_client_public_mkenums_h)
 
-nmtui_links = nmtui-edit nmtui-connect nmtui-hostname
+nmtui_links = \
+	nmtui-edit \
+	nmtui-connect \
+	nmtui-hostname \
+	$(NULL)
 
 install-exec-hook-nmtui:
 	for link in $(nmtui_links); do \
@@ -5048,7 +5048,7 @@ uninstall_hook += uninstall-hook-nmtui
 
 endif
 
-EXTRA_DIST += clients/tui/meson.build
+EXTRA_DIST += src/nmtui/meson.build
 
 ###############################################################################
 # src/nm-cloud-setup

clients/meson.build

@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-if enable_nmtui
-  subdir('tui')
-endif

meson.build

@@ -920,7 +920,6 @@ content_files = []
 
 subdir('introspection')
 subdir('src')
-subdir('clients')
 subdir('data')
 subdir('po')
 

po/POTFILES.in

@@ -1,37 +1,6 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-clients/tui/nm-editor-utils.c
-clients/tui/nmt-connect-connection-list.c
-clients/tui/nmt-device-entry.c
-clients/tui/nmt-edit-connection-list.c
-clients/tui/nmt-editor-section.c
-clients/tui/nmt-editor.c
-clients/tui/nmt-mtu-entry.c
-clients/tui/nmt-page-bond.c
-clients/tui/nmt-page-bridge-port.c
-clients/tui/nmt-page-bridge.c
-clients/tui/nmt-page-dsl.c
-clients/tui/nmt-page-ethernet.c
-clients/tui/nmt-page-infiniband.c
-clients/tui/nmt-page-ip-tunnel.c
-clients/tui/nmt-page-ip4.c
-clients/tui/nmt-page-ip6.c
-clients/tui/nmt-page-ppp.c
-clients/tui/nmt-page-team-port.c
-clients/tui/nmt-page-team.c
-clients/tui/nmt-page-vlan.c
-clients/tui/nmt-page-wifi.c
-clients/tui/nmt-password-dialog.c
-clients/tui/nmt-password-fields.c
-clients/tui/nmt-route-editor.c
-clients/tui/nmt-route-table.c
-clients/tui/nmt-slave-list.c
-clients/tui/nmt-widget-list.c
-clients/tui/nmtui-connect.c
-clients/tui/nmtui-edit.c
-clients/tui/nmtui-hostname.c
-clients/tui/nmtui.c
 data/org.freedesktop.NetworkManager.policy.in.in
 src/core/NetworkManagerUtils.c
 src/core/devices/adsl/nm-device-adsl.c
@@ -183,3 +152,34 @@ src/nmcli/polkit-agent.c
 src/nmcli/settings.c
 src/nmcli/utils.c
 src/nmcli/utils.h
+src/nmtui/nm-editor-utils.c
+src/nmtui/nmt-connect-connection-list.c
+src/nmtui/nmt-device-entry.c
+src/nmtui/nmt-edit-connection-list.c
+src/nmtui/nmt-editor-section.c
+src/nmtui/nmt-editor.c
+src/nmtui/nmt-mtu-entry.c
+src/nmtui/nmt-page-bond.c
+src/nmtui/nmt-page-bridge-port.c
+src/nmtui/nmt-page-bridge.c
+src/nmtui/nmt-page-dsl.c
+src/nmtui/nmt-page-ethernet.c
+src/nmtui/nmt-page-infiniband.c
+src/nmtui/nmt-page-ip-tunnel.c
+src/nmtui/nmt-page-ip4.c
+src/nmtui/nmt-page-ip6.c
+src/nmtui/nmt-page-ppp.c
+src/nmtui/nmt-page-team-port.c
+src/nmtui/nmt-page-team.c
+src/nmtui/nmt-page-vlan.c
+src/nmtui/nmt-page-wifi.c
+src/nmtui/nmt-password-dialog.c
+src/nmtui/nmt-password-fields.c
+src/nmtui/nmt-route-editor.c
+src/nmtui/nmt-route-table.c
+src/nmtui/nmt-slave-list.c
+src/nmtui/nmt-widget-list.c
+src/nmtui/nmtui-connect.c
+src/nmtui/nmtui-edit.c
+src/nmtui/nmtui-hostname.c
+src/nmtui/nmtui.c

src/meson.build

@@ -93,6 +93,9 @@ endif
 subdir('nmcli')
 subdir('nm-dispatcher')
 subdir('nm-online')
+if enable_nmtui
+  subdir('nmtui')
+endif
 subdir('nm-initrd-generator')
 if enable_nm_cloud_setup
   subdir('nm-cloud-setup')

src/nmtui/meson.build

@@ -46,6 +46,7 @@ executable(
   ),
   dependencies: [
     libnm_dep,
+    newt_dep,
     glib_dep,
   ],
   link_with: [

tools/test-build.sh

@@ -31,7 +31,6 @@ build_out_of_tree() {
 TARGETS=("$@")
 if [ "${#TARGETS}" -lt 1 ]; then
     TARGETS=(
-        clients/tui/nmtui
         dispatcher/nm-dispatcher
         src/core/NetworkManager
         src/core/dhcp/nm-dhcp-helper
@@ -40,6 +39,7 @@ if [ "${#TARGETS}" -lt 1 ]; then
         src/core/platform/tests/monitor
         src/nm-online/nm-online
         src/nmcli/nmcli
+        src/nmtui/nmtui
         $(git grep -h '\.l\?a\>' Makefile.am | sed 's/[a-zA-Z.0-9_-/]\+/\n\0\n/g' | sort -u | grep '\.l\?a$')
     )
 fi