Changeset 5016

Timestamp:

Feb 8, 2008, 5:46:27 PM (17 years ago)

Author:

ole

Message:

Added IP tracking to test_all and updated create_distribution

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (1 diff)
• anuga_core/test_all.py (modified) (2 diffs)
• create_distribution.py (modified) (3 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -366 +366 @@
     # NOTE (Ole): Caching Interpolation function is too slow as
     # the very long parameters need to be hashed.
-
-
 
 

anuga_core/test_all.py

@@ +1 @@
+from anuga.utilities.data_audit import IP_verified
+from tempfile import mktemp
+
 import os
 
@@ -9 +12 @@
 
 execfile('test_all.py')
+
+
+
+#---------------------------
+# IP Data Audit (in source/anuga directory as well)
+#---------------------------
+
+#-----------------------------------------------------
+# Create temporary area for svn to export source files
+#-----------------------------------------------------
+temp_dir = mktemp()
+
+print 'Temp dir', temp_dir
+os.mkdir(temp_dir)
+
+
+#--------------------------------
+# Get the ANUGA core source files
+#--------------------------------
+s = 'svn export . %s%sanuga' %(temp_dir, os.sep) 
+print s
+os.system(s)
+
+
+
+print 'Verifying data IP'
+if not IP_verified(temp_dir):
+    msg = 'Files have not been verified for IP.\n'
+    msg += 'Each data file must have a license file with it.'
+    raise Exception, msg
+
+
 
 print

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.anuga_config import major_revision
-
-from anuga.utilities.data_audit import identify_data_files
-
+from anuga.config import major_revision
+
+from anuga.utilities.data_audit import IP_verified
 
 if platform == 'win32':
@@ -78 +77 @@
 # Get the ANUGA core source files
 #--------------------------------
-s = 'svn export -r %d anuga_core/source/anuga %s/anuga' %(svn_revision,
-                                                          distro_dir) 
-print s
-system(s)
+s = 'svn export -r %d --quiet anuga_core/source/anuga %s/anuga' %(svn_revision,
+                                                                  distro_dir) 
+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
+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)
+
+# 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)
+
 
 # Store file with revision info for use with get_revision_number
@@ -87 +119 @@
 
 
-#-----------------------------
-# Get validation_files as well
-#-----------------------------
-s = 'mkdir %s/anuga_validation' %distro_dir
-system(s)
-
-s = 'svn export anuga_validation/okushiri_2005 %s/anuga_validation/okushiri'\
-    %(distro_dir) 
-print s
-system(s)
-
-s = 'svn export anuga_validation/solitary_waves %s/anuga_validation/solitary_waves'\
-    %(distro_dir)
-print s
-system(s)
-
-s = 'svn export anuga_validation/automated_validation_tests %s/anuga_validation/automated_validation_tests'\
-    %(distro_dir) 
-print s
-system(s)
-
-# FIXME: Other validations in here as they appear!
-
-
-#---------------------------
-# Get demos from user manual
-#---------------------------
-s = 'svn export anuga_core/documentation/user_manual/demos %s/anuga_demos'\
-    %(distro_dir) 
-print s
-system(s)
-
-
-identify_data_files(distro_dir)
+#---------------------------
+# IP Data Audit
+#---------------------------
+print 'Verifying data IP'
+if not IP_verified(distro_dir):
+    msg = 'Files have not been verified for IP.\n'
+    msg += 'Each data file must have a license file with it.'
+    raise Exception, msg