use gofr; updates for latest Go release

This commit is contained in:
Brad Fitzpatrick 2010-07-17 17:37:50 -07:00
parent 04e18c179d
commit ba4d16a69d
3 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,7 @@
main:
echo "I've using gofr to build this now: http://bitbucket.org/kylelemons/gofr/wiki/Home"
exit 999
include $(GOROOT)/src/Make.$(GOARCH)
TARG=camlistored

View File

@ -18,7 +18,10 @@ import (
"regexp"
)
import "./util/_obj/util"
// For `make`:
//import "./util/_obj/util"
// For `gofr`:
import "util/util"
// import "mime/multipart"
// import multipart "github.com/bradfitz/golang-mime-multipart"
@ -264,7 +267,7 @@ func handlePreUpload(conn *http.Conn, req *http.Request) {
ret := make(map[string]interface{})
ret["maxUploadSize"] = 2147483647 // 2GB.. *shrug*
ret["alreadyHave"] = haveVector.Data()
ret["alreadyHave"] = haveVector.Copy()
ret["uploadUrl"] = "http://localhost:3179/camli/upload"
ret["uploadUrlExpirationSeconds"] = 86400
returnJson(conn, ret)

View File

@ -2,6 +2,6 @@
mkdir /tmp/camliroot
export CAMLI_PASSWORD=foo
make && ./camlistored
gofr && ./camlistored