Vadim Markovtsev 7 gadi atpakaļ
vecāks
revīzija
4d8841d6fa
3 mainītis faili ar 42 papildinājumiem un 9 dzēšanām
  1. 5 8
      Makefile
  2. 1 1
      README.md
  3. 36 0
      appveyor.yml

+ 5 - 8
Makefile

@@ -3,10 +3,8 @@ ifneq ($(OS),Windows_NT)
 EXE =
 else
 EXE = .exe
-ifneq (oneshell, $(findstring oneshell, $(.FEATURES)))
-  $(error GNU make 3.82 or later is required)
-endif
 endif
+PKG = $(shell go env GOOS)_$(shell go env GOARCH)
 
 all: ${GOPATH}/bin/hercules${EXE}
 
@@ -20,10 +18,9 @@ ifneq ($(OS),Windows_NT)
 pb/pb.pb.go: pb/pb.proto ${GOPATH}/bin/protoc-gen-gogo
 	PATH=${PATH}:${GOPATH}/bin protoc --gogo_out=pb --proto_path=pb pb/pb.proto
 else
-.ONESHELL:
 pb/pb.pb.go: pb/pb.proto ${GOPATH}/bin/protoc-gen-gogo.exe
-	SET PATH=${PATH}${GOPATH}\bin
-	protoc --gogo_out=pb --proto_path=pb pb/pb.proto
+	set "PATH=${PATH};${GOPATH}\bin" && \
+	call protoc --gogo_out=pb --proto_path=pb pb/pb.proto
 endif
 
 pb/pb_pb2.py: pb/pb.proto
@@ -35,9 +32,9 @@ cmd/hercules/plugin_template_source.go: cmd/hercules/plugin.template
 ${GOPATH}/src/gopkg.in/bblfsh/client-go.v2:
 	go get -d -v gopkg.in/bblfsh/client-go.v2/...
 
-${GOPATH}/pkg/*/gopkg.in/bblfsh/client-go.v2: ${GOPATH}/src/gopkg.in/bblfsh/client-go.v2
+${GOPATH}/pkg/$(PKG)/gopkg.in/bblfsh/client-go.v2: ${GOPATH}/src/gopkg.in/bblfsh/client-go.v2
 	cd ${GOPATH}/src/gopkg.in/bblfsh/client-go.v2 && \
 	make dependencies
 
-${GOPATH}/bin/hercules${EXE}: *.go cmd/hercules/*.go rbtree/*.go yaml/*.go toposort/*.go pb/*.go ${GOPATH}/pkg/*/gopkg.in/bblfsh/client-go.v2 pb/pb.pb.go pb/pb_pb2.py cmd/hercules/plugin_template_source.go
+${GOPATH}/bin/hercules${EXE}: *.go cmd/hercules/*.go rbtree/*.go yaml/*.go toposort/*.go pb/*.go ${GOPATH}/pkg/$(PKG)/gopkg.in/bblfsh/client-go.v2 pb/pb.pb.go pb/pb_pb2.py cmd/hercules/plugin_template_source.go
 	go get -ldflags "-X gopkg.in/src-d/hercules.v3.BinaryGitHash=$(shell git rev-parse HEAD)" gopkg.in/src-d/hercules.v3/cmd/hercules

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
README.md


+ 36 - 0
appveyor.yml

@@ -0,0 +1,36 @@
+version: "{build}"
+platform: x64
+image: Visual Studio 2017
+
+clone_folder: c:\gopath\src\gopkg.in\src-d\hercules.v3
+
+environment:
+  GOPATH: c:\gopath
+
+install:
+  - choco install make
+  - c:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-toolchain
+  - curl -SLko protoc.zip https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-win32.zip
+  - 7z e protoc.zip
+  - move protoc.exe C:\msys64\mingw64\bin
+
+build_script:
+  - set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+  - set PATH=C:\msys64\mingw64\bin;%PATH%
+  - cd %GOPATH%\src\gopkg.in\src-d\hercules.v3
+  - make
+  - 7z a c:\gopath\src\gopkg.in\src-d\hercules.v3\hercules.win64.zip %GOPATH%\bin\hercules.exe
+
+artifacts:
+  - name: hercules.win64.zip
+    path: hercules.win64.zip
+
+deploy:
+  release: $(APPVEYOR_REPO_TAG_NAME)
+  provider: GitHub
+  auth_token:
+    secure: 78zsH4q19DqcpdkwnYHQoe0BakBfv+LGu1W7mXuaBC9mS87+EuAj3+yTzJv4NEfI
+  artifact: hercules.win64.zip
+  on:
+    branch: master
+    appveyor_repo_tag: true