Tidy up makefile and readme

Makefile

@@ -1,4 +1,4 @@
-.PHONY: prebuild clean cleanall server server-linux server-win64 generate watch-server webapp mac-app win-app linux-app
+.PHONY: prebuild clean cleanall server server-mac server-linux server-win generate watch-server webapp mac-app win-app linux-app
 
 all: server
 
@@ -13,10 +13,15 @@ prebuild:
 server:
 	cd server; go build -o ../bin/octoserver ./main
 
-server-linux:
-	cd server; env GOOS=linux GOARCH=amd64 go build -o ../bin/octoserver ./main
+server-mac:
+	mkdir -p bin/mac
+	cd server; env GOOS=darwin GOARCH=amd64 go build -o ../bin/mac/octoserver ./main
 
-server-win64:
+server-linux:
+	mkdir -p bin/linux
+	cd server; env GOOS=linux GOARCH=amd64 go build -o ../bin/linux/octoserver ./main
+
+server-win:
 	cd server; env GOOS=windows GOARCH=amd64 go build -o ../bin/octoserver.exe ./main
 
 generate:
@@ -43,18 +48,18 @@ watch-server:
 webapp:
 	cd webapp; npm run pack
 
-mac-app: server webapp
+mac-app: server-mac webapp
 	rm -rf mac/resources/bin
 	rm -rf mac/resources/pack
-	mkdir -p mac/resources
-	cp -R bin mac/resources/bin
+	mkdir -p mac/resources/bin
+	cp bin/mac/octoserver mac/resources/bin/octoserver
 	cp -R webapp/pack mac/resources/pack
 	mkdir -p mac/temp
 	xcodebuild archive -workspace mac/Tasks.xcworkspace -scheme Tasks -archivePath mac/temp/tasks.xcarchive
 	xcodebuild -exportArchive -archivePath mac/temp/tasks.xcarchive -exportPath mac/dist -exportOptionsPlist mac/export.plist
-	cd mac/dist; zip -r tasks.zip Tasks.app
+	cd mac/dist; zip -r tasks-mac.zip Tasks.app
 
-win-app: server-win64 webapp
+win-app: server-win webapp
 	cd win; make build
 	mkdir -p win/dist/bin
 	cp -R bin/octoserver.exe win/dist/bin
@@ -67,7 +72,7 @@ linux-app: server-linux webapp
 	rm -rf linux/temp
 	mkdir -p linux/temp/tasks-app/webapp
 	mkdir -p linux/dist
-	cp -R bin/octoserver linux/temp/tasks-app/
+	cp -R bin/linux/octoserver linux/temp/tasks-app/
 	cp -R config.json linux/temp/tasks-app/
 	cp -R webapp/pack linux/temp/tasks-app/webapp/pack
 	cd linux; make build
@@ -81,6 +86,8 @@ clean:
 	rm -rf webapp/pack
 	rm -rf mac/temp
 	rm -rf mac/dist
+	rm -rf linux/dist
+	rm -rf win/dist
 
 cleanall: clean
 	rm -rf webapp/node_modules

README.md

@@ -3,10 +3,6 @@
 ## Building the server
 
 ```
-cd webapp
-npm install
-npm run packdev
-cd ..
 make prebuild
 make
 ```
@@ -15,8 +11,9 @@ Currently tested with:
 * Go 1.15.2
 * MacOS Catalina (10.15.6)
 * Ubuntu 18.04
+* Windows 10
 
-The server defaults to using sqlite as the store, but can be configured to use Postgres:
+The server defaults to using SQLite as the store, but can be configured to use Postgres:
 * In config.json
 	* Set dbtype to "postgres"
 	* Set dbconfig to the connection string (which you can copy from dbconfig_postgres)
@@ -25,21 +22,26 @@ The server defaults to using sqlite as the store, but can be configured to use P
 
 ## Running and testing the server
 
-To start the server:
-```
-./bin/octoserver
-```
+To start the server, run `./bin/octoserver`
 
 Server settings are in config.json.
 
 Open a browser to [http://localhost:8000](http://localhost:8000) to start.
 
-## Building and running the macOS app
-You can build the Mac app on a Mac running macOS Catalina (10.15.6+) and with Xcode 12.0+. A valid development signing certificate must be available.
+## Building and running standalone desktop apps
 
-First build the server using the steps above, then run:
-```
-make mac
-```
+You can build standalone apps that package the server to run locally against SQLite:
 
-To run, launch mac/dist/Tasks.app
+* Mac:
+    * `make mac-app`
+    * run `mac/dist/Tasks.app`
+    * *Requires: macOS Catalina (10.15), Xcode 12 and a development signing certificate.*
+* Linux:
+    * `make linux-app`
+    * run `linux/dist/tasks-app`
+* Windows
+    * `make win-app`
+    * run `win/dist/tasks-win.exe`
+    * *Requires: Windows 10*
+
+Cross-compilation currently isn't fully supported, so please build on the appropriate platform.