changeset 1793:3b6e02260d0b gae

generate a support directory to be used by GAE and standalone, don't use jinja2 from GAE env
author Tarashish Mishra <sunu0000@gmail.com>
date Sat, 29 Sep 2012 01:14:56 +0530
parents 9240f52259b8
children 51c8c41d46fd d30a39e4dd02
files Makefile app.yaml
diffstat 2 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Sep 23 17:19:02 2012 +0200
+++ b/Makefile	Sat Sep 29 01:14:56 2012 +0530
@@ -29,15 +29,13 @@
 pylint:
 	@pylint --disable-msg=W0142,W0511,W0612,W0613,C0103,C0111,C0302,C0321,C0322 --disable-msg-cat=R MoinMoin
 
-# Automate creation of the GAE support archive from a virtualenv site-packages directory
-gaesupport:
+# Automate creation of the support archive from a virtualenv site-packages directory
+support:
 	@# do NOT name it "site-packages", but "support":
 	@cp -a env/lib/python2.7/site-packages support
 	@# remove compiled code files:
 	@find support -name "*.pyc" -exec rm {} \;
 	@find support -name "*.pyo" -exec rm {} \;
-	@# GAE offers jinja2, see app.yaml:
-	@rm -rf support/jinja2
 	@# documentation generation support not needed on GAE:
 	@rm -rf support/sphinx
 	@# package installers not needed/supported on GAE:
--- a/app.yaml	Sun Sep 23 17:19:02 2012 +0200
+++ b/app.yaml	Sat Sep 29 01:14:56 2012 +0530
@@ -11,7 +11,6 @@
 - url: /.*
   script: MoinMoin.appengine_main.application
 
-libraries:
-- name: jinja2
-  version: latest
-
+# We must include jinja2 in the support directory, so we can use the same
+# support tgz for both GAE and standalone local installations (both do not use
+# setup.py). Thus, we do not use the jinja2 GAE could provide.
\ No newline at end of file