From 087391145a0f71fc08aa83df7abca0aff260ad24 Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Thu, 2 Jun 2016 23:09:47 +0800 Subject: [PATCH] Updated "WpdPack" string to "NpdPack". --- .gitignore | 2 +- Examples-pcap/winpcap_stress/winpcap_stress.dsp | 4 ++-- build_wpdpack.bat | 2 +- build_wpdpack.txt | 6 +++--- create_docs.bat | 2 +- create_examples.bat | 2 +- create_include.bat | 2 +- create_lib.bat | 2 +- create_web.bat | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 411b824c..08841f97 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,7 @@ sdv/ /installer/win7_winpcap/ /installer/win8_above/ /installer/win8_above_winpcap/ -/WpdPack/ +/NpdPack/ /dox/prj/ /packetWin7/Dll/Project/Debug*/ /packetWin7/Dll/Project/Release*/ diff --git a/Examples-pcap/winpcap_stress/winpcap_stress.dsp b/Examples-pcap/winpcap_stress/winpcap_stress.dsp index cdec5dce..28bae130 100644 --- a/Examples-pcap/winpcap_stress/winpcap_stress.dsp +++ b/Examples-pcap/winpcap_stress/winpcap_stress.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 wpcap.lib airpcap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../debug" /libpath:"../../lib" /libpath:"../../../../wpdpack/lib/" /libpath:"../../../WinPcap_Devpack/lib/" +# ADD LINK32 wpcap.lib airpcap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../debug" /libpath:"../../lib" /libpath:"../../../../npdpack/lib/" /libpath:"../../../WinPcap_Devpack/lib/" !ELSEIF "$(CFG)" == "winpcap_stress - Win32 Debug" @@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wpcap.lib airpcap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../debug" /libpath:"../../lib" /libpath:"../../../../wpdpack/lib/" /libpath:"../../../WinPcap_Devpack/lib/" +# ADD LINK32 wpcap.lib airpcap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../debug" /libpath:"../../lib" /libpath:"../../../../npdpack/lib/" /libpath:"../../../WinPcap_Devpack/lib/" !ENDIF diff --git a/build_wpdpack.bat b/build_wpdpack.bat index d62ae8ad..358cde24 100644 --- a/build_wpdpack.bat +++ b/build_wpdpack.bat @@ -1,6 +1,6 @@ @echo off -if "%2"== "" ( rd /s/q ./wpdpack 2>nul >nul) else ( rd /s /q "%2" 2>nul >nul) +if "%2"== "" ( rd /s/q ./npdpack 2>nul >nul) else ( rd /s /q "%2" 2>nul >nul) call create_include.bat %1 %2 diff --git a/build_wpdpack.txt b/build_wpdpack.txt index 1fd392c7..6188772b 100644 --- a/build_wpdpack.txt +++ b/build_wpdpack.txt @@ -1,4 +1,4 @@ -In order to build the developers' pack, you need to compile the various DLLs and then call build_wpdpack.bat +In order to build the developers' pack, you need to compile the various DLLs and then call build_npdpack.bat This batch file, in turn, calls the four batches - create_includes.bat creates the include folder - create_lib.bat creates the lib folder @@ -10,7 +10,7 @@ The syntax for the various scripts is winpcap_folder developer_folder winpcap_folder The winpcap sources folder. It is defaulted to .\ -developer_folder The developers' pack folder. It is defaulted to .\wpdpack. +developer_folder The developers' pack folder. It is defaulted to .\npdpack. -HINT: just call build_wpdpack.bat without any parameter! +HINT: just call build_npdpack.bat without any parameter! diff --git a/create_docs.bat b/create_docs.bat index 98379777..953729c4 100644 --- a/create_docs.bat +++ b/create_docs.bat @@ -1,6 +1,6 @@ @echo off -IF "%2"=="" (set WPDPACKDESTDIR=.\WpdPack\) ELSE (set WPDPACKDESTDIR=%2) +IF "%2"=="" (set WPDPACKDESTDIR=.\NpdPack\) ELSE (set WPDPACKDESTDIR=%2) IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) diff --git a/create_examples.bat b/create_examples.bat index 7125d8f8..b58da0c8 100644 --- a/create_examples.bat +++ b/create_examples.bat @@ -1,6 +1,6 @@ @echo off -IF "%2"=="" (set WPDPACKDESTDIR=.\WpdPack\) ELSE (set WPDPACKDESTDIR=%2) +IF "%2"=="" (set WPDPACKDESTDIR=.\NpdPack\) ELSE (set WPDPACKDESTDIR=%2) IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) diff --git a/create_include.bat b/create_include.bat index 8e8a2d4f..e1ef2510 100644 --- a/create_include.bat +++ b/create_include.bat @@ -1,6 +1,6 @@ @echo off -IF "%2"=="" (set WPDPACKDESTDIR=.\WpdPack\) ELSE (set WPDPACKDESTDIR=%2) +IF "%2"=="" (set WPDPACKDESTDIR=.\NpdPack\) ELSE (set WPDPACKDESTDIR=%2) IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) diff --git a/create_lib.bat b/create_lib.bat index 3dfb8c98..f4c59ea5 100644 --- a/create_lib.bat +++ b/create_lib.bat @@ -1,6 +1,6 @@ @echo off -IF "%2"=="" (set WPDPACKDESTDIR=.\WpdPack\) ELSE (set WPDPACKDESTDIR=%2) +IF "%2"=="" (set WPDPACKDESTDIR=.\NpdPack\) ELSE (set WPDPACKDESTDIR=%2) IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) diff --git a/create_web.bat b/create_web.bat index 33a9f812..a967e765 100644 --- a/create_web.bat +++ b/create_web.bat @@ -34,6 +34,6 @@ xcopy /v /y ".\packetNtx\Dll\Project\Release NT4 LOG_TO_FILE\x86\packet.dll" .\ rem rem docs rem -xcopy /s /e /v /y ".\wpdpack\docs\*.*" .\web\docs\docs_%1\ >nul +xcopy /s /e /v /y ".\npdpack\docs\*.*" .\web\docs\docs_%1\ >nul :end \ No newline at end of file