Merge pull request #13 from goccy/feature/update-github-actions

Support build for windows
goccy · Feb 10, 2020 · 836f224 · 836f224
2 parents 60b33c0 + 9f71741
commit 836f224
Show file tree

Hide file tree

Showing 19 changed files with 67 additions and 33 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -1,12 +1,13 @@
 name: Go
 on: [push]
 jobs:
-
   build:
     name: Build
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
-
     - name: Set up Go 1.13
       uses: actions/setup-go@v1
       with:

diff --git a/graphviz_test.go b/graphviz_test.go
@@ -37,8 +37,8 @@ func TestGraphviz_Image(t *testing.T) {
 			if err := g.Render(graph, graphviz.PNG, &buf); err != nil {
 				t.Fatalf("%+v", err)
 			}
-			if len(buf.Bytes()) != 4610 {
-				t.Fatal("failed to encode png")
+			if len(buf.Bytes()) != 4638 {
+				t.Fatalf("failed to encode png: bytes length is %d", len(buf.Bytes()))
 			}
 		})
 		t.Run("RenderImage", func(t *testing.T) {
@@ -61,8 +61,8 @@ func TestGraphviz_Image(t *testing.T) {
 			if err := g.Render(graph, graphviz.JPG, &buf); err != nil {
 				t.Fatalf("%+v", err)
 			}
-			if len(buf.Bytes()) != 3322 {
-				t.Fatal("failed to encode png")
+			if len(buf.Bytes()) != 3281 {
+				t.Fatalf("failed to encode jpg: bytes length is %d", len(buf.Bytes()))
 			}
 		})
 		t.Run("RenderImage", func(t *testing.T) {

diff --git a/internal/ccall/builtin.c b/internal/ccall/builtin.c
@@ -2,14 +2,15 @@
 #include "gvplugin.h"
 #include "gvplugin_render.h"
 #include <stdio.h>
+#include "_cgo_export.h"
 
 extern gvplugin_library_t gvplugin_dot_layout_LTX_library;
 extern gvplugin_library_t gvplugin_neato_layout_LTX_library;
 extern gvplugin_library_t gvplugin_core_LTX_library;
 extern gvplugin_library_t gvplugin_go_library;
 
-lt_symlist_t lt_preloaded_symbols[] = {
-	{ "gvplugin_dot_layout_LTX_library", (void*)(&gvplugin_dot_layout_LTX_library) },
+lt_symlist_t lt_preloaded_symbols[PRLOADED_SYMBOL_N] = {
+    { "gvplugin_dot_layout_LTX_library", (void *)(&gvplugin_dot_layout_LTX_library) },
     { "gvplugin_neato_layout_LTX_library", (void*)(&gvplugin_neato_layout_LTX_library) },
 	{ "gvplugin_core_LTX_library", (void*)(&gvplugin_core_LTX_library) },
     { "gvplugin_go_LTX_library", (void*)(&gvplugin_go_library) },
@@ -29,8 +30,6 @@ gvplugin_library_t gvplugin_go_library = { "go", go_apis };
 
 typedef enum { FORMAT_PNG, FORMAT_JPG } go_format_type;
 
-#include "_cgo_export.h"
-
 void *call_searchf(Dtsearch_f searchf, Dt_t *a0, void *a1, int a2) {
     return searchf(a0, a1, a2);
 }

diff --git a/internal/ccall/ccall.go b/internal/ccall/ccall.go
@@ -22,8 +22,9 @@ package ccall
 #cgo CFLAGS: -Itwopigen
 #cgo CFLAGS: -I../
 #cgo CFLAGS: -I../libltdl
-#cgo CFLAGS: -Wno-unused-result -Wno-format
+#cgo CFLAGS: -Wno-unused-result -Wno-format -Wno-pointer-to-int-cast -Wno-attributes
 #cgo LDFLAGS: -lm
+#include "config.h"
 #include "gvc.h"
 #include "color.h"
 #include "gvcjob.h"

diff --git a/internal/ccall/cdt.go b/internal/ccall/cdt.go
@@ -22,7 +22,8 @@ package ccall
 #cgo CFLAGS: -Itwopigen
 #cgo CFLAGS: -I../
 #cgo CFLAGS: -I../libltdl
-#cgo CFLAGS: -Wno-unused-result -Wno-format
+#cgo CFLAGS: -Wno-unused-result -Wno-format -Wno-pointer-to-int-cast -Wno-attributes
+#include "config.h"
 #include "cdt.h"
 
 extern void *call_searchf(Dtsearch_f searchf, Dt_t *a0, void *a1, int a2);
@@ -330,7 +331,7 @@ func (g *Dtdisc) Memory() Dtmemory {
 		return g.memoryf
 	}
 	return func(a0 *Dict, a1 unsafe.Pointer, a2 uint, a3 *Dtdisc) unsafe.Pointer {
-		return C.call_memoryf(g.c.memoryf, a0.c, a1, C.ulong(a2), a3.c)
+		return C.call_memoryf(g.c.memoryf, a0.c, a1, C.size_t(a2), a3.c)
 	}
 }
 
@@ -407,7 +408,7 @@ func (g *Dict) Memory() Dtmemory {
 		return g.memory
 	}
 	return func(a0 *Dict, a1 unsafe.Pointer, a2 uint, a3 *Dtdisc) unsafe.Pointer {
-		return C.call_memoryf(g.c.memoryf, a0.c, a1, C.ulong(a2), a3.c)
+		return C.call_memoryf(g.c.memoryf, a0.c, a1, C.size_t(a2), a3.c)
 	}
 }
 

diff --git a/internal/ccall/cdt/cdt.h b/internal/ccall/cdt/cdt.h
@@ -160,10 +160,10 @@ struct _dtstat_s
 
 /* public data */
 #if defined(_BLD_cdt) && defined(__EXPORT__)
-#define extern	__EXPORT__
+#define extern
 #endif
 #if !defined(_BLD_cdt) && defined(__IMPORT__)
-#define extern	__IMPORT__
+#define extern
 #endif
 
 extern Dtmethod_t* 	Dtset;
@@ -191,7 +191,7 @@ extern Dtmethod_t	_Dtstack;
 
 /* public functions */
 #if defined(_BLD_cdt) && defined(__EXPORT__)
-#define extern	__EXPORT__
+#define extern
 #endif
 
 extern Dt_t*		dtopen(Dtdisc_t*, Dtmethod_t*);

diff --git a/internal/ccall/cgraph.go b/internal/ccall/cgraph.go
@@ -22,7 +22,8 @@ package ccall
 #cgo CFLAGS: -Itwopigen
 #cgo CFLAGS: -I../
 #cgo CFLAGS: -I../libltdl
-#cgo CFLAGS: -Wno-unused-result -Wno-format
+#cgo CFLAGS: -Wno-unused-result -Wno-format -Wno-pointer-to-int-cast -Wno-attributes
+#include "config.h"
 #include "cgraph.h"
 #include <stdlib.h>
 
@@ -1150,7 +1151,7 @@ func Agcountuniqedges(g *Agraph, n *Agnode, in int, out int) int {
 }
 
 func Agalloc(g *Agraph, size uint) unsafe.Pointer {
-	return C.agalloc(g.c, C.ulong(size))
+	return C.agalloc(g.c, C.size_t(size))
 }
 
 func Agfree(g *Agraph, ptr unsafe.Pointer) {

diff --git a/internal/ccall/common.go b/internal/ccall/common.go
@@ -22,7 +22,8 @@ package ccall
 #cgo CFLAGS: -Itwopigen
 #cgo CFLAGS: -I../
 #cgo CFLAGS: -I../libltdl
-#cgo CFLAGS: -Wno-unused-result -Wno-format
+#cgo CFLAGS: -Wno-unused-result -Wno-format -Wno-pointer-to-int-cast -Wno-attributes
+#include "config.h"
 #include "gvc.h"
 #include "gvcjob.h"
 #include "textspan.h"

diff --git a/internal/ccall/common/geom.c b/internal/ccall/common/geom.c
@@ -19,7 +19,9 @@
 #include "geom.h"
 #include "geomprocs.h"
 #ifdef _WIN32
-#define inline 
+#ifndef inline
+#define inline
+#endif
 #endif
 
 box mkbox(point p, point q)

diff --git a/internal/ccall/common/geomprocs.h b/internal/ccall/common/geomprocs.h
@@ -26,9 +26,9 @@ extern "C" {
 
 #ifdef _WIN32
 #ifdef GVDLL
-#define extern __declspec(dllexport)
+#define extern
 #else
-#define extern __declspec(dllimport)
+#define extern
 #endif
 #endif	
 

diff --git a/internal/ccall/common/memory.h b/internal/ccall/common/memory.h
@@ -14,6 +14,7 @@
 #ifndef GV_MEMORY_H
 #define GV_MEMORY_H
 
+#include "config.h"
 #include <stdlib.h>
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>

diff --git a/internal/ccall/gvc.go b/internal/ccall/gvc.go
@@ -22,7 +22,8 @@ package ccall
 #cgo CFLAGS: -Itwopigen
 #cgo CFLAGS: -I../
 #cgo CFLAGS: -I../libltdl
-#cgo CFLAGS: -Wno-unused-result -Wno-format
+#cgo CFLAGS: -Wno-unused-result -Wno-format -Wno-pointer-to-int-cast -Wno-attributes
+#include "config.h"
 #include "gvc.h"
 #include "gvcjob.h"
 #include "cgraph.h"
@@ -485,9 +486,9 @@ func (g *GVJ) OutputData() []byte {
 
 func (g *GVJ) SetOutputData(v []byte) {
 	length := len(v)
-	g.c.output_data = (*C.char)(C.realloc(unsafe.Pointer(g.c.output_data), C.ulong(length)))
+	g.c.output_data = (*C.char)(C.realloc(unsafe.Pointer(g.c.output_data), C.size_t(length)))
 	header := (*reflect.SliceHeader)(unsafe.Pointer(&v))
-	C.memcpy(unsafe.Pointer(g.c.output_data), unsafe.Pointer(header.Data), C.ulong(length))
+	C.memcpy(unsafe.Pointer(g.c.output_data), unsafe.Pointer(header.Data), C.size_t(length))
 	g.c.output_data_position = C.uint(length)
 }
 

diff --git a/internal/ccall/gvc/gvcext.h b/internal/ccall/gvc/gvcext.h
@@ -66,23 +66,22 @@ extern "C" {
 /*visual studio*/
 #ifdef WIN32
 #ifndef GVC_EXPORTS
-__declspec(dllimport) lt_symlist_t lt_preloaded_symbols[];
+__declspec(dllimport) lt_symlist_t lt_preloaded_symbols[PRLOADED_SYMBOL_N];
 #else
 //__declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
 #if !defined(LTDL_H)
-lt_symlist_t lt_preloaded_symbols[];
+lt_symlist_t lt_preloaded_symbols[PRLOADED_SYMBOL_N];
 #endif
 #endif
 #endif
 /*end visual studio*/
 
-
 #ifndef WIN32
 #if defined(GVDLL)
-	__declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
+	__declspec(dllexport) lt_symlist_t lt_preloaded_symbols[PRLOADED_SYMBOL_N];
 #else
 #if !defined(LTDL_H)
-	extern lt_symlist_t lt_preloaded_symbols[];
+	extern lt_symlist_t lt_preloaded_symbols[PRLOADED_SYMBOL_N];
 #endif
 #endif
 #endif

diff --git a/internal/ccall/gvc/gvconfig.c b/internal/ccall/gvc/gvconfig.c
@@ -16,7 +16,9 @@
 #include "gvconfig.h"
 
 #include	<string.h>
+#ifndef WIN32
 #include    <regex.h>
+#endif
 
 #ifdef ENABLE_LTDL
 #include	<sys/types.h>

diff --git a/internal/ccall/gvc/gvusershape.c b/internal/ccall/gvc/gvusershape.c
@@ -28,7 +28,10 @@
 #define DMKEY "Software\\Microsoft" //key to look for library dir
 #endif
 
+#ifndef WIN32
 #include <regex.h>
+#endif
+
 #include "types.h"
 #include "logic.h"
 #include "memory.h"
@@ -167,10 +170,14 @@ static unsigned int svg_units_convert(double n, char *u)
 }
 
 static char* svg_attr_value_re = "([a-z][a-zA-Z]*)=\"([^\"]*)\"";
+
+#ifndef WIN32
 static regex_t re, *pre = NULL;
+#endif
 
 static void svg_size (usershape_t *us)
 {
+#ifndef WIN32
     unsigned int w = 0, h = 0;
     double n, x0, y0, x1, y1;
     char u[10];
@@ -235,6 +242,7 @@ static void svg_size (usershape_t *us)
     us->dpi = 0;
     us->w = w;
     us->h = h;
+#endif
 }
 
 static void png_size (usershape_t *us)

diff --git a/internal/ccall/pathplan/pathutil.h b/internal/ccall/pathplan/pathutil.h
@@ -17,6 +17,7 @@
 #define _PATHUTIL_INCLUDE
 #define _BLD_pathplan 1
 
+#include "config.h"
 #include "pathplan.h"
 
 #ifdef __cplusplus

diff --git a/internal/ccall/pathplan/vis.h b/internal/ccall/pathplan/vis.h
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <limits.h>
+#include "config.h"
 #include "vispath.h"
 #include "pathutil.h"
 

diff --git a/internal/ccall/plugin.c b/internal/ccall/plugin.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include "../plugin/core/gvplugin_core.c"
 #include "../plugin/core/gvrender_core_dot.c"
 #include "../plugin/core/gvrender_core_json.c"

diff --git a/internal/config.h b/internal/config.h
@@ -20,7 +20,7 @@
 #define DIGCOLA 1
 
 /* Define if you want on-demand plugin loading */
-#define ENABLE_LTDL 1
+//#define ENABLE_LTDL 1
 
 /* Define for DLLs on Windows. */
 /* #undef GVDLL */
@@ -98,8 +98,10 @@
 /* Define to 1 if you have the <dl.h> header file. */
 /* #undef HAVE_DL_H */
 
+#ifndef WIN32
 /* Define to 1 if you have the `drand48' function. */
 #define HAVE_DRAND48 1
+#endif
 
 /* Define if you have the _dyld_func_lookup function. */
 /* #undef HAVE_DYLD */
@@ -302,8 +304,10 @@
 /* Define to 1 if you have the <search.h> header file. */
 #define HAVE_SEARCH_H 1
 
+#ifndef WIN32
 /* Define to 1 if you have the `setenv' function. */
 #define HAVE_SETENV 1
+#endif
 
 /* Define to 1 if you have the `setmode' function. */
 #define HAVE_SETMODE 1
@@ -315,7 +319,9 @@
 /* #undef HAVE_SINCOS */
 
 /* Define to 1 if you have the `srand48' function. */
+#ifndef WIN32
 #define HAVE_SRAND48 1
+#endif
 
 /* Define to 1 if stdbool.h conforms to C99. */
 #define HAVE_STDBOOL_H 1
@@ -367,7 +373,9 @@
 #define HAVE_SYS_IOCTL_H 1
 
 /* Define to 1 if you have the <sys/mman.h> header file. */
+#ifndef WIN32
 #define HAVE_SYS_MMAN_H 1
+#endif
 
 /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
    */
@@ -523,6 +531,11 @@
 /* Define to a type to use for `error_t' if it is not otherwise available. */
 #define error_t int
 
+#define GVC_EXPORTS 1
+#define PATHPLAN_EXPORTS 1
+
+#define PRLOADED_SYMBOL_N 5
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef gid_t */