From 81ce9b7f8746aa9203404726a243f17d6c76b160 Mon Sep 17 00:00:00 2001 From: basil00 Date: Tue, 5 Mar 2019 08:46:14 +0800 Subject: [PATCH] Build script fixes. --- VERSION | 2 +- mingw-build.sh | 10 +++++++--- release-build.sh | 9 +++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 227cea2..b50fd54 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 +2.0.0-rc diff --git a/mingw-build.sh b/mingw-build.sh index 389e14b..8178790 100644 --- a/mingw-build.sh +++ b/mingw-build.sh @@ -97,18 +97,22 @@ do $CC -s -O2 -Iinclude/ examples/streamdump/streamdump.c \ -o "install/MINGW/$CPU/streamdump.exe" -lWinDivert -lws2_32 \ -L"install/MINGW/$CPU/" - echo "\tcopy install/MINGW/$CPU/flowtrack.exe..." + echo "\tbuild install/MINGW/$CPU/flowtrack.exe..." $CC -s -O2 -Iinclude/ examples/flowtrack/flowtrack.c \ -o "install/MINGW/$CPU/flowtrack.exe" -lWinDivert -lpsapi \ -lshlwapi -L"install/MINGW/$CPU/" - echo "\tcopy install/MINGW/$CPU/windivertctl.exe..." + echo "\tbuild install/MINGW/$CPU/windivertctl.exe..." $CC -s -O2 -Iinclude/ examples/windivertctl/windivertctl.c \ -o "install/MINGW/$CPU/windivertctl.exe" -lWinDivert \ -lpsapi -lshlwapi -L"install/MINGW/$CPU/" - echo "\tcopy install/MINGW/$CPU/socketdump.exe..." + echo "\tbuild install/MINGW/$CPU/socketdump.exe..." $CC -s -O2 -Iinclude/ examples/socketdump/socketdump.c \ -o "install/MINGW/$CPU/socketdump.exe" -lWinDivert \ -lpsapi -lshlwapi -L"install/MINGW/$CPU/" + echo "\tbuild install/MINGW/$CPU/test.exe..." + $CC -s -O2 -Iinclude/ test/test.c \ + -o "install/MINGW/$CPU/test.exe" -lWinDivert \ + -L"install/MINGW/$CPU/" if [ $HAVE_SYS = yes ] then echo "\tcopy install/MINGW/$CPU/WinDivert$BITS.sys..." diff --git a/release-build.sh b/release-build.sh index c63b203..b3c29aa 100644 --- a/release-build.sh +++ b/release-build.sh @@ -77,6 +77,11 @@ do then echo "\t\033[33mWARNING\033[0m: unsigned WinDivert32.sys..." fi + if [ -d "install/$TARGET/amd64" ] + then + echo "\tcopy $INSTALL/amd64/WinDivert64.sys..." + cp install/$TARGET/amd64/WinDivert64.sys $INSTALL/x86 + fi echo "\tcopy $INSTALL/x86/WinDivert.lib..." cp install/$TARGET/i386/WinDivert.lib $INSTALL/x86 echo "\tcopy $INSTALL/x86/WinDivert.dll..." @@ -97,6 +102,8 @@ do cp install/$TARGET/i386/socketdump.exe $INSTALL/x86 echo "\tcopy $INSTALL/x86/windivertctl.exe..." cp install/$TARGET/i386/windivertctl.exe $INSTALL/x86 + echo "\tcopy $INSTALL/x86/test.exe..." + cp install/$TARGET/i386/test.exe $INSTALL/x86 if [ -d "install/$TARGET/amd64" ] then echo "\tmake $INSTALL/amd64..." @@ -128,6 +135,8 @@ do cp install/$TARGET/amd64/socketdump.exe $INSTALL/x64 echo "\tcopy $INSTALL/x64/windivertctl.exe..." cp install/$TARGET/amd64/windivertctl.exe $INSTALL/x64 + echo "\tcopy $INSTALL/x64/test.exe..." + cp install/$TARGET/amd64/test.exe $INSTALL/x64 else echo "\tWARNING: skipping missing AMD64 build..." fi