Merge pull request #306 from vmarkovtsev/master

Repair the plugins

Author: vmarkovtsev

.travis.yml

@@ -63,8 +63,9 @@ script:
   - hercules --burndown --couples --devs --quiet --pb https://github.com/src-d/hercules > 1.pb
   - cp 1.pb 2.pb
   - hercules combine 1.pb 2.pb > 12.pb
-  - #(hercules generate-plugin -n MyPlug -o myplug && cd myplug && make)
-  - #(cd contrib/_plugin_example && make)
+  - (hercules generate-plugin -n MyPlug -o myplug && cd myplug && GOFLAGS="-tags=tensorflow" make)
+  - hercules --plugin myplug/my_plug.so --help | grep my-plug
+  - (cd contrib/_plugin_example && GOBIN=../.. make)
   - hercules --burndown --burndown-files --burndown-people --couples --devs --quiet https://github.com/src-d/hercules | labours -m all -o out --backend Agg --disable-projector
   - hercules --burndown --burndown-files --burndown-people --couples --devs --quiet --pb https://github.com/src-d/hercules | labours -f pb -m all -o out --backend Agg --disable-projector
   - # hercules --sentiment --quiet --languages Python https://github.com/src-d/hercules > /dev/null

cmd/hercules/generate_plugin.go

@@ -111,7 +111,7 @@ var generatePluginCmd = &cobra.Command{
 all: {{.shlib}}
 
 {{.shlib}}: {{.output}} {{.protogo}}
-` + "\t" + `go build -buildmode=plugin -linkshared {{.output}} {{.protogo}}
+` + "\t" + `go build -buildmode=plugin ${GOFLAGS} {{.output}} {{.protogo}}
 
 {{.protogo}}: {{.proto}}
 ` + "\t" + `PATH=$$PATH:$$GOBIN protoc --gogo_out=. --proto_path=. {{.proto}}

contrib/_plugin_example/Makefile

@@ -1,7 +1,9 @@
+GO111MODULE = on
+
 all: churn_analysis.so
 
 churn_analysis.so: churn_analysis.go churn_analysis.pb.go
-	go build -buildmode=plugin -linkshared churn_analysis.go churn_analysis.pb.go
+	go build -buildmode=plugin churn_analysis.go churn_analysis.pb.go
 
 churn_analysis.pb.go: churn_analysis.proto
-	PATH=$$PATH:$$GOPATH/bin protoc --gogo_out=. --proto_path=. churn_analysis.proto
+	PATH=$$PATH:$$GOBIN protoc --gogo_out=. --proto_path=. churn_analysis.proto