fix up release stuff

majestrate · Sep 11, 2017 · a5a719a · a5a719a
1 parent 2bd94c3
commit a5a719a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -32,19 +32,19 @@ GOPATH := $(REPO)
 build: clean $(XD)
 
 $(GO_ASSETS):
-	GOPATH=$(GOPATH) $(GO) build  -o $(GO_ASSETS) -v github.com/jessevdk/go-assets-builder
+	GOPATH=$(GOPATH) $(GO) build -o $(GO_ASSETS) -v github.com/jessevdk/go-assets-builder
 
 assets: $(GO_ASSETS) webui
 	$(GO_ASSETS) -p assets $(WEB_FILES) > $(REPO)/src/xd/lib/rpc/assets/assets.go
 
 $(XD): assets
-	GOPATH=$(GOPATH) $(GO) build -v -ldflags "-X xd/lib/version.Git=-$(shell git rev-parse --short HEAD) -X xd/lib/rpc/assets.Prefix=$(WEBUI_PREFIX)" -o $(XD)
+	GOPATH=$(GOPATH) $(GO) build -ldflags "-X xd/lib/version.Git=-$(shell git rev-parse --short HEAD) -X xd/lib/rpc/assets.Prefix=$(WEBUI_PREFIX)" -o $(XD)
 
 test:
 	GOPATH=$(GOPATH) $(GO) test -v xd/...
 
 clean:
-	GOPATH=$(GOPATH) $(GO) clean -v
+	GOPATH=$(GOPATH) $(GO) clean
 
 $(WEBUI_LOGO):
 	cp $(LOGOS)/xd_logo.png $(WEBUI_LOGO)
@@ -53,4 +53,4 @@ webui: $(WEBUI_LOGO)
 	$(MAKE) -C $(WEBUI) clean build
 
 no-webui:
-	GOPATH=$(GOPATH) $(GO) build -v -ldflags "-X xd/lib/version.Git=-$(shell git rev-parse --short HEAD) -X xd/lib/rpc/assets.Prefix=$(WEBUI_PREFIX)" -tags no_webui -o $(XD)
+	GOPATH=$(GOPATH) $(GO) build -ldflags "-X xd/lib/version.Git=-$(shell git rev-parse --short HEAD) -X xd/lib/rpc/assets.Prefix=$(WEBUI_PREFIX)" -tags no_webui -o $(XD)
diff --git a/contrib/webui/package.json b/contrib/webui/package.json
@@ -14,7 +14,7 @@
         "uglify-js": "^2.4.11"
     },
     "scripts": {
-        "build": "browserify lib/main.js | uglifyjs > docroot/xd.min.js && mkdir -p docroot/contrib/bootstrap/dist/css/ && cp -av node_modules/bootstrap/dist/css/*.css docroot/contrib/bootstrap/dist/css/",
+        "build": "browserify lib/main.js | uglifyjs > docroot/xd.min.js && mkdir -p docroot/contrib/bootstrap/dist/css/ && cp -a node_modules/bootstrap/dist/css/*.css docroot/contrib/bootstrap/dist/css/",
         "server": "node server.js"
     }
 }
diff --git a/release.sh b/release.sh
@@ -2,7 +2,9 @@
 
 version="$1"
 git clean -xdf
+make assets
 GOOS=windows GOARCH=386 make clean build && mv XD.exe XD-$version-win32.exe && gpg --sign --detach XD-$version-win32.exe
+GOOS=windows GOARCH=amd64 make clean build && mv XD.exe XD-$version-win64.exe && gpg --sign --detach XD-$version-win64.exe
 GOOS=darwin GOARCH=amd64 make clean build && mv XD XD-$version-darwin && gpg --sign --detach XD-$version-darwin
 GOOS=linux GOARCH=386 make clean build && mv XD XD-$version-linux-i386 && gpg --sign --detach XD-$version-linux-i386
 GOOS=linux GOARCH=amd64 make clean build && mv XD XD-$version-linux-amd64 && gpg --sign --detach XD-$version-linux-amd64