Move protobuf descriptor and add content-type.

- move to static/generated
- set content-type based on extension '.description'
This commit is contained in:
Johannes 'fish' Ziemke 2013-04-24 18:51:07 +02:00
parent 9e02c2393a
commit 1f96d4c822
3 changed files with 12 additions and 11 deletions

View file

@ -13,10 +13,16 @@
all: blob
blob:
blob: static/generated/protocol_buffer.descriptor
$(MAKE) -C blob
clean:
$(MAKE) -C blob clean
static/generated:
mkdir -vp static/generated
static/generated/protocol_buffer.descriptor: static/generated ../model/generated/descriptor.blob
cp ../model/generated/descriptor.blob -f $@
.PHONY: blob clean

View file

@ -15,14 +15,8 @@ all: files.go
SUFFIXES:
generated:
mkdir -vp generated
generated/protocol_buffer.descriptor: generated ../../model/generated/descriptor.blob
cp ../../model/generated/descriptor.blob -f $@
files.go: $(shell find ../templates/ ../static/ -type f) generated/protocol_buffer.descriptor
../../utility/embed-static.sh ../static ../templates ./generated | gofmt > $@
files.go: $(shell find ../templates/ ../static/ -type f)
../../utility/embed-static.sh ../static ../templates | gofmt > $@
clean:
-rm files.go

View file

@ -16,8 +16,9 @@ const (
)
var mimeMap = map[string]string{
"css": "text/css",
"js": "text/javascript",
"css": "text/css",
"js": "text/javascript",
"descriptor": "application/vnd.google.protobuf;proto=google.protobuf.FileDescriptorSet",
}
func GetFile(bucket string, name string) ([]byte, error) {