From 1c58a7b5a1a3d36dd0bef9f9073a17897fd47495 Mon Sep 17 00:00:00 2001 From: Dan Crosta Date: Thu, 5 Apr 2012 13:59:31 -0400 Subject: SERVER-5524 upload client tarball to correct location in S3 --- SConstruct | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'SConstruct') 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") -- cgit v1.2.1