From fe3bb146ac338e462e3b9f29918537ddf1fb8970 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 7 Feb 2024 11:34:00 +0100 Subject: [PATCH 01/12] [DRAFT] Test if tcpdump.exe works [skip ci] --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 53db6e7f1..bb46f74fb 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -54,3 +54,4 @@ build_script: - if NOT DEFINED PLATFORM cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" .. - if DEFINED PLATFORM cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -A %PLATFORM% .. - msbuild /m /nologo /p:Configuration=Release tcpdump.sln + - Release\tcpdump.exe --version From b9c93e3fc0ab9bdf5f1890df7716ba3c48db44da Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 7 Feb 2024 19:21:57 +0100 Subject: [PATCH 02/12] copy --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index bb46f74fb..342d3ed7a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -54,4 +54,5 @@ build_script: - if NOT DEFINED PLATFORM cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" .. - if DEFINED PLATFORM cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -A %PLATFORM% .. - msbuild /m /nologo /p:Configuration=Release tcpdump.sln - - Release\tcpdump.exe --version + - copy Release\tcpdump.exe C:\Windows\system32 + - tcpdump.exe --version From 4e3b22d4bb9dcf3927dce71c70ab0f4b3ffd7e90 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 7 Feb 2024 19:39:41 +0100 Subject: [PATCH 03/12] path --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 342d3ed7a..aa37092a2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -55,4 +55,5 @@ build_script: - if DEFINED PLATFORM cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -A %PLATFORM% .. - msbuild /m /nologo /p:Configuration=Release tcpdump.sln - copy Release\tcpdump.exe C:\Windows\system32 + - echo %path% - tcpdump.exe --version From 9058b1a64896c45fc52741ef6790851be60defc5 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 7 Feb 2024 19:49:09 +0100 Subject: [PATCH 04/12] -h --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index aa37092a2..f32aa7d99 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -56,4 +56,5 @@ build_script: - msbuild /m /nologo /p:Configuration=Release tcpdump.sln - copy Release\tcpdump.exe C:\Windows\system32 - echo %path% + - tcpdump.exe -h - tcpdump.exe --version From b03c439f12795f919bb16b74eb60fe07e55813ef Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 7 Feb 2024 20:12:49 +0100 Subject: [PATCH 05/12] dependencies --- .appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index f32aa7d99..100123aeb 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,6 +12,8 @@ matrix: install: - appveyor DownloadFile https://npcap.com/dist/npcap-sdk-1.13.zip - 7z x .\npcap-sdk-1.13.zip -oc:\projects\libpcap\Win32\npcap-sdk-1.13 + - appveyor DownloadFile https://github.com/lucasg/Dependencies/releases/download/v1.11.1/Dependencies_x64_Debug.zip + - 7z x .\Dependencies_x64_Debug.zip -oc:\\projects\dependencies environment: matrix: @@ -56,5 +58,6 @@ build_script: - msbuild /m /nologo /p:Configuration=Release tcpdump.sln - copy Release\tcpdump.exe C:\Windows\system32 - echo %path% + - \projects\dependencies\dependencies.exe Release\tcpdump.exe - tcpdump.exe -h - tcpdump.exe --version From c228a1f6e3487c01a75c3a23b11d5520f0659d6d Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 7 Feb 2024 20:24:40 +0100 Subject: [PATCH 06/12] dep step2 --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 100123aeb..aea3ba43c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -58,6 +58,6 @@ build_script: - msbuild /m /nologo /p:Configuration=Release tcpdump.sln - copy Release\tcpdump.exe C:\Windows\system32 - echo %path% - - \projects\dependencies\dependencies.exe Release\tcpdump.exe + - \projects\dependencies\dependencies.exe -cache -knowndll Release\tcpdump.exe - tcpdump.exe -h - tcpdump.exe --version From eed4bc51f726ac3fbfb7f04b64484c6a97e0a30d Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 7 Feb 2024 20:37:49 +0100 Subject: [PATCH 07/12] dep step3 --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index aea3ba43c..311208586 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -59,5 +59,6 @@ build_script: - copy Release\tcpdump.exe C:\Windows\system32 - echo %path% - \projects\dependencies\dependencies.exe -cache -knowndll Release\tcpdump.exe + - \projects\dependencies\dependencies.exe -cache -chain Release\tcpdump.exe - tcpdump.exe -h - tcpdump.exe --version From ad901f14da50738f8cff16e973411dc136a2cd1e Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 7 Feb 2024 20:57:18 +0100 Subject: [PATCH 08/12] dep step4 --- .appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 311208586..f62f0d159 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -59,6 +59,7 @@ build_script: - copy Release\tcpdump.exe C:\Windows\system32 - echo %path% - \projects\dependencies\dependencies.exe -cache -knowndll Release\tcpdump.exe + - echo ----- - \projects\dependencies\dependencies.exe -cache -chain Release\tcpdump.exe - - tcpdump.exe -h - - tcpdump.exe --version + - rem tcpdump.exe -h + - rem tcpdump.exe --version From 23dec3e3dc956a9c1453b76bc34ce7b54b1bd20f Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 7 Feb 2024 21:34:15 +0100 Subject: [PATCH 09/12] dep step5 --- .appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index f62f0d159..03f737a24 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,6 +14,8 @@ install: - 7z x .\npcap-sdk-1.13.zip -oc:\projects\libpcap\Win32\npcap-sdk-1.13 - appveyor DownloadFile https://github.com/lucasg/Dependencies/releases/download/v1.11.1/Dependencies_x64_Debug.zip - 7z x .\Dependencies_x64_Debug.zip -oc:\\projects\dependencies + - appveyor DownloadFile https://npcap.com/dist/npcap-1.79.exe + - 7z x .\npcap-1.79.exe -oc:\projects\npcap-1.79 environment: matrix: @@ -57,6 +59,7 @@ build_script: - if DEFINED PLATFORM cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -A %PLATFORM% .. - msbuild /m /nologo /p:Configuration=Release tcpdump.sln - copy Release\tcpdump.exe C:\Windows\system32 + - copy \projects\npcap-1.79\wpcap.dll C:\Windows\system32 - echo %path% - \projects\dependencies\dependencies.exe -cache -knowndll Release\tcpdump.exe - echo ----- From cb89d86f9d65333c68fd0cef1427cdd47ebc4d01 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 7 Feb 2024 22:26:20 +0100 Subject: [PATCH 10/12] dep step6 [skip ci] --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 03f737a24..67d4108c5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,7 +15,7 @@ install: - appveyor DownloadFile https://github.com/lucasg/Dependencies/releases/download/v1.11.1/Dependencies_x64_Debug.zip - 7z x .\Dependencies_x64_Debug.zip -oc:\\projects\dependencies - appveyor DownloadFile https://npcap.com/dist/npcap-1.79.exe - - 7z x .\npcap-1.79.exe -oc:\projects\npcap-1.79 + - 7z x .\npcap-1.79.exe -oc:\projects\npcap-1.79 -aou environment: matrix: From bec0ac0aa7a39c86f368502f7d21fa582226b24e Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 9 Oct 2024 11:14:31 +0200 Subject: [PATCH 11/12] Add Npcap dir --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 67d4108c5..ebe5ce85e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -60,6 +60,8 @@ build_script: - msbuild /m /nologo /p:Configuration=Release tcpdump.sln - copy Release\tcpdump.exe C:\Windows\system32 - copy \projects\npcap-1.79\wpcap.dll C:\Windows\system32 + - md C:\Windows\system32\Npcap + - copy \projects\npcap-1.79\wpcap.dll C:\Windows\system32\Npcap - echo %path% - \projects\dependencies\dependencies.exe -cache -knowndll Release\tcpdump.exe - echo ----- From 6aee6896c5c3b1ff889fa43795fc281d591a6883 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Wed, 9 Oct 2024 12:39:49 +0200 Subject: [PATCH 12/12] Add dir /s \wpcap.dll [skip ci] --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index ebe5ce85e..a07e8f6d9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -62,6 +62,7 @@ build_script: - copy \projects\npcap-1.79\wpcap.dll C:\Windows\system32 - md C:\Windows\system32\Npcap - copy \projects\npcap-1.79\wpcap.dll C:\Windows\system32\Npcap + - dir /s \wpcap.dll - echo %path% - \projects\dependencies\dependencies.exe -cache -knowndll Release\tcpdump.exe - echo -----