jjb/jenkins-job-builder
Code Issues Proposed changes

Merge "builders: do not pass empty "preload-script""

Browse Source
This commit is contained in:
Jenkins
2017-06-20 16:00:51 +00:00
committed by Gerrit Code Review
parent de510c5cbd 0d39fcae54
commit 39faea3e5d
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/builders/fixtures/cmake/version-1.10/common-1.x.xml
View File

@@ -4,8 +4,8 @@
<hudson.plugins.cmake.CmakeBuilder>
<sourceDir>path/to/source</sourceDir>
<generator>Unix Makefiles</generator>
<preloadScript/>
<cleanBuild>false</cleanBuild>
<preloadScript/>
<buildDir>path/to/build</buildDir>
<installDir>path/to/install</installDir>
<buildType>Debug</buildType>

2
tests/builders/fixtures/cmake/version-1.10/complete-1.x.xml
View File

@@ -4,8 +4,8 @@
<hudson.plugins.cmake.CmakeBuilder>
<sourceDir>path/to/source</sourceDir>
<generator>NMake Makefiles</generator>
<preloadScript>path/to/source/cmake.preload</preloadScript>
<cleanBuild>true</cleanBuild>
<preloadScript>path/to/source/cmake.preload</preloadScript>
<buildDir>path/to/build</buildDir>
<installDir>path/to/install</installDir>
<buildType>Debug</buildType>

1
tests/builders/fixtures/cmake/version-2.0/common-2.x.xml
View File

@@ -4,7 +4,6 @@
<hudson.plugins.cmake.CmakeBuilder>
<sourceDir>path/to/source</sourceDir>
<generator>Unix Makefiles</generator>
<preloadScript/>
<cleanBuild>false</cleanBuild>
<workingDir>path/to/build</workingDir>
<buildType>Debug</buildType>

2
tests/builders/fixtures/cmake/version-2.0/complete-2.x.xml
View File

@@ -4,8 +4,8 @@
<hudson.plugins.cmake.CmakeBuilder>
<sourceDir>path/to/source</sourceDir>
<generator>NMake Makefiles</generator>
<preloadScript>path/to/source/cmake.preload</preloadScript>
<cleanBuild>true</cleanBuild>
<preloadScript>path/to/source/cmake.preload</preloadScript>
<workingDir>path/to/build</workingDir>
<buildType>CustomReleaseType</buildType>
<installationName>CMake custom install</installationName>