aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.appveyor.yml9
-rw-r--r--.appveyor/build.ps13
-rw-r--r--.appveyor/test.ps12
m---------um/cmake0
4 files changed, 9 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 22df3dd..7c05026 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,7 +11,6 @@ image: Visual Studio 2013
environment:
global:
python_exe: C:\Python36-x64\python.exe
- install_dir: C:\Projects\install\win7drv
matrix:
- appveyor_driver_target_os: Win7
- appveyor_driver_target_os: Win8
@@ -38,12 +37,12 @@ install:
build_script:
- cd um\cmake
- - '"%python_exe%" -m project.ci.appveyor.cmake --install "%install_dir%"'
+ - '"%python_exe%" -m project.ci.cmake --install'
- cd ..\..
- - ps: .\.appveyor\build.ps1 -InstallDir $env:install_dir
+ - ps: .\.appveyor\build.ps1 -InstallDir ..\build\install
after_build:
- - 7z.exe a "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%-%appveyor_driver_target_os%.zip" "%install_dir%"
+ - 7z.exe a "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%-%appveyor_driver_target_os%.zip" "..\build\install\*"
- appveyor.exe PushArtifact "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%-%appveyor_driver_target_os%.zip"
for:
@@ -68,4 +67,4 @@ for:
- ps: Start-Sleep -s 10
- appveyor.exe AddMessage "OK"
test_script:
- - ps: .\.appveyor\test.ps1 -InstallDir $env:install_dir
+ - ps: .\.appveyor\test.ps1 -InstallDir ..\build\install
diff --git a/.appveyor/build.ps1 b/.appveyor/build.ps1
index 432bca3..18e7cc6 100644
--- a/.appveyor/build.ps1
+++ b/.appveyor/build.ps1
@@ -134,6 +134,9 @@ function Build-ProjectAppVeyor {
$appveyor_cwd = pwd
}
+ $script:ProjectDir = (Resolve-Path $script:ProjectDir).Path
+ $script:InstallDir = (Resolve-Path $script:InstallDir).Path
+
try {
Build-ProjectKernelMode `
-ProjectDir $script:ProjectDir `
diff --git a/.appveyor/test.ps1 b/.appveyor/test.ps1
index c17e99e..8c28bf9 100644
--- a/.appveyor/test.ps1
+++ b/.appveyor/test.ps1
@@ -108,6 +108,8 @@ function Run-ProjectTestsAppVeyor {
$appveyor_cwd = pwd
}
+ $script:InstallDir = (Resolve-Path $script:InstallDir).Path
+
try {
Run-ProjectTests -InstallDir $script:InstallDir
} finally {
diff --git a/um/cmake b/um/cmake
-Subproject 62a426a08b7d16e58f0c906ed382aceb9bcb9aa
+Subproject f1d8aaf9bd9c8f6e8a0907422a34c023d527f13