Permalink
Browse files

Fix some build weirdness.

  • Loading branch information...
1 parent 7e7981b commit 738be81ff6ce7132bfff65a009301168ec5cfa32 @AlekSi committed Feb 17, 2013
Showing with 7 additions and 9 deletions.
  1. +0 −1 .gitignore
  2. +3 −2 Makefile
  3. +3 −0 build.bat
  4. +1 −6 integration_test/hook_for_test.go
View
@@ -1,3 +1,2 @@
-gonut
*.exe
*.nut
View
@@ -13,10 +13,11 @@ prepare:
fvb:
gofmt -e -s -w .
$(GO) tool vet .
- $(GO) build -o gonut github.com/AlekSi/nut/nut
+ $(GO) install github.com/AlekSi/nut
+ $(GO) build -o gonut.exe github.com/AlekSi/nut/nut
test: fvb
- cd ../test_nut1 && ../nut/gonut pack
+ cd ../test_nut1 && ../nut/gonut.exe pack
$(GO) test -v github.com/AlekSi/nut -gocheck.v
$(GO) test -v github.com/AlekSi/nut/nut -gocheck.v
View
@@ -1,3 +1,6 @@
+go install github.com/AlekSi/nut
+@if ERRORLEVEL 1 exit /B %ERRORLEVEL%
+
go build -o gonut.exe github.com/AlekSi/nut/nut
@if ERRORLEVEL 1 exit /B %ERRORLEVEL%
@@ -30,12 +30,7 @@ func init() {
panic(err)
}
- nutBin = filepath.Join(wd, "..", "gonut")
- if runtime.GOOS == "windows" {
- // required for exec
- os.Rename(nutBin, nutBin+".exe")
- nutBin += ".exe"
- }
+ nutBin = filepath.Join(wd, "..", "gonut.exe")
}
func setupTest(c *C) {

0 comments on commit 738be81

Please sign in to comment.