From 8f784d71c57b5ffbeee36b36fe4c9d711a81b02b Mon Sep 17 00:00:00 2001 From: John Lauer Date: Sun, 24 Apr 2016 04:32:39 +0000 Subject: [PATCH] Updated for 1.92 --- README.md | 3 ++- compile_go1_5_crosscompile.sh | 24 +++++++++++++++++++++--- main.go | 6 +++--- release.sh | 1 + snapshot/downloads.md | 28 ---------------------------- 5 files changed, 27 insertions(+), 35 deletions(-) delete mode 100644 snapshot/downloads.md diff --git a/README.md b/README.md index 70a42ee..afc5fc3 100644 --- a/README.md +++ b/README.md @@ -400,9 +400,10 @@ Revisions ------- Changes in 1.92 - HTTPS and WSS support courtesy of Stewart Allen. Sample cert and key provided in release zip/tar file. Copy sample files to cert.pem and key.pem to have SPJS enable HTTPS/WSS support or use command line parameters of -scert mycert.pem -skey mykey.pem to specify files. +- Added fix for opening 2nd or more serial ports where there was a block opening an additional port Changes in 1.91 -- Added usblist command +- Added usblist command so can list USB devices like webcams. Only works on Linux for now. - Added username/password authentication to exec command to solve security concerns. - Marlin buffer updates from Peter van der Walt diff --git a/compile_go1_5_crosscompile.sh b/compile_go1_5_crosscompile.sh index 56e2751..57d23d9 100755 --- a/compile_go1_5_crosscompile.sh +++ b/compile_go1_5_crosscompile.sh @@ -14,33 +14,45 @@ cp README.md snapshot/ echo "Building Linux amd64" mkdir snapshot/serial-port-json-server-$1_linux_amd64 mkdir snapshot/serial-port-json-server-$1_linux_amd64/arduino +cp sample* snapshot/serial-port-json-server-$1_linux_amd64 cp -r arduino/hardware snapshot/serial-port-json-server-$1_linux_amd64/arduino/hardware cp -r arduino/tools_linux_64 snapshot/serial-port-json-server-$1_linux_amd64/arduino/tools env GOOS=linux GOARCH=amd64 go build -v -o snapshot/serial-port-json-server-$1_linux_amd64/serial-port-json-server -tar -zcvf snapshot/serial-port-json-server-$1_linux_amd64.tar.gz snapshot/serial-port-json-server-$1_linux_amd64 +cd snapshot +tar -zcvf serial-port-json-server-$1_linux_amd64.tar.gz serial-port-json-server-$1_linux_amd64 +cd .. echo "" echo "Building Linux 386" mkdir snapshot/serial-port-json-server-$1_linux_386 mkdir snapshot/serial-port-json-server-$1_linux_386/arduino +cp sample* snapshot/serial-port-json-server-$1_linux_386 cp -r arduino/hardware snapshot/serial-port-json-server-$1_linux_386/arduino/hardware cp -r arduino/tools_linux_32 snapshot/serial-port-json-server-$1_linux_386/arduino/tools env GOOS=linux GOARCH=386 go build -v -o snapshot/serial-port-json-server-$1_linux_386/serial-port-json-server -tar -zcvf snapshot/serial-port-json-server-$1_linux_386.tar.gz snapshot/serial-port-json-server-$1_linux_386 +cd snapshot +tar -zcvf serial-port-json-server-$1_linux_386.tar.gz serial-port-json-server-$1_linux_386 +cd .. echo "" echo "Building Linux ARM (Raspi)" mkdir snapshot/serial-port-json-server-$1_linux_arm mkdir snapshot/serial-port-json-server-$1_linux_arm/arduino +cp sample* snapshot/serial-port-json-server-$1_linux_arm cp -r arduino/hardware snapshot/serial-port-json-server-$1_linux_arm/arduino/hardware cp -r arduino/tools_linux_arm snapshot/serial-port-json-server-$1_linux_arm/arduino/tools env GOOS=linux GOARCH=arm go build -v -o snapshot/serial-port-json-server-$1_linux_arm/serial-port-json-server -tar -zcvf snapshot/serial-port-json-server-$1_linux_arm.tar.gz snapshot/serial-port-json-server-$1_linux_arm +cd snapshot +tar -zcvf serial-port-json-server-$1_linux_arm.tar.gz serial-port-json-server-$1_linux_arm +cd .. echo "" echo "Building Windows x32" mkdir snapshot/serial-port-json-server-$1_windows_386 mkdir snapshot/serial-port-json-server-$1_windows_386/arduino +mkdir snapshot/serial-port-json-server-$1_windows_386/drivers +cp -r drivers/* snapshot/serial-port-json-server-$1_windows_386/drivers +cp sample* snapshot/serial-port-json-server-$1_windows_386 cp -r arduino/hardware snapshot/serial-port-json-server-$1_windows_386/arduino/hardware cp -r arduino/tools_windows snapshot/serial-port-json-server-$1_windows_386/arduino/tools env GOOS=windows GOARCH=386 go build -v -o snapshot/serial-port-json-server-$1_windows_386/serial-port-json-server.exe @@ -52,6 +64,9 @@ echo "" echo "Building Windows x64" mkdir snapshot/serial-port-json-server-$1_windows_amd64 mkdir snapshot/serial-port-json-server-$1_windows_amd64/arduino +mkdir snapshot/serial-port-json-server-$1_windows_amd64/drivers +cp -r drivers/* snapshot/serial-port-json-server-$1_windows_amd64/drivers +cp sample* snapshot/serial-port-json-server-$1_windows_amd64 cp -r arduino/hardware snapshot/serial-port-json-server-$1_windows_amd64/arduino/hardware cp -r arduino/tools_windows snapshot/serial-port-json-server-$1_windows_amd64/arduino/tools env GOOS=windows GOARCH=amd64 go build -v -o snapshot/serial-port-json-server-$1_windows_amd64/serial-port-json-server.exe @@ -63,9 +78,12 @@ echo "" echo "Building Darwin x64" mkdir snapshot/serial-port-json-server-$1_darwin_amd64 mkdir snapshot/serial-port-json-server-$1_darwin_amd64/arduino +cp sample* snapshot/serial-port-json-server-$1_darwin_amd64 cp -r arduino/hardware snapshot/serial-port-json-server-$1_darwin_amd64/arduino/hardware cp -r arduino/tools_darwin snapshot/serial-port-json-server-$1_darwin_amd64/arduino/tools env GOOS=darwin GOARCH=amd64 go build -v -o snapshot/serial-port-json-server-$1_darwin_amd64/serial-port-json-server cd snapshot/serial-port-json-server-$1_darwin_amd64 zip -r ../serial-port-json-server-$1_darwin_amd64.zip * cd ../.. + +export GITHUB_TOKEN=d1ce644ff5eef10f4f1e5fbf27515d22c7d68e8b diff --git a/main.go b/main.go index 9c5babc..e20a3b2 100755 --- a/main.go +++ b/main.go @@ -1,4 +1,4 @@ -// Version 1.91 +// Version 1.92 // Supports Windows, Linux, Mac, and Raspberry Pi, Beagle Bone Black package main @@ -22,8 +22,8 @@ import ( ) var ( - version = "1.91" - versionFloat = float32(1.91) + version = "1.92" + versionFloat = float32(1.92) addr = flag.String("addr", ":8989", "http service address") saddr = flag.String("saddr", ":8990", "https service address") scert = flag.String("scert", "cert.pem", "https certificate file") diff --git a/release.sh b/release.sh index f4f05b2..3238b78 100755 --- a/release.sh +++ b/release.sh @@ -1,4 +1,5 @@ #!/bin/sh +export GITHUB_TOKEN=d1ce644ff5eef10f4f1e5fbf27515d22c7d68e8b export GITHUB_USER=chilipeppr diff --git a/snapshot/downloads.md b/snapshot/downloads.md deleted file mode 100644 index 08a20ce..0000000 --- a/snapshot/downloads.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -layout: default -title: Downloads ---- - -serial-port-json-server downloads (version snapshot) - -### Linux - - * [serial-port-json-server\_linux\_386.tar.gz](serial-port-json-server_linux_386.tar.gz) - * [serial-port-json-server\_linux\_amd64.tar.gz](serial-port-json-server_linux_amd64.tar.gz) - * [serial-port-json-server\_linux\_arm.tar.gz](serial-port-json-server_linux_arm.tar.gz) - * [serial-port-json-server\_snapshot\_amd64.deb](serial-port-json-server_snapshot_amd64.deb) - * [serial-port-json-server\_snapshot\_armhf.deb](serial-port-json-server_snapshot_armhf.deb) - * [serial-port-json-server\_snapshot\_i386.deb](serial-port-json-server_snapshot_i386.deb) - -### MS Windows - - * [serial-port-json-server\_windows\_386.zip](serial-port-json-server_windows_386.zip) - * [serial-port-json-server\_windows\_amd64.zip](serial-port-json-server_windows_amd64.zip) - -### Other files - - * [README.md](README.md) - - - -Generated by goxc \ No newline at end of file