From 6d1591de00edae849f38e7521990b167c9bb1535 Mon Sep 17 00:00:00 2001 From: Derek Dai Date: Mon, 8 May 2017 15:30:28 +0800 Subject: [PATCH] move miracle-wfdctl from demo/ to res/ Change-Id: I37df75135e4713a73d3c63353c9a17dc248e2d7e --- CMakeLists.txt | 5 - debian/postrm | 1 + debian/rules | 3 - demo/CMakeLists.txt | 39 -------- demo/meson.build | 24 ----- meson.build | 4 - meson_options.txt | 4 - res/CMakeLists.txt | 159 +++++++++++++++++------------- res/meson.build | 23 ++++- {demo => res}/miracle-wfd.vala | 0 {demo => res}/miracle-wifi.vala | 0 {demo => res}/networkmanager.vala | 0 {demo => res}/sigint.c | 0 {demo => res}/sigint.h | 0 {demo => res}/sigint.vapi | 0 {demo => res}/wfdctl.vala | 0 16 files changed, 115 insertions(+), 147 deletions(-) create mode 100644 debian/postrm delete mode 100644 demo/CMakeLists.txt delete mode 100644 demo/meson.build rename {demo => res}/miracle-wfd.vala (100%) rename {demo => res}/miracle-wifi.vala (100%) rename {demo => res}/networkmanager.vala (100%) rename {demo => res}/sigint.c (100%) rename {demo => res}/sigint.h (100%) rename {demo => res}/sigint.vapi (100%) rename {demo => res}/wfdctl.vala (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31d5a13..99e84f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,6 @@ SET(BUILD_BINDIR "${CMAKE_INSTALL_PREFIX}/bin") OPTION(BUILD_ENABLE_DEBUG "Enable Debug" ON ) OPTION(RELY_UDEV "Rely in udev tag to select device" OFF ) OPTION(BUILD_TESTS "Enable TEST" ON ) -OPTION(BUILD_DEMO "Enable DEMO" OFF ) if(BUILD_ENABLE_DEBUG) add_definitions(-DBUILD_ENABLE_DEBUG) @@ -51,7 +50,3 @@ add_subdirectory(src) add_subdirectory(res) add_subdirectory(test) -if(BUILD_DEMO) - add_subdirectory(demo) -endif() - diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..9b76642 --- /dev/null +++ b/debian/postrm @@ -0,0 +1 @@ +systemctl daemon-reload diff --git a/debian/rules b/debian/rules index 2eed2e2..0182ac8 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,3 @@ # dh_make generated override targets # This is example for Cmake (See https://bugs.debian.org/641051 ) -override_dh_auto_configure: - dh_auto_configure -- -DBUILD_DEMO=yes - diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt deleted file mode 100644 index d158daa..0000000 --- a/demo/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -find_library(READLINE REQUIRED) -pkg_check_modules(GIO2 REQUIRED gio-2.0) -pkg_check_modules(GDK3 REQUIRED gdk-3.0) -include(ValaPrecompile) - -include_directories(${GIO2_INCLUDE_DIRS} - ${GDK3_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR} -) - -set(CMAKE_C_FLAGS "-Wno-deprecated-declarations ${CMAKE_C_FLAGS}") -set(CMAKE_C_FLAGS "-Wno-unused-but-set-variable ${CMAKE_C_FLAGS}") -set(CMAKE_C_FLAGS "-Wno-missing-braces ${CMAKE_C_FLAGS}") - -if(VALA_VERSION VERSION_GREATER 0.34.0 AND NOT GDK_VERSION_NEWER_THEN_3_22) - list(APPEND VALA_EXTRA_OPTIONS -D GDK3_HAS_MONITOR_CLASS) -endif() - -vala_precompile(WFDCTL_SRC wfdctl - wfdctl.vala - networkmanager.vala - miracle-wifi.vala - miracle-wfd.vala - GENERATE_HEADER - wfdctl.h - CUSTOM_VAPIS - sigint.vapi - OPTIONS - --target-glib=2.50 - ${VALA_EXTRA_OPTIONS} - PACKAGES - gio-2.0 - gdk-3.0 -) - -add_executable(miracle-wfdctl ${WFDCTL_SRC} sigint.c) -target_link_libraries(miracle-wfdctl ${GIO2_LIBRARIES} ${GDK3_LIBRARIES}) - -install(TARGETS miracle-wfdctl DESTINATION bin) diff --git a/demo/meson.build b/demo/meson.build deleted file mode 100644 index 37a8221..0000000 --- a/demo/meson.build +++ /dev/null @@ -1,24 +0,0 @@ -add_languages('vala') - -gio2 = dependency('gio-2.0') -gdk3 = dependency('gdk-3.0') - -valac = meson.get_compiler('vala') -valac_extra_args = [] -if valac.version().version_compare('>=0.34') and gdk3.version().version_compare('>=3.22') - valac_extra_args += ['-D', 'GDK3_HAS_MONITOR_CLASS'] -endif - -miracle_wfdctl_src = ['wfdctl.vala', - 'sigint.vapi', - 'sigint.c', - 'networkmanager.vala', - 'miracle-wifi.vala', - 'miracle-wfd.vala' -] - -executable('miracle-wfdctl', miracle_wfdctl_src, - dependencies: [gio2, gdk3], - vala_args: valac_extra_args, - install: true -) diff --git a/meson.build b/meson.build index c8b7adf..2abece5 100644 --- a/meson.build +++ b/meson.build @@ -42,7 +42,3 @@ subdir('res') if get_option('build-tests') subdir('test') endif - -if get_option('build-demo') - subdir('demo') -endif diff --git a/meson_options.txt b/meson_options.txt index 0f4eaee..34002ff 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,7 +10,3 @@ option('build-tests', type: 'boolean', value: true, description: 'Enable TEST') -option('build-demo', - type: 'boolean', - value: false, - description: 'Enable DEMO') diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt index c646bb7..c2f14af 100644 --- a/res/CMakeLists.txt +++ b/res/CMakeLists.txt @@ -1,69 +1,3 @@ - -########### install files ############### - -execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=system_bus_services_dir dbus-1 - OUTPUT_VARIABLE DBUS_SYSTEM_SERVICES_DIR - OUTPUT_STRIP_TRAILING_WHITESPACE -) -execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd - OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - -configure_file( - miracle-wifid.service.cmake - miracle-wifid.service - ) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-wifid.service - DESTINATION ${SYSTEMD_SYSTEM_UNIT_DIR}/ - ) -install( - CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink miracle-wifid.service \$ENV{DESTDIR}/${SYSTEMD_SYSTEM_UNIT_DIR}/dbus-org.freedesktop.miracle.wifi.service)" - ) - -configure_file( - miracle-dispd.service.cmake - miracle-dispd.service - ) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-dispd.service - DESTINATION ${SYSTEMD_SYSTEM_UNIT_DIR}/ - ) -install( - CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink miracle-dispd.service \$ENV{DESTDIR}/${SYSTEMD_SYSTEM_UNIT_DIR}/dbus-org.freedesktop.miracle.wfd.service)" - ) - -configure_file( - org.freedesktop.miracle.wifi.service.cmake - org.freedesktop.miracle.wifi.service - ) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.miracle.wifi.service - DESTINATION ${DBUS_SYSTEM_SERVICES_DIR}/ - ) - -configure_file( - org.freedesktop.miracle.wfd.service.cmake - org.freedesktop.miracle.wfd.service - ) -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.miracle.wfd.service - DESTINATION ${DBUS_SYSTEM_SERVICES_DIR}/ - ) - -install( - PROGRAMS miracle-gst gstplayer uibc-viewer - DESTINATION bin - ) - -install( - FILES org.freedesktop.miracle.conf - DESTINATION /etc/dbus-1/system.d - ) - include(ValaPrecompile) pkg_check_modules(GIO2 REQUIRED gio-2.0) pkg_check_modules(GDK3 REQUIRED gdk-3.0) @@ -73,11 +7,15 @@ include_directories( ${GST1_INCLUDE_DIRS} ${GDK3_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} ) set(CMAKE_C_FLAGS "-Wno-deprecated-declarations ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-Wno-unused-but-set-variable ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-Wno-missing-braces ${CMAKE_C_FLAGS}") +if(VALA_VERSION VERSION_GREATER 0.34.0 AND NOT GDK_VERSION_NEWER_THEN_3_22) + list(APPEND VALA_EXTRA_OPTIONS -D GDK3_HAS_MONITOR_CLASS) +endif() vala_precompile( GSTENCODER_SRC gstencoder @@ -89,7 +27,6 @@ vala_precompile( gio-2.0 posix ) - add_executable(gstencoder ${GSTENCODER_SRC}) target_link_libraries( gstencoder @@ -98,4 +35,92 @@ target_link_libraries( ${GIO2_LIBRARIES} ) +vala_precompile( + WFDCTL_SRC wfdctl + wfdctl.vala + networkmanager.vala + miracle-wifi.vala + miracle-wfd.vala + GENERATE_HEADER + wfdctl.h + CUSTOM_VAPIS + sigint.vapi + OPTIONS + --target-glib=2.50 + ${VALA_EXTRA_OPTIONS} + PACKAGES + gio-2.0 + gdk-3.0 + ) +add_executable(miracle-wfdctl ${WFDCTL_SRC} sigint.c) +target_link_libraries(miracle-wfdctl ${GIO2_LIBRARIES} ${GDK3_LIBRARIES}) + +########### install files ############### + install(TARGETS gstencoder DESTINATION bin) + +install(TARGETS miracle-wfdctl DESTINATION bin) + +execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=system_bus_services_dir dbus-1 + OUTPUT_VARIABLE DBUS_SYSTEM_SERVICES_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) +execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd + OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + +configure_file( + miracle-wifid.service.cmake + miracle-wifid.service + ) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-wifid.service + DESTINATION ${SYSTEMD_SYSTEM_UNIT_DIR}/ + ) +install( + CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink miracle-wifid.service \$ENV{DESTDIR}${SYSTEMD_SYSTEM_UNIT_DIR}/dbus-org.freedesktop.miracle.wifi.service)" + ) + +configure_file( + miracle-dispd.service.cmake + miracle-dispd.service + ) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/miracle-dispd.service + DESTINATION ${SYSTEMD_SYSTEM_UNIT_DIR}/ + ) +install( + CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink miracle-dispd.service \$ENV{DESTDIR}${SYSTEMD_SYSTEM_UNIT_DIR}/dbus-org.freedesktop.miracle.wfd.service)" + ) + +configure_file( + org.freedesktop.miracle.wifi.service.cmake + org.freedesktop.miracle.wifi.service + ) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.miracle.wifi.service + DESTINATION $ENV{DESTDIR}${DBUS_SYSTEM_SERVICES_DIR}/ + ) + +configure_file( + org.freedesktop.miracle.wfd.service.cmake + org.freedesktop.miracle.wfd.service + ) +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.miracle.wfd.service + DESTINATION $ENV{DESTDIR}${DBUS_SYSTEM_SERVICES_DIR}/ + ) + +install( + PROGRAMS miracle-gst gstplayer uibc-viewer + DESTINATION bin + ) + +install( + FILES org.freedesktop.miracle.conf + DESTINATION $ENV{DESTDIR}/etc/dbus-1/system.d + ) + diff --git a/res/meson.build b/res/meson.build index 152fcdd..2f0e075 100644 --- a/res/meson.build +++ b/res/meson.build @@ -43,11 +43,32 @@ install_data('miracle-gst', 'gstplayer', 'uibc-viewer', install_dir: get_option('bindir'), install_mode: 'rwxr-xr-x') -add_languages('vala') gio2 = dependency('gio-2.0') +gdk3 = dependency('gdk-3.0') gst1 = dependency('gstreamer-1.0') gst1_base = dependency('gstreamer-base-1.0') + +add_languages('vala') +valac = meson.get_compiler('vala') +valac_extra_args = [] +if valac.version().version_compare('>=0.34') and gdk3.version().version_compare('>=3.22') + valac_extra_args += ['-D', 'GDK3_HAS_MONITOR_CLASS'] +endif + executable('gstencoder', 'gstencoder.vala', dependencies: [gst1, gst1_base, gio2], install: true, vala_args: ['--pkg=posix']) + +miracle_wfdctl_src = ['wfdctl.vala', + 'sigint.vapi', + 'sigint.c', + 'networkmanager.vala', + 'miracle-wifi.vala', + 'miracle-wfd.vala' +] +executable('miracle-wfdctl', miracle_wfdctl_src, + dependencies: [gio2, gdk3], + vala_args: valac_extra_args, + install: true +) diff --git a/demo/miracle-wfd.vala b/res/miracle-wfd.vala similarity index 100% rename from demo/miracle-wfd.vala rename to res/miracle-wfd.vala diff --git a/demo/miracle-wifi.vala b/res/miracle-wifi.vala similarity index 100% rename from demo/miracle-wifi.vala rename to res/miracle-wifi.vala diff --git a/demo/networkmanager.vala b/res/networkmanager.vala similarity index 100% rename from demo/networkmanager.vala rename to res/networkmanager.vala diff --git a/demo/sigint.c b/res/sigint.c similarity index 100% rename from demo/sigint.c rename to res/sigint.c diff --git a/demo/sigint.h b/res/sigint.h similarity index 100% rename from demo/sigint.h rename to res/sigint.h diff --git a/demo/sigint.vapi b/res/sigint.vapi similarity index 100% rename from demo/sigint.vapi rename to res/sigint.vapi diff --git a/demo/wfdctl.vala b/res/wfdctl.vala similarity index 100% rename from demo/wfdctl.vala rename to res/wfdctl.vala