more go bits

diff --git a/tclpkg/gv/go.make b/tclpkg/gv/go.make
new file mode 100644 (file)
index 0000000..ef88012
--- /dev/null
+++ b/tclpkg/gv/go.make
@@ -0,0 +1,19 @@
+GO=$(GOROOT)/bin/go
+
+test: test.go prep
+       ( cd go/src; \
+       $(GO) build -x -work -gccgoflags '-lgvc' -compiler gccgo test.go && mv test ../../ )
+
+.PHONY: prep
+prep:
+       mkdir -p go/src/gv
+       sed -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' <gv.i >go/src/gv/gv.swigcxx
+       sed -e 's/#include <gvc.h>/#include <graphviz\/gvc.h>/' <gv_dummy_init.c >go/src/gv/gv_dummy_init.c
+       sed -e 's/#include "gvplugin.h"/#include <graphviz\/gvplugin.h>/' <gv_builtins.c >go/src/gv/gv_builtins.c
+       sed -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' \
+               -e 's/DEMAND_LOADING/1/' <gv.cpp >go/src/gv/gv.cpp
+       echo "package gv" >go/src/gv/gv.go
+       cat test.go >go/src/test.go
+
+clean:
+       rm -rf test go /tmp/go-build*

diff --git a/tclpkg/gv/go/README b/tclpkg/gv/go/README
deleted file mode 100644 (file)
index 4c563fb..0000000
--- a/tclpkg/gv/go/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This directory is hopefully temporary,  containing various experimental
-code towards a GO language extension.
-
-Currently requires a very recent GO.  i.e. Later than the 1.1.2
-available in fc20 or rawhide at this time.  Use appropriate setup_xxx, e.g.
-       . ./setup_usr_local

diff --git a/tclpkg/gv/go/setup_usr b/tclpkg/gv/go/setup_usr
deleted file mode 100755 (executable)
index 48bc481..0000000
--- a/tclpkg/gv/go/setup_usr
+++ /dev/null
@@ -1,2 +0,0 @@
-export GOROOT=/usr/lib64/golang/
-export GOPATH=`pwd`

diff --git a/tclpkg/gv/go/setup_usr_local_go b/tclpkg/gv/go/setup_usr_local_go
deleted file mode 100755 (executable)
index fe58680..0000000
--- a/tclpkg/gv/go/setup_usr_local_go
+++ /dev/null
@@ -1,2 +0,0 @@
-export GOROOT=/usr/local/go
-export GOPATH=`pwd`

diff --git a/tclpkg/gv/go/src/makefile b/tclpkg/gv/go/src/makefile
deleted file mode 100644 (file)
index 483dd67..0000000
--- a/tclpkg/gv/go/src/makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-GO=$(GOROOT)/bin/go
-
-test: test.go prep
-       $(GO) build -x -work -gccgoflags '-lgvc' -compiler gccgo test.go
-
-.PHONY: prep
-prep:
-       mkdir -p gv
-       sed -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' <../../gv.i >gv/gv.swigcxx
-       sed -e 's/#include <gvc.h>/#include <graphviz\/gvc.h>/' <../../gv_dummy_init.c >gv/gv_dummy_init.c
-       sed -e 's/#include "gvplugin.h"/#include <graphviz\/gvplugin.h>/' <../../gv_builtins.c >gv/gv_builtins.c
-       sed -e 's/#include "gvc.h"/#include <graphviz\/gvc.h>/' \
-               -e 's/DEMAND_LOADING/1/' <../../gv.cpp >gv/gv.cpp
-       echo "package gv" >gv/gv.go
-
-clean:
-       rm -rf test gv /tmp/go-build*

diff --git a/tclpkg/gv/go/setup_ellson b/tclpkg/gv/go_setup
similarity index 52%
rename from tclpkg/gv/go/setup_ellson
rename to tclpkg/gv/go_setup
index ab63006af7b58489d628179e8a98a2a140c84d19..5fbac5c5803afa360415e1a4c8fd8d47dc21c72e 100755 (executable)
--- a/tclpkg/gv/go/setup_ellson
+++ b/tclpkg/gv/go_setup
@@ -1,2 +1,3 @@
 export GOROOT=/home/ellson/FIX/Linux.x86_64/build/go
-export GOPATH=`pwd`
+export GOPATH=`pwd`/go
+export GO=$GOROOT/bin/go

diff --git a/tclpkg/gv/go/src/test.go b/tclpkg/gv/test.go
similarity index 100%
rename from tclpkg/gv/go/src/test.go
rename to tclpkg/gv/test.go