Changeset 3934

Timestamp:

Nov 7, 2006, 4:46:20 PM (18 years ago)

Author:

ole

Message:

Small fixes

Files:

• anuga_core/documentation/user_manual/anuga_installation_guide.tex (modified) (2 diffs)
• anuga_core/documentation/user_manual/update_anuga_user_manual.py (modified) (1 diff)
• create_distribution.py (modified) (2 diffs)

anuga_core/documentation/user_manual/anuga_installation_guide.tex

@@ -62 +62 @@
     \begin{itemize}  
       \item Enthought version of Python2.4: \url{http://code.enthought.com/enthon/}.
-      \item Scientific Python: \url{http://sourcesup.cru.fr/frs/download.php/745/ScientificPython-2.4.9.win32-py2.4.exe}
+      \item Scientific Python:\\
+       \url{http://sourcesup.cru.fr/frs/download.php/745/ScientificPython-2.4.9.win32-py2.4.exe}
       \item NETCDF \url{ftp://ftp.unidata.ucar.edu/pub/netcdf/contrib/win32/netcdf-3.6.1-beta1-win32dll.zip}
     \end{itemize}   
@@ -109 +110 @@
 To verify that the installed version of ANUGA validates satisfactorily
 against the Okushiri Island wave tank validation dataset
-(\url{http://www.cee.cornell.edu/longwave/index.cfm?page=benchmark&problem=2})
+(\url{http://www.cee.cornell.edu/longwave})
 unpack the distribution (\code{anuga_validation_1.0_xxxx.tgz}) into
 any directory and run the scripts \code{create_okushiri.py},

anuga_core/documentation/user_manual/update_anuga_user_manual.py

@@ -54 +54 @@
     # Compile with LaTeX, makeindex etc
     for i in range(3):
-        #os.system('latex --interaction=nonstopmode %s.tex' %texfile)
-        os.system('pdflatex --interaction=nonstopmode %s.tex' %texfile)
-        os.system('makeindex %s.idx' %texfile)
-        os.system('makeindex mod%s.idx' %texfile)
-        os.system('bibtex %s' %texfile)    
+        #system('latex --interaction=nonstopmode %s.tex' %texfile)
+        system('pdflatex --interaction=nonstopmode %s.tex' %texfile)
+        system('makeindex %s.idx' %texfile)
+        system('makeindex mod%s.idx' %texfile)
+        system('bibtex %s' %texfile)    
 
     # Create pdf file
-    #os.system('dvips %s -o %s.ps' %((texfile,)*2))    
-    #os.system('ps2pdf %s.ps' %texfile)    
+    #system('dvips %s -o %s.ps' %((texfile,)*2))    
+    #system('ps2pdf %s.ps' %texfile)    
      
     # Create html pages

create_distribution.py

@@ -33 +33 @@
 last_line = fid.readlines()[-1]
 remove(filename)
-if not last_line.startswith('At revision'):
+if not (last_line.startswith('At revision') or\
+        last_line.startswith('Updated to revision')):
     msg = 'Unexpected output from svn up: %s' %last_line
     raise Exception, msg    
 
-svn_revision = last_line[12:-2]
+fields = last_line.split()
+svn_revision = fields[-1][:-1]
 
 revision = '%s_%s' %(major_revision, svn_revision)
+
+print 'Creating ANUGA revision %s' %revision
 
 distro_filename = 'anuga-%s.tgz' %revision
@@ -145 +149 @@
 print 'The release files are in %s:' %release_dir
 system('ls -la %s' %release_dir)
+
+
+
+#----------------------------
+# Throw away code to drop all files into the RAMP download area
+# This is hardwired for Ole
+
+system('scp %s/*.tgz onielsen@cyclone:/d/cit/1/cit/risk_assessment_methods_project/downloads/ANUGA_install/anuga' %release_dir)
+
+system('scp %s/*.pdf onielsen@cyclone:/d/cit/1/cit/risk_assessment_methods_project/downloads/ANUGA_install' %release_dir)