Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6a9d2f1

Browse filesBrowse files
skvarkskvark
committed
Visual Studio 14, travis fixes
1 parent b404b87 commit 6a9d2f1
Copy full SHA for 6a9d2f1

File tree

2 files changed

+54
-54
lines changed
Filter options

2 files changed

+54
-54
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+53-53Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -648,41 +648,41 @@ before_install: |
648648
set -e
649649
650650
if [[ $SDIST == 1 ]]; then
651-
echo "sdist build"
651+
echo "sdist build"
652652
else
653-
# Check out and prepare the source
654-
# Multibuild doesn't have releases, so --depth would break eventually (see
655-
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
656-
git submodule update --init multibuild
657-
658-
source multibuild/common_utils.sh
659-
660-
# https://github.com/matthew-brett/multibuild/issues/116
661-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
662-
663-
source multibuild/travis_steps.sh
664-
# This sets -x
665-
666-
source travis_multibuild_customize.sh
667-
echo $ENABLE_CONTRIB > contrib.enabled
668-
echo $ENABLE_HEADLESS > headless.enabled
669-
670-
if [ -n "$IS_OSX" ]; then
671-
echo "homebrew"
672-
TAPS="$(brew --repository)/Library/Taps"
673-
if [ -e "$TAPS/caskroom/homebrew-cask" -a -e "$TAPS/homebrew/homebrew-cask" ]; then
674-
rm -rf "$TAPS/caskroom/homebrew-cask"
675-
fi
676-
find "$TAPS" -type d -name .git -exec \
677-
bash -xec '
678-
cd $(dirname '\''{}'\'') || echo "status: $?"
679-
git clean -fxd || echo "status: $?"
680-
sleep 1 || echo "status: $?"
681-
git status || echo "status: $?"' \; || echo "status: $?"
682-
brew_cache_cleanup
653+
# Check out and prepare the source
654+
# Multibuild doesn't have releases, so --depth would break eventually (see
655+
# https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
656+
git submodule update --init multibuild
657+
658+
source multibuild/common_utils.sh
659+
660+
# https://github.com/matthew-brett/multibuild/issues/116
661+
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
662+
663+
source multibuild/travis_steps.sh
664+
# This sets -x
665+
666+
source travis_multibuild_customize.sh
667+
echo $ENABLE_CONTRIB > contrib.enabled
668+
echo $ENABLE_HEADLESS > headless.enabled
669+
670+
if [ -n "$IS_OSX" ]; then
671+
echo "homebrew"
672+
TAPS="$(brew --repository)/Library/Taps"
673+
if [ -e "$TAPS/caskroom/homebrew-cask" -a -e "$TAPS/homebrew/homebrew-cask" ]; then
674+
rm -rf "$TAPS/caskroom/homebrew-cask"
683675
fi
684-
echo "end"
685-
# Not interested in travis internal scripts' output
676+
find "$TAPS" -type d -name .git -exec \
677+
bash -xec '
678+
cd $(dirname '\''{}'\'') || echo "status: $?"
679+
git clean -fxd || echo "status: $?"
680+
sleep 1 || echo "status: $?"
681+
git status || echo "status: $?"' \; || echo "status: $?"
682+
brew_cache_cleanup
683+
fi
684+
echo "end"
685+
# Not interested in travis internal scripts' output
686686
fi
687687
688688
set +x
@@ -692,11 +692,11 @@ install: |
692692
set -x
693693
694694
if [[ $SDIST == 1 ]]; then
695-
python -m pip install --upgrade pip
696-
python -m pip install scikit-build
697-
python setup.py sdist
695+
python -m pip install --upgrade pip
696+
python -m pip install scikit-build
697+
python setup.py sdist
698698
else
699-
build_wheel $REPO_DIR $PLAT
699+
build_wheel $REPO_DIR $PLAT
700700
fi
701701
702702
set +x
@@ -708,7 +708,7 @@ script: |
708708
if [[ $SDIST == 1 ]]; then
709709
echo "sdist"
710710
else
711-
install_run $PLAT && rc=$? || rc=$?
711+
install_run $PLAT && rc=$? || rc=$?
712712
fi
713713
714714
set +x
@@ -724,12 +724,12 @@ before_cache: |
724724
set -e; set -x
725725
if [ -n "$IS_OSX" ]; then
726726
727-
# When Taps is cached, this dir causes "Error: file exists" on `brew update`
728-
if [ -e "$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask" ]; then
729-
rm -rf "$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask"
730-
fi
727+
# When Taps is cached, this dir causes "Error: file exists" on `brew update`
728+
if [ -e "$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask" ]; then
729+
rm -rf "$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask"
730+
fi
731731
732-
brew_cache_cleanup
732+
brew_cache_cleanup
733733
734734
fi
735735
set +x; set +e
@@ -742,17 +742,17 @@ after_success: |
742742
if [ -n "$TRAVIS_TAG" ]; then
743743
744744
if [[ $ENABLE_CONTRIB == 0 ]]; then
745-
if [[ $ENABLE_HEADLESS == 0 ]]; then
746-
echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
747-
else
748-
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
749-
fi
745+
if [[ $ENABLE_HEADLESS == 0 ]]; then
746+
echo "This is default build. Deployment will be done to to PyPI entry opencv-python."
747+
else
748+
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-python-headless."
749+
fi
750750
else
751-
if [[ $ENABLE_HEADLESS == 0 ]]; then
752-
echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
753-
else
754-
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
755-
fi
751+
if [[ $ENABLE_HEADLESS == 0 ]]; then
752+
echo "This is contrib build. Deployment will be done to to PyPI entry opencv-contrib-python."
753+
else
754+
echo "This is headless contrib build. Deployment will be done to to PyPI entry opencv-contrib-python-headless."
755+
fi
756756
fi
757757
758758
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def main():
9898

9999
cmake_args = (
100100
(
101-
["-G", "Visual Studio 15" + (" Win64" if x64 else "")]
101+
["-G", "Visual Studio 14" + (" Win64" if x64 else "")]
102102
if os.name == "nt"
103103
else ["-G", "Unix Makefiles"] # don't make CMake try (and fail) Ninja first
104104
)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.