summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorDan Crosta <dcrosta@10gen.com>2012-04-05 13:59:31 -0400
committerDan Crosta <dcrosta@10gen.com>2012-04-05 14:50:42 -0400
commit1c58a7b5a1a3d36dd0bef9f9073a17897fd47495 (patch)
treeebf7f3562d581404351f7a3a044087ae36ae93f0 /SConstruct
parentb987d96067b24e4d1eb6dede4c204f2dc0db8f57 (diff)
downloadmongo-1c58a7b5a1a3d36dd0bef9f9073a17897fd47495.tar.gz
SERVER-5524 upload client tarball to correct location in S3
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct9
1 files changed, 3 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct
index d95b668065d..0b0f3c5bc37 100644
--- a/SConstruct
+++ b/SConstruct
@@ -963,8 +963,7 @@ env.AlwaysBuild( "push" )
# ---- deploying ---
-def s3push( localName , remoteName=None , remotePrefix=None , fixName=True , platformDir=True,
- isDriverBuild=False ):
+def s3push( localName , remoteName=None , remotePrefix=None , fixName=True , platformDir=True ):
localName = str( localName )
if remotePrefix is None:
@@ -993,9 +992,7 @@ def s3push( localName , remoteName=None , remotePrefix=None , fixName=True , pla
else:
name = remoteName
- if isDriverBuild:
- name = "cxx-driver/" + name
- elif platformDir:
+ if platformDir:
name = platform + "/" + name
print( "uploading " + localName + " to http://s3.amazonaws.com/" + s.name + "/" + name )
@@ -1016,7 +1013,7 @@ def s3dist( env , target , source ):
s3push( str(source[0]) , "mongodb" )
def s3distclient(env, target, source):
- s3push(str(source[0]), "cxx-driver/mongodb")
+ s3push(str(source[0]), "cxx-driver/mongodb", platformDir=False)
env.Alias( "dist" , '$SERVER_ARCHIVE' )
env.Alias( "distclient", "$CLIENT_ARCHIVE")