Changeset 5068

Timestamp:

Feb 20, 2008, 5:24:45 PM (16 years ago)

Author:

ole

Message:

Refactored dirs to distribute into separate module and updated create and audit scripts.

Files:

• audit_distribution.py (moved) (moved from audit_all_data.py) (1 diff)
• create_distribution.py (modified) (4 diffs)
• dirs_to_distribute.py (added)

audit_distribution.py

@@ +1 @@
+"""Audit the directories flagged for released
+
+This module forms an easy way to audit data files in the repository without
+running create_distribution.
+
+The benefit is that license files can be tested before being checked in.
+
+Note: This script will work on all data whether it is part of the
+repository or not. Before creating a license file for a data file it is a good idea to see if it is part of the repository or not (in which case there is no need). This can be done using svn status or by deleting the offending area and do a fresh svn update.
+
+Ole Nielsen, GA 2008
+"""
+
+
 from anuga.utilities.data_audit_wrapper import IP_verified
 from os.path import join
 
+from dirs_to_distribute import dirmap
+#print dirmap
 
-# Roughly the same as what is being released
-dirs_to_distribute = [join('anuga_core', 'source', 'anuga'),
-                      'anuga_validation',
-                      join('anuga_core', 'documentation', 'user_manual')]
-
-# Individual segments
-#dirs_to_distribute = ['anuga_validation']
-#dirs_to_distribute = [join('anuga_core', 'documentation', 'user_manual')]
-#dirs_to_distribute = [join('anuga_core', 'source', 'anuga')]
-
-
-
-for dir in dirs_to_distribute:
+for dir in dirmap:
     if not IP_verified(dir, verbose=True):
         pass

create_distribution.py

@@ -22 +22 @@
 
 from os import sep, system
-from string import join
+from os.path import join
 from tempfile import mktemp
 from sys import platform, stdout
@@ -30 +30 @@
 from anuga.config import major_revision
 
+from dirs_to_distribute import dirmap
 from anuga.utilities.data_audit_wrapper import IP_verified
 
@@ -74 +75 @@
 system(s)
 
-#--------------------------------
-# Get the ANUGA core source files
-#--------------------------------
-s = 'svn export -r %d --quiet anuga_core/source/anuga %s/anuga' %(svn_revision,
-                                                                  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)
+
+
 
 #-----------------------------
 # 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 = '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
-#system(s)
-
-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)
+#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!
@@ -109 +119 @@
 # 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)
+#s = 'svn export -r %d --quiet anuga_core/documentation/user_manual/demos %s/anuga_demos'\
+#    %(svn_revision, distro_dir) 
+#print s
+#system(s)
+