[Pythoncard-cvs] PythonCard/tools/standaloneBuilder standaloneBuilder.py,1.6,1.7

[Phil E. <l2...@us...>]

Update of /cvsroot/pythoncard/PythonCard/tools/standaloneBuilder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31302

Modified Files:
	standaloneBuilder.py 
Log Message:
Fix for a minor bug found when building tarballs of a project under Linux.


Index: standaloneBuilder.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/standaloneBuilder/standaloneBuilder.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** standaloneBuilder.py	19 Apr 2005 08:23:56 -0000	1.6
--- standaloneBuilder.py	21 Apr 2005 07:57:08 -0000	1.7
***************
*** 59,62 ****
--- 59,65 ----
  import time
  
+ if not sys.platform.startswith('win'):
+     import commands
+ 
  # pythoncard imports
  import wx
***************
*** 764,768 ****
          tdir = self.project.get('Project', 'name')
          tdir += '-' + vstring
!         tdir += '-' + self.project.get('Project', 'fixnumber')
          topdir = tdir
          tarball = tdir + '.tar.gz'
--- 767,771 ----
          tdir = self.project.get('Project', 'name')
          tdir += '-' + vstring
!         tdir += '-' + self.project.get('Project', 'build')
          topdir = tdir
          tarball = tdir + '.tar.gz'
***************
*** 771,775 ****
          
          try:
!             os.removedirs(tdir)
          except:
              pass
--- 774,780 ----
          
          try:
!             cmd = 'rm -rf %s' % tdir
!             os.system(cmd)
!             #os.removedirs(tdir)
          except:
              pass
***************
*** 800,804 ****
          # use cpio to copy everything listed in manifest.in into the temp
          # directory just created
!         cmd = "cat manifest.in|cpio -vdump %s > /dev/null 2>&1" % (topdir)
          os.system(cmd)
          
--- 805,809 ----
          # use cpio to copy everything listed in manifest.in into the temp
          # directory just created
!         cmd = "cd %s; cat manifest.in|cpio -vdump %s" % (basedir, topdir)
          os.system(cmd)
          
***************
*** 806,814 ****
          tb = os.path.join(basedir, self.pathJoin(self.project.get('Project', 'tarballspath')))
          tb = os.path.join(tb, tarball)
!         cmd = "tar -zcvf %s %s > /dev/null 2>&1" % (tb, topdir)
          os.system(cmd)
          
          # remove the temporary directory when done
!         cmd = "rm -rf %s" % topdir
          os.system(cmd)
          
--- 811,819 ----
          tb = os.path.join(basedir, self.pathJoin(self.project.get('Project', 'tarballspath')))
          tb = os.path.join(tb, tarball)
!         cmd = "cd %s; tar -zcvf %s %s > /dev/null 2>&1" % (basedir, tb, topdir)
          os.system(cmd)
          
          # remove the temporary directory when done
!         cmd = "cd %s; rm -rf %s" % (basedir, topdir)
          os.system(cmd)
          
***************
*** 841,846 ****
          
          if self.components.projectIcon.text != '':
-             spec.append("          icon = '%s'," % iconfile)
              iconfile = os.path.join(basedir, self.components.projectIcon.text)
              
          spec.append("          version = '%s')" % versionfile)
--- 846,851 ----
          
          if self.components.projectIcon.text != '':
              iconfile = os.path.join(basedir, self.components.projectIcon.text)
+             spec.append("          icon = '%s'," % iconfile)
              
          spec.append("          version = '%s')" % versionfile)
***************
*** 1453,1456 ****
--- 1458,1463 ----
                  if self.components[comp].userdata != pstatus:
                      self.components[comp].enabled = False
+                 else:
+                     self.components[comp].enabled = True
                      
          if pstatus == 'open':