Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

try to fix windows build (#4468)

This commit is contained in:
Jan Christoph Uhde 2018-01-31 10:09:39 +01:00 committed by Jan
parent d577933b87
commit fd166d07f4
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdParty/iresearch/external/snowball/CMakeLists.txt vendored
View File

@ -17,11 +17,11 @@ INCLUDE(CheckCCompilerFlag)
INCLUDE(FindPerl) INCLUDE(FindPerl)
IF(NOT PERL_FOUND) IF(NOT PERL_FOUND)
MESSAGE(FATAL "Perl required to build snowball") MESSAGE(FATAL_ERROR "Perl required to build snowball")
ENDIF() ENDIF()
IF(NOT STEMMER_SOURCE_DIR) IF(NOT STEMMER_SOURCE_DIR)
MESSAGE(FATAL "Source directory required to build snowball") MESSAGE(FATAL_ERROR "Source directory required to build snowball")
ENDIF() ENDIF()
SET(CMAKE_CURRENT_SOURCE_DIR "${STEMMER_SOURCE_DIR}") SET(CMAKE_CURRENT_SOURCE_DIR "${STEMMER_SOURCE_DIR}")

8
Installation/Pipeline/Jenkinsfile.groovy
View File

@ -1351,7 +1351,11 @@ def buildEdition(os, edition, maintainer) {
} }
} }
else if (os == 'windows') { else if (os == 'windows') {
logFile = "..\\" + logFile echo "starting windows configure and build"
workspace = "${env.WORKSPACE}"
workspace = workspace.replace("\\", "/")
logFile = workspace + "/" + logFile
extra = "-DUSE_CATCH_TESTS=ON -DUSE_FAILURE_TESTS=ON -DDEBUG_SYNC_REPLICATION=ON" extra = "-DUSE_CATCH_TESTS=ON -DUSE_FAILURE_TESTS=ON -DDEBUG_SYNC_REPLICATION=ON"
if( edition == "enterprise"){ if( edition == "enterprise"){
extra += " -DUSE_ENTERPRISE=ON" extra += " -DUSE_ENTERPRISE=ON"
@ -1363,7 +1367,7 @@ def buildEdition(os, edition, maintainer) {
powershell "Remove-Item -Force -Recurse ${arch} -ErrorAction SilentlyContinue" powershell "Remove-Item -Force -Recurse ${arch} -ErrorAction SilentlyContinue"
powershell "New-Item -Force -ItemType Directory ${arch} -ErrorAction SilentlyContinue" powershell "New-Item -Force -ItemType Directory ${arch} -ErrorAction SilentlyContinue"
powershell "New-Item -ItemType Directory -Force -Path build" powershell "New-Item -ItemType Directory -Force -Path build"
powershell "cd build; ..\\configure\\${os}_vs2017_RelWithDebInfo.ps1 -build ${extra} | Add-Content -PassThru ${logFile}" powershell "cd build; ..\\configure\\${os}_vs2017_RelWithDebInfo.ps1 -build ${extra} | Add-Content -PassThru -Path \"${logFile}\""
} }
logStopStage(os, logFile) logStopStage(os, logFile)

8
Installation/Pipeline/Jenkinsfile.groovy.in
View File

@ -1351,7 +1351,11 @@ def buildEdition(os, edition, maintainer) {
} }
} }
else if (os == 'windows') { else if (os == 'windows') {
logFile = "..\\" + logFile echo "starting windows configure and build"
workspace = "${env.WORKSPACE}"
workspace = workspace.replace("\\", "/")
logFile = workspace + "/" + logFile
extra = "-DUSE_CATCH_TESTS=ON -DUSE_FAILURE_TESTS=ON -DDEBUG_SYNC_REPLICATION=ON" extra = "-DUSE_CATCH_TESTS=ON -DUSE_FAILURE_TESTS=ON -DDEBUG_SYNC_REPLICATION=ON"
if( edition == "enterprise"){ if( edition == "enterprise"){
extra += " -DUSE_ENTERPRISE=ON" extra += " -DUSE_ENTERPRISE=ON"
@ -1363,7 +1367,7 @@ def buildEdition(os, edition, maintainer) {
powershell "Remove-Item -Force -Recurse ${arch} -ErrorAction SilentlyContinue" powershell "Remove-Item -Force -Recurse ${arch} -ErrorAction SilentlyContinue"
powershell "New-Item -Force -ItemType Directory ${arch} -ErrorAction SilentlyContinue" powershell "New-Item -Force -ItemType Directory ${arch} -ErrorAction SilentlyContinue"
powershell "New-Item -ItemType Directory -Force -Path build" powershell "New-Item -ItemType Directory -Force -Path build"
powershell "cd build; ..\\configure\\${os}_vs2017_RelWithDebInfo.ps1 -build ${extra} | Add-Content -PassThru ${logFile}" powershell "cd build; ..\\configure\\${os}_vs2017_RelWithDebInfo.ps1 -build ${extra} | Add-Content -PassThru -Path \"${logFile}\""
} }
logStopStage(os, logFile) logStopStage(os, logFile)

4
configure/windows_common.ps1
View File

@ -9,8 +9,8 @@
#> #>
# set variables # set variables
$ErrorActionPreference = "Stop" $ErrorActionPreference = "Continue"
$PSDefaultParameterValues['*:ErrorAction']='Stop' $PSDefaultParameterValues['*:ErrorAction']='Continue'
$arango_source = split-path -parent $script_path $arango_source = split-path -parent $script_path

2
js/server/tests/resilience/shard-distribution-spec.js
View File

@ -171,7 +171,7 @@ describe('Shard distribution', function () {
// And is followed by a numeric value // And is followed by a numeric value
const nr = parseInt(shard.slice(1)); const nr = parseInt(shard.slice(1));
expect(nr).to.be.above(0); expect(nr).to.be.above(0);
return nr return nr;
}; };
const sortShardsNumericly = function (l, r) { const sortShardsNumericly = function (l, r) {