mirror of
https://github.com/opencv/opencv.git
synced 2026-07-21 19:33:03 +04:00
Fixing 'doc' buildbot job: removing trailing whitespaces and tab indents
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
This commit is contained in:
Maxim Kostin
@@ -7,7 +7,7 @@ if defined VS120COMNTOOLS (
|
||||
set VSTOOLS="%VS120COMNTOOLS%"
|
||||
set VC_VER=120
|
||||
set FOUND_VC=1
|
||||
)
|
||||
)
|
||||
|
||||
set VSTOOLS=%VSTOOLS:"=%
|
||||
set "VSTOOLS=%VSTOOLS:\=/%"
|
||||
@@ -29,45 +29,45 @@ echo.
|
||||
call %VSVARS%
|
||||
|
||||
if %FOUND_VC%==1 (
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\x86\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\x86\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\x86\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\x86\INSTALL.vcxproj Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\x86\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\x86\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\x86\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\x86\INSTALL.vcxproj Release
|
||||
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\ARM\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\ARM\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\ARM\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\ARM\INSTALL.vcxproj Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\ARM\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\ARM\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\ARM\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.1\ARM\INSTALL.vcxproj Release
|
||||
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\x86\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\x86\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\x86\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\x86\INSTALL.vcxproj Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\x86\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\x86\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\x86\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\x86\INSTALL.vcxproj Release
|
||||
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\ARM\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\ARM\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\ARM\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\ARM\INSTALL.vcxproj Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\ARM\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\ARM\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\ARM\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.1\ARM\INSTALL.vcxproj Release
|
||||
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\x86\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\x86\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\x86\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\x86\INSTALL.vcxproj Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\x86\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\x86\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\x86\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\x86\INSTALL.vcxproj Release
|
||||
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\ARM\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\ARM\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\ARM\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\ARM\INSTALL.vcxproj Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\ARM\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\ARM\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\ARM\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WP\8.0\ARM\INSTALL.vcxproj Release
|
||||
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\x86\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\x86\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\x86\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\x86\INSTALL.vcxproj Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\x86\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\x86\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\x86\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\x86\INSTALL.vcxproj Release
|
||||
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\ARM\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\ARM\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\ARM\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\ARM\INSTALL.vcxproj Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\ARM\OpenCV.sln Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\ARM\INSTALL.vcxproj Debug
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\ARM\OpenCV.sln Release
|
||||
call:DoMSBuild ..\..\bin\WS\8.0\ARM\INSTALL.vcxproj Release
|
||||
)
|
||||
|
||||
echo.&goto:EOF
|
||||
|
||||
+13
-14
@@ -5,15 +5,15 @@ Requirements
|
||||
============
|
||||
CMake 3.1.0 or higher
|
||||
Windows Phone/Store 8.1 Visual Studio 2013
|
||||
Windows Phone/Store 8.0 Visual Studio 2012
|
||||
Windows Phone/Store 8.0 Visual Studio 2012
|
||||
|
||||
For example, to be able to build all Windows Phone and Windows Store projects install the following:
|
||||
|
||||
Install Visual Studio 2013 Community Edition
|
||||
http://go.microsoft.com/?linkid=9863608
|
||||
http://go.microsoft.com/?linkid=9863608
|
||||
|
||||
Install Visual Studio Express 2012 for Windows Desktop
|
||||
http://www.microsoft.com/en-us/download/details.aspx?id=34673
|
||||
Install Visual Studio Express 2012 for Windows Desktop
|
||||
http://www.microsoft.com/en-us/download/details.aspx?id=34673
|
||||
|
||||
|
||||
|
||||
@@ -24,11 +24,11 @@ setup_winrt.bat "WP,WS" "8.0,8.1" "x86,ARM"
|
||||
|
||||
If everything's fine, a few minutes later you will get the following output in the opencv/bin directory:
|
||||
|
||||
bin
|
||||
WP
|
||||
8.0
|
||||
bin
|
||||
WP
|
||||
8.0
|
||||
ARM
|
||||
x86
|
||||
x86
|
||||
8.1
|
||||
ARM
|
||||
x86
|
||||
@@ -38,7 +38,7 @@ bin
|
||||
x86
|
||||
8.1
|
||||
ARM
|
||||
x86
|
||||
x86
|
||||
|
||||
Build the OpenCV.sln for the particular platform you are targeting. Due to the current limitations of CMake, separate x86/x64/ARM projects must be generated for each platform.
|
||||
|
||||
@@ -48,8 +48,8 @@ You can also target a single specific configuration
|
||||
Or a subset of configurations
|
||||
setup_winrt.bat "WP,WS" "8.1" "x86"
|
||||
|
||||
To display the command line options for setup_winrt.bat
|
||||
setup_winrt.bat -h
|
||||
To display the command line options for setup_winrt.bat
|
||||
setup_winrt.bat -h
|
||||
|
||||
Note that x64 CMake generation support is as follows:
|
||||
------------------------------
|
||||
@@ -93,11 +93,10 @@ Windows Store 8.0 ARM
|
||||
cmake -G "Visual Studio 12 2013 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=8.0 <path-to-source>
|
||||
|
||||
Example
|
||||
=======
|
||||
======================================================
|
||||
|
||||
To generate Windows Phone 8.1 x86 project files in the opencv/bin dir
|
||||
|
||||
mkdir bin
|
||||
cd bin
|
||||
cmake -G "Visual Studio 12 2013" -DCMAKE_SYSTEM_NAME=WindowsPhone -DCMAKE_SYSTEM_VERSION=8.1 ../
|
||||
|
||||
cmake -G "Visual Studio 12 2013" -DCMAKE_SYSTEM_NAME=WindowsPhone -DCMAKE_SYSTEM_VERSION=8.1 ../
|
||||
@@ -1,10 +1,10 @@
|
||||
<#
|
||||
Copyright © Microsoft Open Technologies, Inc.
|
||||
All Rights Reserved
|
||||
All Rights Reserved
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
||||
You may obtain a copy of the License at
|
||||
You may obtain a copy of the License at
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
|
||||
@@ -110,11 +110,11 @@ function Call-MSBuild($path, $config)
|
||||
L "Executing: $($command)"
|
||||
msbuild $path /p:Configuration="$config" /m
|
||||
|
||||
if(-Not $?) {
|
||||
if(-Not $?) {
|
||||
Throw "Failure executing command: $($command)"
|
||||
}
|
||||
}
|
||||
|
||||
return $true
|
||||
return $true
|
||||
}
|
||||
|
||||
Function Execute() {
|
||||
@@ -122,10 +122,10 @@ Function Execute() {
|
||||
ShowHelp
|
||||
}
|
||||
|
||||
# Validating arguments.
|
||||
# Validating arguments.
|
||||
# This type of validation (rather than using ValidateSet()) is required to make .bat wrapper work
|
||||
|
||||
D "Input Platforms: $PLATFORMS_IN"
|
||||
D "Input Platforms: $PLATFORMS_IN"
|
||||
$platforms = New-Object System.Collections.ArrayList
|
||||
$PLATFORMS_IN.Split("," ,[System.StringSplitOptions]::RemoveEmptyEntries) | ForEach {
|
||||
$_ = $_.Trim()
|
||||
@@ -133,7 +133,7 @@ Function Execute() {
|
||||
[void]$platforms.Add($_)
|
||||
D "$_ is valid"
|
||||
} else {
|
||||
Throw "$($_) is not valid! Please use WP, WS"
|
||||
Throw "$($_) is not valid! Please use WP, WS"
|
||||
}
|
||||
}
|
||||
D "Processed Platforms: $platforms"
|
||||
@@ -144,9 +144,9 @@ Function Execute() {
|
||||
$_ = $_.Trim()
|
||||
if ("8.0","8.1" -Contains $_) {
|
||||
[void]$versions.Add($_)
|
||||
D "$_ is valid"
|
||||
D "$_ is valid"
|
||||
} else {
|
||||
Throw "$($_) is not valid! Please use 8.0, 8.1"
|
||||
Throw "$($_) is not valid! Please use 8.0, 8.1"
|
||||
}
|
||||
}
|
||||
D "Processed Versions: $versions"
|
||||
@@ -159,7 +159,7 @@ Function Execute() {
|
||||
$architectures.Add($_) > $null
|
||||
D "$_ is valid"
|
||||
} else {
|
||||
Throw "$($_) is not valid! Please use x86, x64, ARM"
|
||||
Throw "$($_) is not valid! Please use x86, x64, ARM"
|
||||
}
|
||||
}
|
||||
D "Processed Architectures: $architectures"
|
||||
@@ -231,7 +231,7 @@ Function Execute() {
|
||||
Push-Location -Path $path
|
||||
|
||||
L "Generating project:"
|
||||
L "cmake -G $genName -DCMAKE_SYSTEM_NAME:String=$platName -DCMAKE_SYSTEM_VERSION:String=$vers -DCMAKE_VS_EFFECTIVE_PLATFORMS:String=$arch -DCMAKE_INSTALL_PREFIX:PATH=$installPath $SRC"
|
||||
L "cmake -G $genName -DCMAKE_SYSTEM_NAME:String=$platName -DCMAKE_SYSTEM_VERSION:String=$vers -DCMAKE_VS_EFFECTIVE_PLATFORMS:String=$arch -DCMAKE_INSTALL_PREFIX:PATH=$installPath $SRC"
|
||||
cmake -G $genName -DCMAKE_SYSTEM_NAME:String=$platName -DCMAKE_SYSTEM_VERSION:String=$vers -DCMAKE_VS_EFFECTIVE_PLATFORMS:String=$arch -DCMAKE_INSTALL_PREFIX:PATH=$installPath $SRC
|
||||
L "-----------------------------------------------"
|
||||
|
||||
@@ -273,8 +273,8 @@ Function Execute() {
|
||||
Function ShowHelp() {
|
||||
Write-Host "Configures OpenCV and generates projects for specified verion of Visual Studio/platforms/architectures."
|
||||
Write-Host "Must be executed from the sources folder containing main CMakeLists configuration."
|
||||
Write-Host "Parameter keys can be shortened down to a signle symbol (e.g. '-a') and are not case sensitive."
|
||||
Write-Host "Proper parameter sequensing is required when omitting keys."
|
||||
Write-Host "Parameter keys can be shortened down to a single symbol (e.g. '-a') and are not case sensitive."
|
||||
Write-Host "Proper parameter sequencing is required when omitting keys."
|
||||
Write-Host "Generates the following folder structure, depending on the supplied parameters: "
|
||||
Write-Host " bin/ "
|
||||
Write-Host " | "
|
||||
@@ -286,7 +286,7 @@ Function ShowHelp() {
|
||||
Write-Host " | | |-x86 "
|
||||
Write-Host " | | |-x64 "
|
||||
Write-Host " | | |-ARM "
|
||||
Write-Host " "
|
||||
Write-Host " "
|
||||
Write-Host " USAGE: "
|
||||
Write-Host " Calling:"
|
||||
Write-Host " PS> setup_winrt.ps1 [params]"
|
||||
@@ -310,7 +310,7 @@ Function ShowHelp() {
|
||||
Write-Host " version - Array of platform versions. "
|
||||
Write-Host " Default: 8.1 "
|
||||
Write-Host " Example: '8.0,8.1' "
|
||||
Write-Host " Options: 8.0, 8.1. Available options may be limited depending on your local setup (e.g. SDK availability). "
|
||||
Write-Host " Options: 8.0, 8.1. Available options may be limited depending on your local setup (e.g. SDK availability). "
|
||||
Write-Host " Note that you'll need to use quotes to specify more than one version. "
|
||||
Write-Host " architecture - Array of target architectures to build for. "
|
||||
Write-Host " Default: x86 "
|
||||
|
||||
Reference in New Issue
Block a user