Changeset 19207

Timestamp:

08/14/06 16:38:16 (2 years ago)

Author:

patrick

Message:

MFT [rev 19086]:

• Added a smartCopy() method that is more intelligent about copying
  files. The primary additions to this method are:
  
  • Only copy the file if it has actually changed
    
  • Delete the dest file if it exists and a copy is going to happen
    
• This fixes some problems with read-only files and makes the
  installation process go much faster.
  

Much to my relief, this non-trivial merge applied cleanly with no
additional modifications required.

Files:

• juggler/branches/2.0/buildwin32.py (modified) (30 diffs)

juggler/branches/2.0/buildwin32.py

@@ -34 +34 @@
-
-import glob
-
+, os.path
-import re
-import shutil
@@ -41 +41 @@
-import traceback
-import getopt
+pj = os.path.join
-
-EXIT_STATUS_SUCCESS           = 0
@@ -765 +766 @@
-   mkinstalldirs(os.path.join(prefix, 'share'))
-
+def smartCopy(srcfile, dst):
+   """ Only copy file if it has changed, and delete it first.
+       Drop in replacement for shutil.copy2.
+       srcfile - Full path to source file to copy.
+       dst - Destination filename or directory.
+   """   
+   if os.path.isdir(dst):
+      dst = os.path.join(dst, os.path.basename(srcfile))
+        
+   # Verify we need to copy and make sure to delete if needed
+   if os.path.isfile(dst):
+      stat_src = os.stat(srcfile)
+      stat_dst = os.stat(dst)
+      if (stat_src.st_size == stat_dst.st_size) and \
+         (stat_src.st_mtime == stat_dst.st_mtime):
+         #print "skipping: ", dst
+         return   # File doesn't need to be copied
+      #print "removing: ", dst
+      os.remove(dst)
+   
+   # Copy it
+   shutil.copy2(srcfile, dst)
+   
+   
-def installDir(startDir, destDir, allowedExts = None, disallowedExts = None,
-               disallowedFiles = None):
+   #print "   %s ==> %s"%(startDir, destDir)
-   cwd = os.getcwd()
-
@@ -802 +828 @@
-                    disallowedFiles)
-      else:
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-   os.chdir(cwd)
@@ -851 +880 @@
-   srcroot = os.path.join(gJugglerDir, 'modules', 'vapor')
-
-hutil.copy2
+martCopy
-   extra_files = ['ChangeLog', 'README.txt', 'RELEASE_NOTES.txt']
-   for f in extra_files:
-hutil.copy2
+martCopy
-
-def installTweek(prefix, buildDir):
@@ -882 +911 @@
-   srcroot = os.path.join(gJugglerDir, 'modules', 'tweek')
-
-hutil.copy2
+martCopy
-   extra_files = ['ChangeLog', 'RELEASE_NOTES.txt']
-   for f in extra_files:
-hutil.copy2
+martCopy
-
-def installTweekJava(prefix, buildDir):
@@ -919 +948 @@
-      # Install the base JAR files that make up the Tweek Java API.
-      for j in jars:
-hutil.copy2
+martCopy
-
-      # Install the tweek_jni DLL.
@@ -929 +958 @@
-            destdir = os.path.join(destdir, arch)
-            mkinstalldirs(destdir)
-hutil.copy2
+martCopy
-
-      destdir = os.path.join(prefix, 'share', 'tweek', 'beans')
@@ -941 +970 @@
-         jar = b + '.jar'
-         xml = b + '.xml'
-hutil.copy2
-hutil.copy2
+martCopy
+martCopy
-
-      xml_srcdir  = os.path.join(gJugglerDir, 'modules', 'tweek', 'extensions',
@@ -951 +980 @@
-         jar = b + '.jar'
-         xml = b + '.xml'
-hutil.copy2
-hutil.copy2
+martCopy
+martCopy
-
-      # Install tweek.bat.
-      srcdir = os.path.join(gJugglerDir, 'modules', 'tweek', 'java')
-      destdir = os.path.join(prefix, 'bin')
-hutil.copy2
+martCopy
-
-      # Install JacORB IDL compiler.
-      srcdir = os.path.join(gJugglerDir, 'external', 'JacORB')
-      installDir(srcdir, destdir, ['.jar'])
-hutil.copy2
+martCopy
-
-      # Destination for all remaining .jar files.
@@ -982 +1011 @@
-      srcroot = os.path.join(gJugglerDir, 'external', 'swing-laf')
-      for j in laf_jars:
-hutil.copy2
+martCopy
-   else:
-      printStatus("Tweek Java API not built.  Skipping.")
@@ -1020 +1049 @@
-                          '3.0')
-   mkinstalldirs(destdir)
-hutil.copy2
+martCopy
-
-   destdir = os.path.join(schema_root, 'www.vrjuggler.org', 'jccl', 'xsd',
-                          '3.1')
-   mkinstalldirs(destdir)
-hutil.copy2
+martCopy
-
-   destdir = schema_root
@@ -1036 +1065 @@
-   srcroot = os.path.join(gJugglerDir, 'modules', 'jackal')
-
-hutil.copy2
+martCopy
-   extra_files = ['ChangeLog', 'RELEASE_NOTES.txt']
-   for f in extra_files:
-hutil.copy2
+martCopy
-
-def installJCCLPlugins(prefix, buildDir):
@@ -1063 +1092 @@
-
-      for j in jars:
-hutil.copy2
+martCopy
-
-      srcdir = os.path.join(gJugglerDir, 'modules', 'jackal', 'config')
-hutil.copy2
+martCopy
-
-      # Install dependencies.
@@ -1078 +1107 @@
-      mkinstalldirs(destdir)
-      for j in dep_jars:
-hutil.copy2
+martCopy
-   else:
-      printStatus("JCCL Java API not built.  Skipping.")
@@ -1089 +1118 @@
-
-      destdir = os.path.join(prefix, 'share', 'jccl', 'beans')
-hutil.copy2
+martCopy
-
-      srcdir = os.path.join(gJugglerDir, 'modules', 'jackal', 'plugins',
-                            'corba_rtrc')
-hutil.copy2
+martCopy
-   else:
-      printStatus("JCCL Java plug-ins not built.  Skipping.")
@@ -1123 +1152 @@
-   srcroot = os.path.join(gJugglerDir, 'modules', 'sonix')
-
-hutil.copy2
+martCopy
-   extra_files = ['ChangeLog', 'README.txt']
-   for f in extra_files:
-hutil.copy2
+martCopy
-
-def installSonixPlugins(prefix, buildDir):
@@ -1184 +1213 @@
-   srcroot = os.path.join(gJugglerDir, 'modules', 'gadgeteer')
-
-hutil.copy2
+martCopy
-   extra_files = ['ChangeLog', 'RELEASE_NOTES.txt']
-   for f in extra_files:
-hutil.copy2
+martCopy
-
-def installGadgeteerDrivers(prefix, buildDir):
@@ -1267 +1296 @@
-   srcroot = os.path.join(gJugglerDir, 'modules', 'vrjuggler')
-
-hutil.copy2
+martCopy
-   extra_files = ['ChangeLog', 'RELEASE_NOTES.txt']
-   for f in extra_files:
-hutil.copy2
+martCopy
-
-def installVRJConfig(prefix, buildDir):
@@ -1311 +1340 @@
-         jar_file = os.path.join(jardir, j)
-         if os.path.exists(jar_file):
-hutil.copy2
+martCopy
-
-      # Install the base set of VRJConfig JavaBeans.
@@ -1319 +1348 @@
-         jar_file = os.path.join(jardir, j)
-         if os.path.exists(jar_file):
-hutil.copy2
-
-hutil.copy2
+martCopy
+
+martCopy
-
-      # Install any custom editors that were compiled.
@@ -1331 +1360 @@
-         xml_file = os.path.join(custom_editor_src, e[0], e[1] + '.xml')
-         if os.path.exists(jar_file):
-hutil.copy2
-hutil.copy2
+martCopy
+martCopy
-
-      # Install any wizards that were compiled.
@@ -1340 +1369 @@
-         jar_file = os.path.join(jardir, e[1] + '.jar')
-         if os.path.exists(jar_file):
-hutil.copy2
+martCopy
-
-      # Install vrjconfig.bat.
-      destdir = os.path.join(prefix, 'bin')
-hutil.copy2
+martCopy
-
-      # Install dependencies.
@@ -1355 +1384 @@
-      destdir = os.path.join(prefix, 'share', 'vrjuggler', 'java')
-      for j in dep_jars:
-hutil.copy2
+martCopy
-   else:
-      printStatus("VRJConfig not built.  Skipping.")
@@ -1379 +1408 @@
-         destdir = os.path.join(prefix, 'share', 'vrjuggler', 'beans')
-         mkinstalldirs(destdir)
-hutil.copy2
+martCopy
-
-         srcdir = os.path.join(gJugglerDir, 'modules', 'vrjuggler', 'plugins',
-                               dir)
-hutil.copy2
+martCopy
-      else:
-         printStatus("VR Juggler %s Java plug-ins not built.  Skipping." % name)
@@ -1405 +1434 @@
-
-      for d in dlls:
-
-
-
+
+
+
+
-   except KeyError, ex:
-      printStatus("WARNING: Could not install MSVC runtime DLLs")
@@ -1459 +1489 @@
-def installBoost(prefix):
-   printStatus("Installing Boost headers and libraries")
+   print "Installing Boost headers and libraries"
-
-   srcroot = os.environ['BOOST_ROOT']
@@ -1473 +1504 @@
-
-   for f in lib_list:
-
+
+
-
-def installGMTL(prefix):
@@ -1496 +1528 @@
-         dll = os.path.join(d, 'OpenAL32.dll')
-         if os.path.exists(dll):
-hutil.copy2
+martCopy
-
-   srcdir = os.environ['ALUT_ROOT']
@@ -1505 +1537 @@
-      alut_dll = os.path.join(srcdir, 'lib', 'alut.dll')
-      if os.path.exists(alut_dll):
-hutil.copy2
+martCopy
-
-def installOmniORB(prefix):