From a9b4147df8369461e72a7d443e2730b6a153cd61 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Fri, 11 Nov 2011 08:07:58 -0500 Subject: [PATCH] build: Updated Sconstruct A few fixes before releasing 5.3 --- Sconstruct | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Sconstruct b/Sconstruct index c764a3c9..94ab2254 100644 --- a/Sconstruct +++ b/Sconstruct @@ -4,7 +4,7 @@ import sys MAJOR = 5 MINOR = 3 BUG = 0 -EXTRA = "rc1" +EXTRA = "" DEBUG = False PREFIX = "/usr" @@ -61,7 +61,6 @@ def ocarina_sh(target, source, env): f.write("#!/bin/bash\n") f.write(PREFIX + "/lib/ocarina/ocarina.bin \"$*\"\n") f.close() - #return "./ocarina.sh" env.Command(bin, None, [ocarina_sh, Move(bin, "ocarina.sh"), Chmod(bin, 0755)]) # Clean up the build directory @@ -70,12 +69,14 @@ Clean(ocarina, ["include/version.h"]) # Create a tarball def git_archive(target, source, env): import os - version = "%s.%s" % (MAJOR, MINOR) + version = "%s.%s" % (MAJOR, MINOR) if BUG != 0: version += ".%s" % BUG if EXTRA != "": version += "-%s" % EXTRA if DEBUG == True: version += "-debug" - os.popen("git archive --prefix=ocarina/ -o ocarina-%s.tar.gz HEAD" % (version)) + ocarina="ocarina-%s" % version + os.popen("git archive --prefix=%s/ -o %s.tar.gz HEAD" % (ocarina, ocarina)) + print "md5sum:", os.popen("md5sum %s.tar.gz" % ocarina).read() env.Command("archive", None, [git_archive])