From f2786bc8ff5ea25fd1c36d3ebf83a29277ee662b Mon Sep 17 00:00:00 2001
From: Roland Knall <rknall@gmail.com>
Date: Tue, 28 Jun 2016 21:34:46 +0200
Subject: extcap: Remove g_spawn_helper support

 Move g_spawn to separate file and implement functions to
 use Windows based method of spawning, instead of the glib
 based version

Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f
Reviewed-on: https://code.wireshark.org/review/16049
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
---
 packaging/wix/CMakeLists.txt | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'packaging/wix')

diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index ed9f035a9c..065e279aa6 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -134,12 +134,6 @@ foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL}
 		SET(unique_component ${unique_component} ${_dll})
 	ENDIF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)")
 endforeach()
-file(APPEND "${_all_manifest_wix}" "       <Component Id=\"cmpGSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_exe\" Guid=\"*\">\n")
-file(APPEND "${_all_manifest_wix}" "         <File Id=\"filSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_exe\" KeyPath=\"yes\" Source=\"$(var.Staging.Dir)\\gspawn-${WIRESHARK_TARGET_PLATFORM}-helper.exe\"/>\n")
-file(APPEND "${_all_manifest_wix}" "       </Component>\n")
-file(APPEND "${_all_manifest_wix}" "       <Component Id=\"cmpGSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_console_exe\" Guid=\"*\">\n")
-file(APPEND "${_all_manifest_wix}" "         <File Id=\"filSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_console_exe\" KeyPath=\"yes\" Source=\"$(var.Staging.Dir)\\gspawn-${WIRESHARK_TARGET_PLATFORM}-helper-console.exe\"/>\n")
-file(APPEND "${_all_manifest_wix}" "       </Component>\n")
 foreach(_script "init.lua" "console.lua" "dtd_gen.lua")
 	STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_script})
 	file(APPEND "${_all_manifest_wix}" "       <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n")
@@ -162,8 +156,6 @@ foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL}
 		SET(unique_file ${unique_file} ${_dll})
 	ENDIF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)")
 endforeach()
-file(APPEND "${_all_manifest_wix}" "       <ComponentRef Id=\"cmpGSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_exe\" />\n")
-file(APPEND "${_all_manifest_wix}" "       <ComponentRef Id=\"cmpGSpawn_${WIRESHARK_TARGET_PLATFORM}_helper_console_exe\" />\n")
 foreach(_script "init.lua" "console.lua" "dtd_gen.lua")
 	STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_script})
 	file(APPEND "${_all_manifest_wix}" "       <ComponentRef Id=\"cmp${_wix_name}\" />\n")
-- 
cgit v1.2.1