From e4f3d865537d7299f96ac4b5e26d04d7ae408e76 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 2 Feb 2011 12:02:39 +0000 Subject: [PATCH] Small adjustements. --- bootstrap/buildCoriolis.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/bootstrap/buildCoriolis.py b/bootstrap/buildCoriolis.py index ee88dc1f..435cd355 100755 --- a/bootstrap/buildCoriolis.py +++ b/bootstrap/buildCoriolis.py @@ -100,12 +100,12 @@ class ProjectBuilder: def _updateSecondary ( self ): - self._rpmbuildDir = os.path.join ( self._rootDir, "rpmbuild" ) - self._debbuildDir = os.path.join ( self._rootDir, "debbuild" ) + self._rpmbuildDir = os.path.join ( self._rootDir , "rpmbuild" ) + self._debbuildDir = os.path.join ( self._rootDir , "debbuild" ) self._tmppathDir = os.path.join ( self._rpmbuildDir, "tmp" ) - self._tarballDir = os.path.join ( self._rootDir, "tarball" ) - self._archiveDir = os.path.join ( self._tarballDir, "coriolis2-1.0.%s" % self._svnTag ) - self._sourceDir = os.path.join ( self._rootDir, "src" ) + self._tarballDir = os.path.join ( self._rootDir , "tarball" ) + self._archiveDir = os.path.join ( self._tarballDir , "coriolis2-1.0.%s" % self._svnTag ) + self._sourceDir = os.path.join ( self._rootDir , "src" ) self._osDir = os.path.join ( self._rootDir , self._osType , "%s.%s" % (self._buildMode,self._libMode) ) @@ -451,7 +451,7 @@ class ProjectBuilder: if os.path.isdir(self._tarballDir): print "Removing previous tarball directory: \"%s\"." % self._tarballDir - command = [ "/bin/rm", "-r", self._tarballDir ] + command = [ "/bin/rm", "-rf", self._tarballDir ] self._execute ( command, "Removing top export (tarball) directory" ) print "Creating tarball directory: \"%s\"." % self._tarballDir @@ -485,11 +485,13 @@ class ProjectBuilder: #self._execute ( command, "patch for distribution command failed" ) os.chdir ( self._tarballDir ) - command = [ "/bin/tar", "jcvf", self._sourceTarBz2, os.path.basename(self._archiveDir) ] + command = [ "/bin/tar" + , "--exclude", "\\.svn" + , "-jcvf", self._sourceTarBz2, os.path.basename(self._archiveDir) ] self._execute ( command, "tar command failed" ) print "Cleanup SVN export tarball archive directory: \"%s\"." % self._archiveDir - command = [ "/bin/rm", "-r", self._archiveDir ] + command = [ "/bin/rm", "-rf", self._archiveDir ] self._execute ( command, "Removing archive export (tarball) directory" ) return