Changeset 6340

Timestamp:

Oct 6, 2008, 8:20:41 AM (17 years ago)

Author:

roland

Message:

merge -r6328:6339, some files didn't merge correctly and have been added by hand.
README, Makefile and doc/ have been updated to reflect the buildout changes.
Two unittest have been merged into trunk too.

Location:

trunk

Files:

• Makefile (modified) (3 diffs)
• README (modified) (2 diffs)
• base.cfg (copied) (copied from branches/buildoutexodus/base.cfg )
• bootstrap.py (copied) (copied from branches/buildoutexodus/bootstrap.py )
• buildout.cfg (copied) (copied from branches/buildoutexodus/buildout.cfg )
• doc/README (modified) (1 diff)
• exodus/development.py (copied) (copied from branches/buildoutexodus/exodus/development.py )
• exodus/production.py (copied) (copied from branches/buildoutexodus/exodus/production.py )
• exodus/settings.py (copied) (copied from branches/buildoutexodus/exodus/settings.py ) (2 diffs)
• exodus/tests.py (copied) (copied from branches/buildoutexodus/exodus/tests.py )
• sampleserver (deleted)

trunk/Makefile

@@ -1 @@
-SQLDB="sqllite.db"
+SQLDB="exodus.db"
 
 help:
@@ -9 +9 @@
 debug:
 #Run server in extra debugging mode
-        @./sampleserver/manage.py runserver_plus 8000 --pythonpath=`pwd`
+        @./bin/django runserver_plus
 
 run:
 #Run server in normal power mode
-        @./sampleserver/manage.py runserver 8000 --pythonpath=`pwd`
+        @./bin/django runserver
 
 init:
 #Re-init database
-        @echo "no" | ./sampleserver/manage.py syncdb --pythonpath=`pwd`
+        @echo "no" | ./bin/django syncdb 
 
 debug-init:
@@ -33 +33 @@
 #Intended usage for batch runs only e.g. no debug server
 
+
+

trunk/README

@@ -1 @@
-See LICENSE for the license details; The whole of Exodus falls under this
+See LICENSE for the license details; Exodus falls under this
 license.  
 Roland van Laar email: roland@wirelessleiden.nl
@@ -8 +8 @@
 exodus/static    = exodus static files
 exodus/templates = exodus template files
-sampleserver     = general django layout
 
 = Hacking =
-Install Django 1.0 to $DJANGOROOT
+Buildout is a tool that automagically builds a development environment
+for you.
 
-Install Django extentions using http://code.google.com/p/django-command-extensions/wiki/InstallationInstructions
-$ curl -O http://django-command-extensions.googlecode.com/files/django-command-extensions-0.3.tgz
-$ tar xzf django-command-extensions-0.3.tgz
-$ cd django-command-extensions-0.3
-$ python setup.py install
-
-$svn co http://code.djangoproject.com/svn/django/tags/releases/1.0/
-$ cd $DJANGOROOT 
-$ ./sudo python setup.py install
+To build the development environment:
+$ cd $SVNTRUNK
+$ python bootstrap.py
+$ bin/buildout
 
 To create the database:
-$ cd $SVNROOT
+$ cd $SVNTRUNK
 $ make init
 
-To run the developmentserver do
-$ cd $SVNROOT
+To run the developmentserver do:
+$ cd $SVNTRUNK
 $ make debug
 
-
-
+To run unittests do:
+$ cd $SVNTRUNK
+$ bin/test

trunk/doc/README

@@ -3 +3 @@
 exodusmodels.dot is a graphviz file which shows the exodus database.
 
-Install the djangotrunk and the django_extensions 
-which can be fetched from: 
-http://code.google.com/p/django-command-extensions/
-
-Add 'extensions' to settings.py
-
 Using the djangotrunk execute:
-$ ./manage.py graph_models exodus > exodusmodels.dot
+$ ./bin/django graph_models exodus > exodusmodels.dot
 
 = Debug Django =
 
-Install django_extensions, see above for installation description.
-Install Werkzeug from: http://werkzeug.pocoo.org/download
-
 Using werkzeug:
-$ ./manage.py runserver_plus 
+$ ./bin/django runserver_plus 

trunk/exodus/settings.py

@@ -6 +6 @@
 
 ADMINS = (
-    ('Administrator', 'admin@example.org'),
+    ('rick', 'rick@wzoeterwoude.net'),
+    ('roland','roland@micite.net'),
 )
 
@@ -59 +60 @@
     'django.contrib.sites',
     'django.contrib.admin',
-        'django.contrib.databrowse',
+    'django.contrib.databrowse',
+    'django_extensions',
     'exodus',
 )