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.

diff --git a/.gitmodules b/.gitmodules
index f7895d49f6fee794af6bca0413c20f042805c523..b0df38906f7060ab43d55516e4713a673133b012 100644 (file)
--- 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 c28b4d4f5985ea7b173e8996bc292624931964da..f21002ed0bacc808e023a89a8491c8a9fe998bb0 100644 (file)
--- 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 (submodule)
index 0000000..bb8df88
--- /dev/null
+++ b/windows/dependencies/graphviz-build-utilities
@@ -0,0 +1 @@
+Subproject commit bb8df88ae3385bd7b98400b1e318af0056474030