Merge pull request #77 from kortschak/appengine

Use build constraints for appengine
2014-07-22 20:39:13 -04:00 · 2014-07-22 20:39:13 -04:00 · 31211696a8
commit 31211696a8
parent be26f0faf6 592ea81687
11 changed files with 54 additions and 54 deletions
--- a/appengine/app.yaml
+++ b/appengine/app.yaml
--- a/appengine/appengine.go
+++ b/appengine/appengine.go
@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package cayleyappengine
+// +build appengine
+
+package main

 import (
 	"github.com/barakmich/glog"
--- a/appengine/30k.nt
+++ b/appengine/30k.nt
@ -1 +0,0 @@
-../30kmovies.nt
--- a/appengine/docs
+++ b/appengine/docs
@ -1 +0,0 @@
-../docs
--- a/appengine/static
+++ b/appengine/static
@ -1 +0,0 @@
-../static
--- a/appengine/templates
+++ b/appengine/templates
@ -1 +0,0 @@
-../templates
--- a/cayley.go
+++ b/cayley.go
@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+// +build !appengine
+
 package main

 import (
--- a/appengine/cayley_appengine.cfg
+++ b/appengine/cayley_appengine.cfg