--- a/scripts/make_release.sh	Fri Sep 19 18:02:37 2008 +0000
+++ b/scripts/make_release.sh	Fri Sep 19 21:11:39 2008 +0000
@@ -12,7 +12,7 @@
 DEFAULT_APP_FOLDER="../app"
 DEFAULT_APP_FILES="app.yaml index.yaml __init__.py main.py settings.py urls.py"
 DEFAULT_APP_DIRS="soc ghop gsoc feedparser"
-DEFAULT_ZIP_FILES="django.zip tiny_mce.zip"
+DEFAULT_ZIP_FILES="tiny_mce.zip"
 
 APP_RELEASE=${APP_RELEASE:-"${DEFAULT_APP_RELEASE}"}
 APP_FOLDER=${APP_FOLDER:-"${DEFAULT_APP_FOLDER}"}
@@ -21,17 +21,28 @@
 ZIP_FILES=${ZIP_FILES:-"${DEFAULT_ZIP_FILES}"}
 
 cd $APP_FOLDER
-# Remove old zip files
-rm -rf $ZIP_FILES
+
+# Remove old zip files (and django.zip in its old location)
+rm -rf $ZIP_FILES django.zip
+
+# Remove old $APP_RELEASE directory.
+rm -rf $APP_RELEASE
 
-# Create new django.zip file.
+# Create new $APP_RELEASE directory.
+mkdir $APP_RELEASE
+
+# Create new django.zip file, but directly in the $APP_RELEASE directory,
+# rather than in $APP_FOLDER and creating a symlink in $APP_RELEASE.  This
+# keeps the presence of a django.zip file in the app/ folder from breaking
+# debugging into app/django.
+#
 # We prune:
 # - .svn subdirectories for obvious reasons.
 # - contrib/gis/ and related files because it's huge and unneeded.
 # - *.po and *.mo files because they are bulky and unneeded.
 # - *.pyc and *.pyo because they aren't used by App Engine anyway.
 
-zip -q django.zip `find django \
+zip -q "$APP_RELEASE/django.zip" `find django \
     -name .svn -prune -o \
     -name gis -prune -o \
     -name admin -prune -o \
@@ -46,6 +57,7 @@
     -type f ! -name \*.py[co] ! -name *.[pm]o -print`
 
 # Create new tiny_mce.zip file.
+#
 # We prune:
 # - .svn subdirectories for obvious reasons.
 
@@ -56,12 +68,6 @@
     -type f -print`
 popd > /dev/null
 
-# Remove old $APP_RELEASE directory.
-rm -rf $APP_RELEASE
-
-# Create new $APP_RELEASE directory.
-mkdir $APP_RELEASE
-
 # Create symbolic links.
 for x in $APP_FILES $APP_DIRS $ZIP_FILES
 do