From 9d0a45321273d0bb66a5bf2da3290097e9068085 Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Wed, 13 Jul 2016 00:11:10 +0200 Subject: [PATCH] Changed Bison, Flex and SED source. These utilities were installed from sourceforge, but this website has been unstable lately. Often builds failed because the site was unreachable. The utilities are now included using a git submodule. --- .gitmodules | 3 +++ appveyor.yml | 8 +++----- windows/dependencies/graphviz-build-utilities | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) create mode 160000 windows/dependencies/graphviz-build-utilities diff --git a/.gitmodules b/.gitmodules index f7895d49f..b0df38906 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "windows/dependencies/libgd"] path = windows/dependencies/libgd url = https://github.com/libgd/libgd.git +[submodule "windows/dependencies/graphviz-build-utilities"] + path = windows/dependencies/graphviz-build-utilities + url = https://github.com/ErwinJanssen/graphviz-build-utilities.git diff --git a/appveyor.yml b/appveyor.yml index c28b4d4f5..f21002ed0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,9 +7,9 @@ environment: CHERE_INVOKING: 1 matrix: - compiler: msbuild - BISON: C:\ProgramData\chocolatey\lib\winflexbison\tools\win_bison.exe - FLEX: C:\ProgramData\chocolatey\lib\winflexbison\tools\win_flex.exe - SED: C:\Program Files (x86)\GnuWin32\bin\sed.exe + BISON: \%APPVEYOR_BUILD_FOLDER\%\windows\dependencies\graphviz-build-utilities\bison.exe + FLEX: \%APPVEYOR_BUILD_FOLDER\%\windows\dependencies\graphviz-build-utilities\flex.exe + SED: \%APPVEYOR_BUILD_FOLDER\%\windows\dependencies\graphviz-build-utilities\sed.exe #- compiler: msys2 #- compiler: cygwin @@ -18,8 +18,6 @@ install: - git submodule update --init # Only has to be installed when MSYS2 or Cygwin are enabled. #- cinst ghostscript - - cinst winflexbison - - cinst gnuwin32-sed.install # Compile libgd - ps: >- cd windows\dependencies\libgd diff --git a/windows/dependencies/graphviz-build-utilities b/windows/dependencies/graphviz-build-utilities new file mode 160000 index 000000000..bb8df88ae --- /dev/null +++ b/windows/dependencies/graphviz-build-utilities @@ -0,0 +1 @@ +Subproject commit bb8df88ae3385bd7b98400b1e318af0056474030 -- 2.40.0