Changeset 7901

Timestamp:

Jul 12, 2010, 6:18:01 PM (14 years ago)

Author:

wilsonr

Message:

Changes to match the windows installer creator.

Location:

trunk

Files:

• create_distribution.py (modified) (2 diffs)
• installation_files/windows/installer.py (modified) (1 diff)

trunk/create_distribution.py

@@ -21 +21 @@
 """
 
-from os import sep, system
-from os.path import join
+import sys
 import os
-from tempfile import mktemp
-from sys import platform, stdout
+import tempfile
+
 from anuga.utilities.system_tools import get_user_name, get_host_name
 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
 
 
-if platform == 'win32':
-    msg = 'This script is not written for Windows.'+\
-          'Please run it on a Unix platform'
-    raise Exception, msg
-
-
-# line separator 
-lsep = '----------------------------------------------------------------------'
-
-
-# Get svn revision number and create
-# file with version info for release.
-# This will mean that the version currently checked out is
-# the one which will be released.
+if sys.platform == 'win32':
+    msg = ('This script is not written for Windows.  '
+           'Please run it on a Unix platform')
+    raise Exception(msg)
+
+def do_cmd(cmd, blind=True):
+    """Execute command.  Ignore errors if blind=True."""
+
+    try:
+        xlog(cmd)
+        os.system(cmd)
+    except:
+        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
+
+
+######
+# Get svn revision number and create file with version info for release.
+# This will mean that the version currently checked out is the one which
+# will be released.
+######
 
 svn_revision = get_revision_number()
-revision = '%s_%s' %(major_revision, svn_revision)
-print '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
-#-----------------------------------
-release_area = '~/anuga_releases'
-s = 'mkdir %s' % release_area
+#        anuga_release_1.2.3
+######
+
+release_area = os.path.join('~', 'anuga_releases')
+release_area = os.path.expanduser(release_area)
+do_cmd('mkdir -p %s' % release_area)
+
+release_dir = os.path.join(release_area, anuga_release_name )
+do_cmd('mkdir -p %s' % release_dir)
+
+######
+# Create temporary area for svn to export source files
+######
+
+distro_dir = tempfile.mktemp()
+do_cmd('mkdir -p %s' % distro_dir)
+
+######
+# Get the ANUGA directories flagged for distribution
+######
+
+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))
+
+# Store file with revision info for use with get_revision_number
+store_version_info(destination_path=distro_dir+'/anuga', verbose=True)
+
+######
+# IP Data Audit
+######
+
+xlog('Verifying data IP')
+if not IP_verified(distro_dir, verbose=True):
+    msg = ('Files have not been verified for IP.\n'
+           'Each data file must have a license file with it.')
+    raise Exception(msg)
+
+######
+# 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; '
+       'python update_anuga_user_manual.py --no_html '
+           '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' % 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' % 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' % anuga_release_number
+do_cmd('/bin/mv anuga_core/documentation/user_manual/anuga_whats_new.pdf %s/%s'
+       % (distro_dir, release_name))
+
+######
+# Zip everything up
+######
+
+do_cmd('cd %s; tar cfz %s *' % (distro_dir, distro_filename))
+
+######
+# Move distro to release area
+######
+
+do_cmd('/bin/mv %s/*.tgz %s' % (distro_dir, release_dir) )
+
+######
+# Clean up
+######
+
+# 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()
+from installation_files.windows.installer import create_config
+
+os.chdir('installation_files/windows')
+
+# Create ANUGA dir for NSI installer
 try:
-    print s    
-    system(s)
+    os.mkdir(os.path.join('files', anuga_release_name))
+    os.mkdir(os.path.join('files', 'anuga_viewer'))
+    os.mkdir(os.path.join('files', 'prereqs'))
+    os.mkdir(os.path.join('files', 'prereqs', 'netcdf'))
 except:
     pass
 
-
-    
-release_dir = release_area + '/%s' % anuga_release_name 
-s = 'mkdir %s' % release_dir
-try:
-    print s    
-    system(s)
-except:
-    pass
-
-#-----------------------------------------------------
-# Create temporary area for svn to export source files
-#-----------------------------------------------------
-distro_dir = mktemp()
-s = 'mkdir %s' % distro_dir
-print s    
-system(s)
-
-
-#---------------------------------------------------
-# Get the ANUGA directories flagged for distribution
-#---------------------------------------------------
-
-for source in dirmap:
-    
-    destination = join(distro_dir, dirmap[source])
-    
-    s = 'svn export -r %d --quiet %s %s' % (svn_revision,
-                                            source,
-                                            destination)
-
-    print s
-    system(s)
-
-
-
-
-# Store file with revision info for use with get_revision_number
-store_version_info(destination_path=distro_dir+'/anuga', verbose=True)
-
-
-#---------------------------
-# IP Data Audit
-#---------------------------
-print 'Verifying data IP'
-if not IP_verified(distro_dir, verbose=True):
-    msg = 'Files have not been verified for IP.\n'
-    msg += 'Each data file must have a license file with it.'
-    raise Exception, msg
-
-
-    
-
-#----------------------------------------------
-# Compile and bundle up the LaTeX documentation 
-#----------------------------------------------
-print
-print lsep
-print 'Preparing User Manual (see update_anuga_user_manual.log)'
-print lsep
-s = 'cd anuga_core/documentation/user_manual;'
-s += 'python update_anuga_user_manual.py --no_html'
-print s
-system(s + ' 1>update_anuga_user_manual.log 2>/dev/null')
-
-# Copy to distro_dir to become part of one tarball
-release_name = 'anuga_user_manual-%s.pdf' % revision
-s = '/bin/mv anuga_core/documentation/user_manual/anuga_user_manual.pdf %s/%s'\
-    %(distro_dir, release_name)
-print s
-system(s)
-
-release_name = 'anuga_installation_guide-%s.pdf' % revision
-s = '/bin/mv anuga_core/documentation/user_manual/anuga_installation_guide.pdf %s/%s' %(distro_dir, release_name)    
-print s
-system(s)
-
-release_name = 'anuga_whats_new-%s.pdf' % revision
-s = '/bin/mv anuga_core/documentation/user_manual/anuga_whats_new.pdf %s/%s' %(distro_dir, release_name)    
-print s
-system(s)
-    
-    
-    
-    
-    
-    
-    
-#------------------
-# Zip everything up
-#------------------
-s = 'cd %s;tar cvfz %s *' % (distro_dir, distro_filename)
-print s
-system(s)
-
-#----------------------------
-# Move distro to release area
-#----------------------------
-s = '/bin/mv %s/*.tgz %s' % (distro_dir, release_dir) 
-print s
-system(s)
-
-#---------
-# Clean up
-#---------
-s = '/bin/rm -rf %s/*' % (distro_dir) 
-print s
-system(s)
-
-
-#----------------------------------------------
-# Generate Windows installer 
-#----------------------------------------------
-
-root = os.getcwd()
-from installation_files.windows.installer import create_config
-
-os.chdir('installation_files/windows')
-
-# Create ANUGA dir for NSI installer
-try:
-    os.mkdir('files/%s' % anuga_release_name)
-    os.mkdir('files/anuga_viewer')
-    os.mkdir('files/prereqs')
-    os.mkdir('files/prereqs/netcdf')
-except:
-    pass
-
 # and unpack ANUGA into it
-s = 'cd files/%s; tar xvfz %s/%s' % (anuga_release_name,
-                                     release_dir, 
-                                     distro_filename)
-print s
-system(s)
+do_cmd('cd files/%s; tar xfz %s/%s'
+       % (anuga_release_name, release_dir, distro_filename))
 
 # Must be replaced by local folder to where SourceForge version is downloaded
@@ -215 +232 @@
 
 # Generate NSI file
-create_config(revision,
-              anuga_release_name,
-              anuga_viewer_folder,
-              python,
-              numpy,
-              scientific_python,
-              matplotlib,
-              netcdf_folder,
+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 
+# Package up files necessary to compile the installer on Windows and
 # move to release area
-
-try:
-    # Cleanup in case there was something left from a previous attempt
-    s = 'cd %s; /bin/rm -rf windows_installer' % release_dir
-    print s
-    system(s)
-except:
-    pass    
-    
+# 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
-s = 'cd %s; mkdir windows_installer; mkdir windows_installer/files'\
-    % release_dir
-print s
-system(s)
-
+do_cmd('cd %s; mkdir -p windows_installer/files' % release_dir)
 
 # Copy installion scrips and imagery across
-s = 'cp *.bmp *.nsh *.nsi *.ico %s/windows_installer' % release_dir
-print s
-system(s)
+do_cmd('cp *.bmp *.nsh *.nsi *.ico %s/windows_installer' % release_dir)
 
 # Copy actual files used by Windows installer across
-s = 'cd files; cp -r * %s/windows_installer/files' % release_dir
-print s
-system(s)                                                       
+do_cmd('cd files; cp -r * %s/windows_installer/files' % release_dir)
 
 # Come back to starting directory
 os.chdir(root)
-                                                      
+
 # Grab license file from anuga_core and copy to installer
-s = 'cp anuga_core/source/anuga/LICENSE.txt %s/windows_installer/files'\
-    % release_dir                                                       
-print s
-os.system(s)
-
-print 'NSI installer created'
-
-
-
-#----------------------------
+do_cmd('cp anuga_core/source/anuga/LICENSE.txt %s/windows_installer/files'
+       % release_dir)
+
+xlog('NSI installer created')
+
+######
 # Print list of release files
-#----------------------------
-print 'Done'
-print
-print
-print lsep
-print 'The release files are in %s:' %release_dir
-system('ls -la %s' %release_dir)
-print lsep
-print
-print
-
-
-#-------------------------------------
+######
+
+xlog('Done')
+print('')
+print('')
+print(lsep)
+xlog('The release files are in %s:' % release_dir)
+os.system('ls -la %s' % release_dir)
+print(lsep)
+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,
-    #    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
-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
 # This is hardwired for Ole but shows how such a thing can be done
 # automatically.
-
+######
 
 if get_user_name() == 'ole' and get_host_name() == 'nautilus':
-
-
     answer = raw_input('Do you want to move this to the GA NAS? Y/N [Y]')
     if answer.lower() == 'n':
         import sys; sys.exit()
 
-        
-
     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
-    system(s)
-    
-    #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'
-    
+    os.system(s)
+
+    #os.system('scp %s/*.pdf onielsen@cyclone:/d/cit/1/cit/risk_assessment_methods_project/downloads/ANUGA_install' %release_dir)#
+
+######
+# Little reminders
+######
+
+xlog('Remember to update')
+xlog('    anuga_whats_new.tex')
+xlog('    sourceforge')
+xlog('    code.google.com')

trunk/installation_files/windows/installer.py

@@ -1 @@
-def create_config(product_version,
-                  anuga_folder,
-                  anuga_viewer_folder,
-                  python,
-                  numpy,
-                  scientific_python,
-                  matplotlib,
-                  netcdf,
-                  mingw):
-        """
-        Short description:
-        """
-        
-        file = open('config.nsh', 'w')
+def create_config(product_version, anuga_folder, anuga_viewer_folder, python,
+              numpy, scientific_python, matplotlib, netcdf, mingw):
+    """
+    Short description:
+    """
+    
+    file = open('config.nsh', 'w')
 
-        file.write('''!ifndef __CONFIG_NSH
-!define __CONFIG_NSH
-; custom config
-; definitions should be quite self-explaining
+    file.write('!ifndef __CONFIG_NSH\n'
+               '!define __CONFIG_NSH\n'
+               '; custom config\n'
+               '; definitions should be quite self-explaining\n'
+               '\n'
+               '; global definitions\n'
+               '!define ProductName "ANUGA"\n')
+    file.write('!define ProductVersion "%s"\n' % product_version)
+    file.write('!define Company "Geoscience Australia"\n'
+               '!define Website "https://datamining.anu.edu.au/anuga"\n')
+    file.write('!define ExecutableName "AnugaSetup-%s.exe"\n' % product_version)
+    file.write('\n'
+               '; distribution file sources (for compiling the installer)\n'
+               '!define WelcomeFinishBitmap "wf.bmp"\n'
+               '!define HeaderBitmap "header.bmp"\n'
+               '!define InstallerIcon "installer.ico"\n'
+               '!define FileSource "files"\n'
+               '\n')
+    file.write('!define AnugaFolder "%s"\n' % anuga_folder)
+    file.write('!define AnugaViewerFolder "%s"\n' % anuga_viewer_folder)
+    file.write('!define PythonInst "%s"\n' % python)
+    file.write('!define NumpyInst "%s"\n' % numpy)
+    file.write('!define ScientificInst "%s"\n' % scientific_python)
+    file.write('!define MatplotlibInst "%s"\n' % matplotlib)
+    file.write('!define NetCDFFolder "%s"\n' % netcdf)
+    file.write('!define MinGWInst "%s"\n' % mingw)
+    file.write('!define MVCRPInst "vcredist_x86.exe"\n'
+               '\n'
+               '; registry/advanced information for the installation routine\n'
+               '!define AnugaViewerDefaultFolder "$PROGRAMFILES\Anuga Viewer"\n'
+               '!define NetCDFDefaultFolder "$COMMONFILES\NetCDF"\n'
+               '\n'
+               '!define ViewerExtension ".sww"\n'
+               '!define ViewerExtensionAlias "Anuga.Animation"\n'
+               '\n'
+               '!define UninstallerRegistryKey '
+                   r'"Software\Microsoft\Windows\CurrentVersion\Uninstall'
+                   r'\${ProductName}"'
+                   '\n'
+               '!define UninstallerExecutableName "Uninst_Anuga.exe"\n'
+               '\n'
+               '!endif\n')
 
-; global definitions
-!define ProductName "ANUGA" 
-''')        
-        file.write('!define ProductVersion "' + product_version + '"\n')
-        file.write('!define Company "Geoscience Australia"\n')
-        file.write('!define Website "https://datamining.anu.edu.au/anuga"\n')
-        file.write('!define ExecutableName "AnugaSetup-' + product_version + '.exe"\n\n')
-        file.write('''; distribution file sources (for compiling the installer)
-!define WelcomeFinishBitmap "wf.bmp"
-!define HeaderBitmap "header.bmp"
-!define InstallerIcon "installer.ico"
-!define FileSource "files"
-
-''')    
-        file.write('!define AnugaFolder "' + anuga_folder + '"\n')
-        file.write('!define AnugaViewerFolder "' + anuga_viewer_folder + '"\n')
-        file.write('!define PythonInst "' + python + '"\n')
-        file.write('!define NumpyInst "' + numpy + '"\n')
-        file.write('!define ScientificInst "' + scientific_python + '"\n')
-        file.write('!define MatplotlibInst "' + matplotlib + '"\n')
-        file.write('!define NetCDFFolder "' + netcdf + '"\n')
-        file.write('!define MinGWInst "' + mingw + '"\n')
-        file.write('!define MVCRPInst "vcredist_x86.exe"\n\n')
-        file.write('''; registry and advanced information for the installation routine
-!define AnugaViewerDefaultFolder "$PROGRAMFILES\Anuga Viewer"
-!define NetCDFDefaultFolder "$COMMONFILES\NetCDF"
-
-!define ViewerExtension ".sww"
-!define ViewerExtensionAlias "Anuga.Animation"
-
-!define UninstallerRegistryKey "Software\Microsoft\Windows\CurrentVersion\Uninstall\${ProductName}"
-!define UninstallerExecutableName "Uninst_Anuga.exe"
-
-!endif''')
-
-        file.close()
+    file.close()