Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
cyfdecyf committed Mar 4, 2013
2 parents 26da04e + 9cec354 commit 79cba1c
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
4 changes: 2 additions & 2 deletions script/build.sh
Expand Up @@ -42,9 +42,9 @@ build linux 386 linux32 local
build windows amd64 win64 local
build windows 386 win32 local

build linux amd64 linux64 server
build linux 386 linux32 server
#build darwin amd64 mac64 server
#build linux amd64 linux64 server
#build linux 386 linux32 server
#build windows amd64 win64 server
#build windows 386 win32 server

Binary file modified script/shadowsocks-tray.exe
Binary file not shown.
31 changes: 31 additions & 0 deletions script/upload.sh
@@ -0,0 +1,31 @@
#!/bin/bash

cd "$( dirname "${BASH_SOURCE[0]}" )/.."

if [[ $# != 2 ]]; then
echo "upload.sh <username> <passwd>"
exit 1
fi

version=$(awk '/\tconst version =/ { print $4 }' shadowsocks/util.go | sed -e 's/"//g')
username=$1
passwd=$2

upload() {
summary=$1
file=$2
googlecode_upload.py -l Featured -u "$username" -w "$passwd" -s "$summary" -p "shadowsocks-go" "$file"
}

upload "$version OS X Client 64bit" bin/shadowsocks-local-mac64-$version.gz
upload "$version Linux Client 32bit" bin/shadowsocks-local-linux32-$version.gz
upload "$version Linux Client 64bit" bin/shadowsocks-local-linux64-$version.gz
upload "$version Windows Client 32bit" bin/shadowsocks-local-win64-$version.zip
upload "$version Windows Client 32bit" bin/shadowsocks-local-win32-$version.zip

upload "$version Linux Server 32bit" bin/shadowsocks-server-linux32-$version.gz
upload "$version Linux Server 64bit" bin/shadowsocks-server-linux64-$version.gz

upload "$version Linux Server deb 32bit" bin/shadowsocks-go_0.6.1-1-i386.deb
upload "$version Linux Server deb 64bit" bin/shadowsocks-go_0.6.1-1-amd64.deb

0 comments on commit 79cba1c

Please sign in to comment.