Changeset 7489

Timestamp:

Sep 7, 2009, 2:18:26 PM (16 years ago)

Author:

ole

Message:

Updated create_distribution.py to generate NSI windows installer files.
Still need to source dependencies and viewer from SourceForge?

Files:

• anuga_core/test_all.py (modified) (1 diff)
• create_distribution.py (modified) (10 diffs)

anuga_core/test_all.py

@@ -16 +16 @@
 os.chdir('pymetis')
 print 'Changing to', os.getcwd()
-execfile('test_all.py')
+#execfile('test_all.py')
 
 os.chdir('..')

create_distribution.py

@@ -23 +23 @@
 from os import sep, system
 from os.path import join
+import os
 from tempfile import mktemp
 from sys import platform, stdout
@@ -52 +53 @@
 print 'Creating ANUGA revision %s' %revision
 
-distro_filename = 'anuga-%s.tgz' %revision
+anuga_release_name = 'anuga-%s' % revision
+distro_filename = '%s.tgz' % anuga_release_name
 
 #-----------------------------------
@@ -60 +62 @@
 #-----------------------------------
 release_area = '~/anuga_releases'
-s = 'mkdir %s' %release_area
+s = 'mkdir %s' % release_area
 try:
     print s    
@@ -68 +70 @@
 
 
-release_dir = release_area + '/anuga_release_%s' %revision 
-s = 'mkdir %s' %release_dir
+    
+release_dir = release_area + '/%s' % anuga_release_name 
+s = 'mkdir %s' % release_dir
 try:
     print s    
@@ -80 +83 @@
 #-----------------------------------------------------
 distro_dir = mktemp()
-s = 'mkdir %s' %distro_dir
+s = 'mkdir %s' % distro_dir
 print s    
 system(s)
@@ -92 +95 @@
     
     destination = join(distro_dir, dirmap[source])
-    s = 'svn export -r %d --quiet %s %s' %(svn_revision,
-                                           source,
-                                           destination)
+    
+    s = 'svn export -r %d --quiet %s %s' % (svn_revision,
+                                            source,
+                                            destination)
 
     print s
     system(s)
 
-
-
-#-----------------------------
-# Get validation_files as well
-#-----------------------------
-#s = 'mkdir %s/anuga_validation' %distro_dir
-#system(s)
-#
-#s = 'svn export -r %d --quiet anuga_validation/okushiri_2005 %s/anuga_validation/okushiri'\
-#    %(svn_revision, distro_dir) 
-#print s
-#system(s)
-
-#s = 'svn export -r %d --quiet anuga_validation/solitary_waves %s/anuga_validation/solitary_waves'\
-#    %(svn_revision, distro_dir)
-#print s
-#syst
-
-#s = 'svn export -r %d --quiet anuga_validation/automated_validation_tests %s/anuga_validation/automated_validation_tests'\
-#    %(svn_revision, distro_dir) 
-#print s
-#system(s)
-
-# FIXME: Other validations in here as they appear!
-
-
-#---------------------------
-# Get demos from user manual
-#---------------------------
-#s = 'svn export -r %d --quiet anuga_core/documentation/user_manual/demos %s/anuga_demos'\
-#    %(svn_revision, distro_dir) 
-#print s
-#system(s)
 
 
@@ -152 +123 @@
 # Zip everything up
 #------------------
-s = 'cd %s;tar cvfz %s *' %(distro_dir, distro_filename)
+s = 'cd %s;tar cvfz %s *' % (distro_dir, distro_filename)
 print s
 system(s)
@@ -159 +130 @@
 # Move distro to release area
 #----------------------------
-s = '/bin/mv %s/*.tgz %s' %(distro_dir, release_dir) 
+s = '/bin/mv %s/*.tgz %s' % (distro_dir, release_dir) 
 print s
 system(s)
@@ -166 +137 @@
 # Clean up
 #---------
-s = '/bin/rm -rf %s/*' %(distro_dir) 
-print s
-system(s)
-
-
-#-----------------------------
-# Copy and rename anuga_viewer
-#-----------------------------
-#s = '/bin/cp ./anuga_core/source/anuga_viewer/distros/anuga_viewer_1.0.tgz %s/anuga_viewer-%s.tgz' %(distro_dir, revision)
-#print s
-#system(s)
-
-#----------------------------
-# Move viewer to release area
-#----------------------------
-#s = '/bin/mv %s/*.tgz %s' %(distro_dir, release_dir) 
-#print s
-#system(s)
-
+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)    
+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)
+
+
+# Must be replaced by local folder to where SourceForge version is downloaded
+anuga_viewer_folder = 'anuga_viewer-1.0beta_7163'
+python = 'python-2.5.4.msi'
+numpy = 'Numeric-23.8.2.win32-py2.5.exe'
+scientific_python = 'ScientificPython-2.7.8.win32-py2.5.exe'
+netcdf_folder = 'net-cdf-3.6.1-win32'
+mingw = 'MinGW-5.1.4.exe'
+
+# Generate NSI file
+create_config(revision,
+              'https://datamining.anu.edu.au/anuga',
+              anuga_release_name,
+              anuga_viewer_folder,
+              python,
+              numpy,
+              scientific_python,
+              netcdf_folder,
+              mingw)
+
+              
+# 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    
+    
+# Create subdirectories for windows installer
+s = 'cd %s; mkdir windows_installer; mkdir windows_installer/files'\
+    % release_dir
+print s
+system(s)
+
+
+# Copy installion scrips and imagery across
+s = 'cp *.bmp *.nsh *.nsi *.ico %s/windows_installer' % release_dir
+print s
+system(s)
+
+# Copy actual files used by Windows installer across
+s = 'cd files; cp -r %s %s/windows_installer/files' % (anuga_release_name,
+                                                       release_dir)
+print s
+system(s)                                                       
+
+# 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'
 
 
@@ -233 +273 @@
 # 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':