repository: C:/dev/kvm-guest-drivers-windows
branch: master
commit 7ce273108e7dd47eca54e55cfd85121c2dbb67dd
Author: Yan Vugenfirer <[email protected]>
Date: Thu Feb 11 16:04:37 2010 +0200
[WIN-GUEST-DRIVERS] NetKVM - add ability to compile specificly for Windows
7.
Signed-off-by: Yan Vugenfirer <[email protected]>
diff --git a/NetKVM/Common/common.mak b/NetKVM/Common/common.mak
index 4766517..deb0974 100644
--- a/NetKVM/Common/common.mak
+++ b/NetKVM/Common/common.mak
@@ -12,6 +12,8 @@ C_DEFINES=$(C_DEFINES) -DNDIS51_MINIPORT=1
C_DEFINES=$(C_DEFINES) -DNDIS51_MINIPORT=1
!elseif "$(DDK_TARGET_OS)"=="WinLH"
C_DEFINES=$(C_DEFINES) -DNDIS60_MINIPORT=1
+!elseif "$(DDK_TARGET_OS)"=="Win7"
+C_DEFINES=$(C_DEFINES) -DNDIS60_MINIPORT=1
!else
!error DDK_TARGET_OS defined as "$(DDK_TARGET_OS)" (unsupported)
!endif
diff --git a/NetKVM/buildAll.bat b/NetKVM/buildAll.bat
index c4bb148..73c15a5 100644
--- a/NetKVM/buildAll.bat
+++ b/NetKVM/buildAll.bat
@@ -23,7 +23,8 @@ set
_DRIVER_ISO_NAME=Install-%_MINORVERSION_%%_MAJORVERSION_%.iso
if not "%1"=="" goto parameters_here
echo no parameters specified, rebuild all
call clean.bat
-call "%0" Vista Vista64 XP XP64 Win2K
+:call "%0" Vista Vista64 XP XP64 Win2K
+call "%0" Win7 Win7_64 Vista Vista64 XP XP64
call :PackInstall
goto :eof
:parameters_here
@@ -59,6 +60,31 @@ set
_VERSION_=%_NT_TARGET_MAJ%.%_NT_TARGET_MIN%.%_MAJORVERSION_%.%_MINORVERSION_
echo version set: %_VERSION_%
goto :eof
+
+:Win7
+set DDKBUILDENV=
+pushd %BUILDROOT%
+call %BUILDROOT%\bin\setenv.bat %BUILDROOT% fre Win7
+popd
+call :preparebuild Common wlh VirtIO
+build -cZg
+
+if exist wlh\objfre_win7_x86\i386\netkvm.sys call tools\makeinstall x86
wlh\objfre_win7_x86\i386\netkvm.sys wlh\netkvm.inf %_VERSION_% Win7
+if not exist wlh\objfre_win7_x86\i386\netkvm.sys goto :eof
+goto continue
+
+:Win7_64
+set DDKBUILDENV=
+pushd %BUILDROOT%
+call %BUILDROOT%\bin\setenv.bat %BUILDROOT% %X64ENV% fre Win7
+popd
+call :preparebuild Common wlh VirtIO
+build -cZg
+
+if exist wlh\objfre_win7_amd64\amd64\netkvm.sys call tools\makeinstall amd64
wlh\objfre_win7_amd64\amd64\netkvm.sys wlh\netkvm.inf %_VERSION_% Win7
+if not exist wlh\objfre_win7_amd64\amd64\netkvm.sys goto :eof
+goto continue
+
:Vista
set DDKBUILDENV=
pushd %BUILDROOT%
@@ -126,8 +152,8 @@ goto continue
:installer
-"C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" /Rebuild
"Release" Installer\Package\Package.sln /Log Installer\Package\build.log
-goto continue
+:"C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" /Rebuild
"Release" Installer\Package\Package.sln /Log Installer\Package\build.log
+:goto continue
:PackInstall
:echo Packing to ISO image
diff --git a/NetKVM/clean.bat b/NetKVM/clean.bat
index 1d293a8..8987cb7 100644
--- a/NetKVM/clean.bat
+++ b/NetKVM/clean.bat
@@ -1,5 +1,8 @@
rmdir /S /Q wlh\objfre_wlh_x86
rmdir /S /Q wlh\objfre_wlh_amd64
+rmdir /S /Q wlh\objfre_win7_amd64
+rmdir /S /Q wlh\objfre_win7_x86
+
del wlh\BuildLog.htm
rmdir /S /Q wxp\objfre_wnet_amd64
@@ -12,12 +15,16 @@ rmdir /S /Q virtio\objfre_wnet_amd64
rmdir /S /Q virtio\objfre_w2k_x86
rmdir /S /Q virtio\objfre_wxp_x86
rmdir /S /Q virtio\objfre_wlh_amd64
+rmdir /S /Q virtio\objfre_win7_amd64
+rmdir /S /Q virtio\objfre_win7_x86
rmdir /S /Q common\objfre_wlh_x86
rmdir /S /Q common\objfre_wnet_amd64
rmdir /S /Q common\objfre_w2k_x86
rmdir /S /Q common\objfre_wxp_x86
rmdir /S /Q common\objfre_wlh_amd64
+rmdir /S /Q common\objfre_win7_amd64
+rmdir /S /Q common\objfre_win7_x86
rmdir /S /Q Install
diff --git a/NetKVM/tools/makeinstall.bat b/NetKVM/tools/makeinstall.bat
index 15ed8bc..7717618 100644
--- a/NetKVM/tools/makeinstall.bat
+++ b/NetKVM/tools/makeinstall.bat
@@ -2,7 +2,7 @@
: Param2 - path to SYS file
: Param3 - path to INF file
: Param4 - version in x.x.x.x form
-: Param5 - Vista | XP | 2K
+: Param5 - Win7 | Vista | XP | 2K
if /i "%1"=="x86" goto makeinstall
diff --git a/NetKVM/tools/signing.cmd b/NetKVM/tools/signing.cmd
index 949535a..1daf47e 100644
--- a/NetKVM/tools/signing.cmd
+++ b/NetKVM/tools/signing.cmd
@@ -1,4 +1,4 @@
-: Param1=signVista | signXP | sigtn2K
+: Param1=signWin7 | signVista | signXP | sigtn2K
: Param2=x86 | amd64
: Param3=path to INF file (SYS must be is in the same place)
: Param4=version string to patch INF
@@ -10,6 +10,7 @@ if exist %BUILDROOT%\bin\SelfSign\signability.exe set
USESIGNABILITY=old
if "%1"=="signVista" goto signVista%USESIGNABILITY%
if "%1"=="signXP" goto signXP%USESIGNABILITY%
if "%1"=="sign2K" goto sign2K%USESIGNABILITY%
+if "%1"=="signWin7" goto signWin7%USESIGNABILITY%
echo unsupported parameter %1
goto :eof
:create
@@ -28,9 +29,17 @@ goto :eof
:signVista
shift
-if /i "%1"=="x86" set _OSMASK_=Vista_X86,Server2008_X86
-if /i "%1"=="amd64" set _OSMASK_=Vista_X64,Server2008_X64
-if /i "%1"=="x64" set _OSMASK_=Vista_X64,Server2008_X64
+if /i "%1"=="x86" set _OSMASK_=Vista_X86,Server2008_X86,7_X86
+if /i "%1"=="amd64" set _OSMASK_=Vista_X64,Server2008_X64,7_X64
+if /i "%1"=="x64" set _OSMASK_=Vista_X64,Server2008_X64,7_X64
+call :dosign %1 %2 %3
+goto :eof
+
+:signWin7
+shift
+if /i "%1"=="x86" set _OSMASK_=Vista_X86,Server2008_X86,7_X86
+if /i "%1"=="amd64" set _OSMASK_=Vista_X64,Server2008_X64,7_X64
+if /i "%1"=="x64" set _OSMASK_=Vista_X64,Server2008_X64,7_X64
call :dosign %1 %2 %3
goto :eof
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
