Changeset 2644

Timestamp:

Jun 5, 2010 3:22:03 PM (11 years ago)

Author:

wehart

Message:

Update to offline installation.

File:

• coopr.misc/trunk/util/coopr_install (modified) (14 diffs)

coopr.misc/trunk/util/coopr_install

@@ -2603 +2603 @@
 #
 
+import time
 import commands
 import re
@@ -2832 +2833 @@
 
     def guess_versions(self, offline=False):
+        if offline:
+            self.release = self.config.root
+            if self.release is None:
+                self.release = self.name
+            self.stable = None
+            self.trunk = None
+            return
         if not self.config.root is None:
             if using_subversion:
@@ -3333 +3341 @@
         if len(args) == 0:
             args.append(self.abshome_dir)
-        #
-        # Parse config files
-        #
-        if options.update:
+        if options.update or options.offline:
             self.config=None
             options.config_files.append( join(self.abshome_dir, 'admin', 'config.ini') )
+        #
+        # If applying preinstall, then only do subversion exports
+        #
+        if options.preinstall:
+            Repository.svn_get='export'
+
+    def read_config_files(self, options):
+        #
+        # Parse config files
+        #
         if not self.config is None and (len(options.config_files) == 0 or options.keep_config):
             fp = StringIO.StringIO(self.config)
@@ -3356 +3371 @@
         print " END - Configuration summary"
         print "-----------------------------------------------------------------"
-        #
-        # If applying preinstall, then only do subversion exports
-        #
-        if options.preinstall:
-            Repository.svn_get='export'
 
     def get_homedir(self, options, args):
@@ -3385 +3395 @@
 
     def setup_installer(self, options):
+        if options.verbose:
+            stime = time.time()
         if options.preinstall:
             print "Creating preinstall zip file in '%s'" % self.home_dir
@@ -3449 +3461 @@
             unzip_file(file, dir=self.abshome_dir)
 
+        #
+        # Read config files now
+        #
+        self.read_config_files(options)
+        #
+        # Setup packages for installation
+        #
         if options.preinstall or not options.offline:
             #self.get_packages(options)
@@ -3461 +3480 @@
             for pkg in self.sw_packages:
                 pkg.guess_versions(True)
+        if options.verbose:
+            ftime = time.time()
+            print "Timing for 'setup_installer' - %f sec" % (ftime-stime)
 
     def get_packages(self, options):
+        if options.verbose:
+            stime = time.time()
         #
         # Setup the 'admin' directory
@@ -3508 +3532 @@
         #
         for pkg in self.sw_packages:
+            if options.verbose:
+                pkg_stime = time.time()
             pkg.guess_versions(False)
             if not pkg.install:
@@ -3525 +3551 @@
                 if not options.update:
                     pkg.install_release(dir=tmp, install=False, preinstall=options.preinstall, offline=options.offline)
+            if options.verbose:
+                pkg_ftime = time.time()
+                print "Timing to install package %s - %f sec" % (str(pkg.config.name),pkg_ftime-pkg_stime)
         if options.update or not os.path.exists(join(self.abshome_dir,'doc')):
             self.install_auxdirs(options)
@@ -3543 +3572 @@
             zip_file(self.default_dirname+'.zip', ['.'])
             sys.exit(0)
+        if options.verbose:
+            ftime = time.time()
+            print "Timing for 'get_packages' - %f sec" % (ftime-stime)
 
     def get_other_packages(self, options):
@@ -3552 +3584 @@
         
     def install_packages(self, options):
+        if options.verbose:
+            stime = time.time()
         #
         # Set the bin directory
@@ -3574 +3608 @@
         #
         for pkg in self.sw_packages:
+            if options.verbose:
+                pkg_stime = time.time()
             if not pkg.install:
                 pkg.find_pkgroot(trunk=options.trunk, stable=options.stable, release=not (options.trunk or options.stable))
@@ -3596 +3632 @@
                 else:
                     pkg.install_release(dir=srcdir, preinstall=options.preinstall, offline=options.offline)
+            if options.verbose:
+                pkg_ftime = time.time()
+                print "Timing to install package %s - %f sec" % (str(pkg.config.name),pkg_ftime-pkg_stime)
         #
         # Copy the <env>/Scripts/* files into <env>/bin
@@ -3616 +3655 @@
         print ""
         print "Finished installation in '%s'" % self.home_dir
+        #
+        if options.verbose:
+            ftime = time.time()
+            print "Timing for 'install_packages' - %f sec" % (ftime-stime)
 
     def localize_cmd_files(self, dir, force_localization=False):