Changeset 8086

Timestamp:

Nov 25, 2010, 11:50:39 AM (14 years ago)

Author:

habili

Message:

Updated

Location:

branches/anuga_1_2_1

Files:

• create_distribution.py (modified) (12 diffs)
• dirs_to_distribute.py (modified) (1 diff)

branches/anuga_1_2_1/create_distribution.py

@@ -28 +28 @@
 from anuga.abstract_2d_finite_volumes.util import get_revision_number
 from anuga.abstract_2d_finite_volumes.util import store_version_info
-from anuga.config import major_revision
 from dirs_to_distribute import dirmap
 from anuga.utilities.data_audit_wrapper import IP_verified
@@ -38 +37 @@
     raise Exception(msg)
 
-def xlog(msg):
-    """Log a message and print to console."""
-
-    print(msg)
-    #log(msg)
-
-def do_cmd(cmd):
-    """Execute command.  Ignore errors."""
-    
+def do_cmd(cmd, blind=True):
+    """Execute command.  Ignore errors if blind=True."""
+
     try:
         xlog(cmd)
         os.system(cmd)
     except:
-        pass
-
-
-# line separator 
+        if not blind:
+            raise
+
+
+def get_release_number():
+    """Get release information and create release name.
+
+    Get release numbers from the current directory.
+
+    Returns a string which is of the form 'anuga-X-Y-Z' where X is the
+    major release number, Y is the minor and Z is the bug number.
+    """
+    
+    curr_dir = os.getcwd()
+    curr_dir = os.path.basename(curr_dir)
+    split_dir = curr_dir.split('_')
+    if len(split_dir) < 2:
+        abort('You must run this script in an ANUGA branch directory: '
+              'anuga_X_Y[_Z].')
+    if split_dir[0] != 'anuga':
+        abort('You must run this script in an ANUGA branch directory: '
+              'anuga_X_Y[_Z].')
+
+    major = split_dir[1]
+    if len(split_dir) < 3:
+        minor = '0'
+    else:
+        minor = split_dir[2]
+        
+    if len(split_dir) < 4:
+        bug = '0'
+    else:
+        bug = split_dir[3]
+
+    return '%s.%s.%s' % (major, minor, bug)
+
+
+def xlog(msg):
+    """Log a message and print to console."""
+
+    print(msg)
+    #log(msg)
+
+
+# line separator
 lsep = '-' * 72
 
@@ -65 +99 @@
 
 svn_revision = get_revision_number()
-revision = '%s_%s' % (major_revision, svn_revision)
-xlog('Creating ANUGA revision %s' % revision)
-
-anuga_release_name = 'anuga-%s' % revision
+
+anuga_release_number = get_release_number()
+anuga_release_name = 'anuga-%s' % anuga_release_number
+
 distro_filename = '%s.tgz' % anuga_release_name
+
+xlog(lsep)
+xlog('Creating %s' % anuga_release_name)
+xlog(lsep)
 
 ######
 # Create directory for this release.
 # It will be named like
-#        anuga_release_1.0beta_4824
+#        anuga_release_1.2.3
 ######
 
 release_area = os.path.join('~', 'anuga_releases')
 release_area = os.path.expanduser(release_area)
-do_cmd('mkdir %s' % release_area)
-   
+do_cmd('mkdir -p %s' % release_area)
+
 release_dir = os.path.join(release_area, anuga_release_name )
-do_cmd('mkdir %s' % release_dir)
+do_cmd('mkdir -p %s' % release_dir)
 
 ######
@@ -89 +127 @@
 
 distro_dir = tempfile.mktemp()
-do_cmd('mkdir %s' % distro_dir)
+do_cmd('mkdir -p %s' % distro_dir)
 
 ######
@@ -97 +135 @@
 for source in dirmap:
     destination = os.path.join(distro_dir, dirmap[source])
-    
+
     do_cmd('svn export -r %d --quiet %s %s'
            % (svn_revision, source, destination))
@@ -115 +153 @@
 
 ######
-# Compile and bundle up the LaTeX documentation 
-######
-
-print('')
+# Compile and bundle up the LaTeX documentation
+######
+
 print(lsep)
 xlog('Preparing User Manual (see update_anuga_user_manual.log)')
 print(lsep)
-do_cmd('cd anuga_core/documentation/user_manual;'
+do_cmd('cd anuga_core/documentation/user_manual; '
        'python update_anuga_user_manual.py --no_html '
-           '1>update_anuga_user_manual.log 2>/dev/null')
+           '1>update_anuga_user_manual.log 2>/dev/null', blind=False)
 
 # Copy to distro_dir to become part of one tarball
-release_name = 'anuga_user_manual-%s.pdf' % revision
+release_name = 'anuga_user_manual-%s.pdf' % anuga_release_number
 do_cmd('/bin/mv anuga_core/documentation/user_manual/anuga_user_manual.pdf '
-       '%s/%s' % (distro_dir, release_name))
-
-release_name = 'anuga_installation_guide-%s.pdf' % revision
+           '%s/%s' % (distro_dir, release_name))
+
+release_name = 'anuga_installation_guide-%s.pdf' % anuga_release_number
 do_cmd('/bin/mv anuga_core/documentation/user_manual/'
-           'anuga_installation_guide.pdf %s/%s' % (distro_dir, release_name)    
-
-release_name = 'anuga_whats_new-%s.pdf' % revision
+           'anuga_installation_guide.pdf %s/%s' % (distro_dir, release_name))
+
+release_name = 'anuga_whats_new-%s.pdf' % anuga_release_number
 do_cmd('/bin/mv anuga_core/documentation/user_manual/anuga_whats_new.pdf %s/%s'
-       % (distro_dir, release_name)    )
-    
+       % (distro_dir, release_name))
+
 ######
 # Zip everything up
 ######
 
-do_cmd('cd %s;tar cvfz %s *' % (distro_dir, distro_filename))
+do_cmd('cd %s; tar cfz %s *' % (distro_dir, distro_filename))
 
 ######
@@ -155 +192 @@
 ######
 
-do_cmd('/bin/rm -rf %s/*' % distro_dir) 
-
-######
-# Generate Windows installer 
-######
+# do_cmd('/bin/rm -rf %s/*' % distro_dir)
+
+######
+# Generate Windows installer config.sh
+######
+
+xlog('')
+xlog(lsep)
+xlog('Creating Windows installer files')
+xlog(lsep)
 
 root = os.getcwd()
@@ -176 +218 @@
 
 # and unpack ANUGA into it
-do_cmd('cd files/%s; tar xvfz %s/%s'
+do_cmd('cd files/%s; tar xfz %s/%s'
        % (anuga_release_name, release_dir, distro_filename))
 
@@ -189 +231 @@
 
 # Generate NSI file
-create_config(revision, anuga_release_name, anuga_viewer_folder, python,
-              numpy, scientific_python, matplotlib, netcdf_folder, mingw)
-
-# Package up files necessary to compile the installer on Windows and 
+create_config(anuga_release_number, anuga_release_name, anuga_viewer_folder,
+              python, numpy, scientific_python, matplotlib, netcdf_folder,
+              mingw)
+
+# Package up files necessary to compile the installer on Windows and
 # move to release area
 # Cleanup in case there was something left from a previous attempt
 do_cmd('cd %s; /bin/rm -rf windows_installer' % release_dir)
-    
+
 # Create subdirectories for windows installer
-do_cmd('cd %s; mkdir windows_installer; mkdir windows_installer/files'
-       % release_dir)
+do_cmd('cd %s; mkdir -p windows_installer/files' % release_dir)
 
 # Copy installion scrips and imagery across
@@ -209 +251 @@
 # Come back to starting directory
 os.chdir(root)
-                                                      
+
 # Grab license file from anuga_core and copy to installer
 do_cmd('cp anuga_core/source/anuga/LICENSE.txt %s/windows_installer/files'
-       % release_dir                                                       )
+       % release_dir)
 
 xlog('NSI installer created')
@@ -228 +270 @@
 print(lsep)
 print('')
-print('')
-
 
 ######
 # Copy release to various destinations
 ######
-# FIXME (Ole): I don't think this is the way any more
-# due to changes at SourceForge.
-
-answer = raw_input('Do you want to upload this to sourceforge? Y/N [Y]')
-if answer.lower() != 'n':
-    
-    print 'Uploading to sourceforge'
-
-    import os, os.path
-    release_dir = os.path.expanduser(release_dir)
-    os.chdir(release_dir)
-    print 'Reading from', os.getcwd()
-
-
-    s = 'rsync -avP -e ssh *.* uniomni@frs.sourceforge.net:uploads/'
-    print s
-    os.system(s)
-
-    
-
-    #from ftplib import FTP
-    #ftp = FTP('upload.sourceforge.net')
-    #print ftp.login() # Anonymous
-    #print ftp.cwd('incoming')
-    #
-    #for filename in os.listdir('.'):
-    #    print 'Uploading %s... ' %filename,
-    #    sys.stdout.flush()
-    #
-    #    fid=open(filename, 'rb')
-    #    print ftp.storbinary('STOR %s' %filename, fid)
-    #    fid.close()
-    #
-    #print 'FTP done'
-    #print ftp.quit()
-
-    print
-    print lsep
-    print '    ********************* NOTE *************************'
-    print lsep
-    print 'To complete this release you must log into'
-    print 'http://sourceforge.net/projects/anuga as ANUGA admin'
-    print 'and complete the process by selecting File Releases '
-    print 'in the admin menu there.'
-    print lsep
-    print
-    print
-    
-
-
-# Copy to the ANU
-#s = 'rsync -avz %s/* ole@datamining.anu.edu.au:public_html/software/anuga/%s' %(release_dir, 'anuga_%s' %revision)
-s = 'scp -r %s ole@datamining.anu.edu.au:public_html/software/anuga' %(release_dir)        
-print s
-os.system(s)
-    
-    
+
+# # Copy to the ANU
+# #s = 'rsync -avz %s/* ole@datamining.anu.edu.au:public_html/software/anuga/%s' %(release_dir, 'anuga_%s' %revision)
+# s = 'scp -r %s ole@datamining.anu.edu.au:public_html/software/anuga' %(release_dir)
+# print s
+# os.system(s)
+
 ######
 # Throw away code to drop all files into the RAMP download area
@@ -304 +294 @@
     print 'Attempt to rsync data to perlite and datamining'
     # Copy to Georisk
-    s = 'rsync -avz %s/* onielsen@cyclone:georisk/downloads/ANUGA_install/%s' %(release_dir, 'anuga_%s' % revision)
+    s = ('rsync -avz %s/* onielsen@cyclone:georisk/downloads/ANUGA_install/%s'
+         % (release_dir, 'anuga_%s' % anuga_release_number))
     print s
     os.system(s)
-    
+
     #os.system('scp %s/*.pdf onielsen@cyclone:/d/cit/1/cit/risk_assessment_methods_project/downloads/ANUGA_install' %release_dir)#
-    
-print 'Remember to update' 
-print '    anuga_whats_new.tex'
-print '    sourceforge'
-    
+
+######
+# Little reminders
+######
+
+xlog('Remember to update')
+xlog('    anuga_whats_new.tex')
+xlog('    sourceforge')
+xlog('    code.google.com')

branches/anuga_1_2_1/dirs_to_distribute.py

@@ -23 +23 @@
 dirmap[join('anuga_validation', 'automated_validation_tests')] = None
 #dirmap[join('anuga_core', 'documentation', 'user_manual', 'demos')] = None
-dirmap[join('anuga_core', 'documentation', 'user_manual')] = None
+#dirmap[join('anuga_core', 'documentation', 'user_manual')] = None