Merge pull request #686 from ethereumproject/fix/appveyor-sputnikfm-ffi

Fix/appveyor sputnikvm ffi
ethereumproject · Nov 7, 2018 · ad32ce2 · ad32ce2
2 parents 180a382 + fda767d
commit ad32ce2
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -24,12 +24,13 @@ install:
   - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
   - rustup update
 
-  - cd c:\gopath\src\github.com\ETCDEVTeam
-  - git clone https://github.com/ETCDEVTeam/sputnikvm-ffi
-  - cd c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi
-  - cargo build --release
-  - copy c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi\target\release\sputnikvm_ffi.lib c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib
-  - set CGO_LDFLAGS=-Wl,--allow-multiple-definition c:\gopath\src\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib -lws2_32 -luserenv
+  # Build sputnikvm-ffi from go-ethereum/vendor dir (depend on 'dep' vendoring version control, instead of 'upstream master' vc).
+  - cd c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi
+  - cargo build --release --verbose
+  - copy c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\ffi\target\release\sputnikvm_ffi.lib c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib
+  # Set build flag definitions.
+  - set CGO_LDFLAGS=-Wl,--allow-multiple-definition c:\gopath\src\github.com\ethereumproject\go-ethereum\vendor\github.com\ETCDEVTeam\sputnikvm-ffi\c\sputnikvm.lib -lws2_32 -luserenv
+
   - cd c:\gopath\src\github.com\ethereumproject\go-ethereum
 
   - echo %VERSION_BASE% %VERSION%