summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2009-08-14 10:55:52 -0400
committerEliot Horowitz <eliot@10gen.com>2009-08-14 10:55:52 -0400
commit974d71012896ee863b505b8d9c891e1f7f82f6d1 (patch)
tree89d43dae7ff55396e0b672dcb4ba2c9811dd9788
parentc04c03474cbdc6c0b52bfe09af35732d7b7433e6 (diff)
downloadmongo-974d71012896ee863b505b8d9c891e1f7f82f6d1.tar.gz
cleaning install stuff - adding tiger info
-rw-r--r--SConstruct17
1 files changed, 11 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct
index f35dac9e7ff..79db4d52f9b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1140,6 +1140,15 @@ addSmoketest( "recordPerf", [ "perftest" ] , [ recordPerformance ] )
# ---- INSTALL -------
+def getSystemInstallName():
+ n = platform + "-" + processor
+ if static:
+ n += "-static"
+ if os.uname()[2].startswith( "8." ):
+ n += "-tiger"
+ return n
+
+
def getCodeVersion():
fullSource = open( "stdafx.cpp" , "r" ).read()
allMatches = re.findall( r"versionString.. = \"(.*?)\"" , fullSource );
@@ -1168,9 +1177,7 @@ def getDistName( sofar ):
if distBuild:
from datetime import date
today = date.today()
- installDir = "mongodb-" + platform + "-" + processor + "-"
- if static:
- installDir += "static-"
+ installDir = "mongodb-" + getSystemInstallName() + "-"
installDir += getDistName( installDir )
print "going to make dist: " + installDir
@@ -1294,9 +1301,7 @@ def s3push( localName , remoteName=None , remotePrefix=None , fixName=True , pla
if fixName:
(root,dot,suffix) = localName.rpartition( "." )
- name = remoteName + "-" + platform + "-" + processor
- if static:
- name += "-static"
+ name = remoteName + "-" + getSystemInstallName()
name += remotePrefix
if dot == "." :
name += "." + suffix