feat(GraphViz): Bump version to 2.42.2

Signed-off-by: Gordon Smith <gordonjsmith@gmail.com>
GordonSmith · Jan 7, 2020 · 782dfdf · 782dfdf
1 parent 63c302e
commit 782dfdf
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 build/
 dist/
 emsdk/
-graphviz-2.40.1/
+src-graphviz/
 lib-*/
 node_modules/
 types/

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.9.2)
 
 PROJECT(cpp)
 
-SET(GRAPHVIZSRC_DIRS "${CMAKE_SOURCE_DIR}/../graphviz-2.40.1")
+SET(GRAPHVIZSRC_DIRS "${CMAKE_SOURCE_DIR}/../src-graphviz")
 
 SET(CMAKE_INSTALL_PREFIX "..")
 

diff --git a/cpp/graphviz/config.h b/cpp/graphviz/config.h
@@ -1,4 +1,4 @@
-#include <../../graphviz-2.40.1/config.h>
+#include <../../src-graphviz/config.h>
 #undef ENABLE_LTDL
 #undef HAVE_EXPAT
 #undef HAVE_EXPAT_H

diff --git a/cpp/graphviz/lib/cgraph/CMakeLists.txt b/cpp/graphviz/lib/cgraph/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(SRCS
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/attr.c
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/edge.c
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/flatten.c
-    ${GRAPHVIZSRC_DIRS}/lib/cgraph/grammar.c
+    ${GRAPHVIZSRC_DIRS}/build/lib/cgraph/grammar.c
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/graph.c
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/id.c
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/imap.c
@@ -18,13 +18,14 @@ SET(SRCS
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/pend.c
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/rec.c
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/refstr.c
-    ${GRAPHVIZSRC_DIRS}/lib/cgraph/scan.c
+    ${GRAPHVIZSRC_DIRS}/build/lib/cgraph/scan.c
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/subg.c
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/utils.c
     ${GRAPHVIZSRC_DIRS}/lib/cgraph/write.c
 )
 
 INCLUDE_DIRECTORIES(
+    ${GRAPHVIZSRC_DIRS}/build/lib/cgraph
     ${GRAPHVIZSRC_DIRS}/lib/cgraph
     ${GRAPHVIZSRC_DIRS}/lib/cdt
     ${GRAPHVIZSRC_DIRS}/lib/common
@@ -37,4 +38,4 @@ ADD_LIBRARY(cgraph STATIC
 TARGET_LINK_LIBRARIES(cgraph 
     cdt
     common
-)
+)
diff --git a/cpp/graphviz/lib/common/CMakeLists.txt b/cpp/graphviz/lib/common/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(SRCS
     ${GRAPHVIZSRC_DIRS}/lib/common/geom.c
     ${GRAPHVIZSRC_DIRS}/lib/common/globals.c
     ${GRAPHVIZSRC_DIRS}/lib/common/htmllex.c
-    ${GRAPHVIZSRC_DIRS}/lib/common/htmlparse.c
+    ${GRAPHVIZSRC_DIRS}/build/lib/common/htmlparse.c
     ${GRAPHVIZSRC_DIRS}/lib/common/htmltable.c
     ${GRAPHVIZSRC_DIRS}/lib/common/input.c
     ${GRAPHVIZSRC_DIRS}/lib/common/intset.c
@@ -30,6 +30,7 @@ SET(SRCS
 )
 
 INCLUDE_DIRECTORIES(
+    ${GRAPHVIZSRC_DIRS}/build/lib/common
     ${GRAPHVIZSRC_DIRS}/lib/common
     ${GRAPHVIZSRC_DIRS}/lib/cdt
     ${GRAPHVIZSRC_DIRS}/lib/cgraph

diff --git a/cpp/graphviz/plugin/core/CMakeLists.txt b/cpp/graphviz/plugin/core/CMakeLists.txt
@@ -17,6 +17,7 @@ SET(SRCS
 )
 
 INCLUDE_DIRECTORIES(
+    ${GRAPHVIZSRC_DIRS}/build/plugin/core
     ${GRAPHVIZSRC_DIRS}/plugin/core
     ${GRAPHVIZSRC_DIRS}/lib/vpsc
     ${GRAPHVIZSRC_DIRS}/lib/twopigen

diff --git a/scripts/cpp-install-graphviz.sh b/scripts/cpp-install-graphviz.sh
@@ -1,10 +1,22 @@
 #!/bin/bash
-if [ ! -d "graphviz-2.40.1" ] 
+if [ ! -d "src-graphviz" ] 
 then
-    wget -c https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz 
-    tar -xzf ./graphviz.tar.gz
-    cd ./graphviz-2.40.1
+    wget -c https://gitlab.com/graphviz/graphviz/-/archive/stable_release_2.42.2/graphviz-stable_release_2.42.2.tar.gz
+    mkdir ./src-graphviz
+    tar -xzf ./graphviz-stable_release_2.42.2.tar.gz -C ./src-graphviz --strip-components=1
+    rm ./graphviz-stable_release_2.42.2.tar.gz
+
+    #  Configure  ---
+    cd ./src-graphviz
+    ./autogen.sh
     ./configure
+
+    #  Generate grammar files (and others)  ---
+    mkdir ./build
+    cd ./build
+    cmake ..
+    cmake --build . -- -j7
+    cd ..
+
     cd ..
-    rm ./graphviz.tar.gz
 fi