Permalink
Browse files

Revision: 17824

  • Loading branch information...
1 parent 3d69c26 commit f99c36194638bdaa955a7981196ade98ef4f4b04 @wangzhonnew wangzhonnew committed Jul 19, 2015
Showing 426 changed files with 41,348 additions and 8,711 deletions.
View
@@ -216,8 +216,8 @@ add_option( "noscreenout", "do not send anything to screen", 0, True )
#fap options
add_option( "fap", "foreign access protocol", 0, False )
-#ssl options
-add_option( "ssl", "build engine with SSL (enterprise edition only) ", 0, False )
+#enterprise options
+add_option( "enterprise", "build enterprise sequoiadb ( with SSL )", 0, False )
# don't run configure if user calls --help
if GetOption('help'):
@@ -299,7 +299,13 @@ hasShell = has_option( "shell" )
hasFmp = has_option("fmp")
hasAll = has_option( "all" )
hasFap = has_option("fap")
-hasSSL = has_option("ssl")
+hasEnterprise = has_option("enterprise")
+hasSSL = False
+
+# build enterprise edition
+if hasEnterprise:
+ hasSSL = True
+ env.Append( CPPDEFINES=[ "SDB_ENTERPRISE" ] )
# if everything are set, let's set everything to true
if hasAll:
@@ -552,8 +558,8 @@ elif "win32" == guess_os:
# SSL
env.Append( LIBS=['ssleay32'] )
env.Append( LIBS=['libeay32'] )
- ssllib_file = join(ssllib_dir, 'libeay32.dll')
- ssllib_file1 = join(ssllib_dir, 'ssleay32.dll')
+ ssllib_file = join(ssllib_dir, 'libeay32.lib')
+ ssllib_file1 = join(ssllib_dir, 'ssleay32.lib')
# UNICODE
env.Append( CPPDEFINES=[ "_UNICODE" ] )
env.Append( CPPDEFINES=[ "UNICODE" ] )
@@ -687,7 +693,10 @@ fapEnv.Append( CPPDEFINES=["SDB_ENGINE", "SDB_DLL_BUILD"])
#fapEnv.Append( CPPPATH=[join(engine_dir, "bson")])
# drivers always set SSL definition
+toolEnv.Append( CPPDEFINES=[ "SDB_SSL" ] )
clientCppEnv.Append( CPPDEFINES=[ "SDB_SSL" ] )
+clientCEnv.Append( CPPDEFINES=[ "SDB_SSL" ] )
+shellEnv.Append( CPPDEFINES=[ "SDB_SSL" ] )
if hasSSL:
env.Append( CPPDEFINES=[ "SDB_SSL" ] )
@@ -129,7 +129,8 @@ utilFiles = [
"client/jstobs.c",
"util/csv2rawbson.cpp",
"util/utilCommon.cpp",
- "util/url.c"
+ "util/url.c",
+ "util/utilBsonHash.cpp"
]
rtnFiles = [
@@ -149,7 +150,7 @@ rtnFiles = [
"rtn/rtnBackup.cpp",
"rtn/rtnReorg.cpp",
"rtn/rtnCoordCommands.cpp",
- "rtn/rtnCoordImageCommands.cpp",
+ "rtn/rtnCoordDCCommands.cpp",
"rtn/rtnCoordQuery.cpp",
"rtn/rtnCoordCommon.cpp",
"rtn/rtnCoordOperator.cpp",
@@ -343,7 +344,8 @@ clsFiles = [
"cls/clsReplBucket.cpp",
"cls/clsCataHashMatcher.cpp",
"cls/clsCommand.cpp",
- "cls/clsReelection.cpp"
+ "cls/clsReelection.cpp",
+ "cls/clsDCMgr.cpp"
]
dpsFiles = [
@@ -391,8 +393,10 @@ catFiles = [
"cat/catalogueCB.cpp",
"cat/catNodeManager.cpp",
"cat/catCatalogManager.cpp",
+ "cat/catDCManager.cpp",
"cat/catLevelLock.cpp",
- "cat/catSplit.cpp"
+ "cat/catSplit.cpp",
+ "cat/catDCLogMgr.cpp"
]
coordFiles = [
@@ -805,7 +809,7 @@ if hasTool:
_LIBDEPS='$_LIBDEPS_OBJS' )
sdbdmsdump = env.Program("sdbdmsdump", sdbdmsdumpMain,
- LIBDEPS=["qgm","bar","rest","cat","coord","snappy","cls","pcre","oss","pd","pmd","mig","rtn","msg","ixm","dms","bps","bson","mth","opt","util","mon","dps","net", "sql","auth", "aggr","spd", "omsvc"],
+ LIBDEPS=["qgm","bar","rest","cat","coord","snappy","util","cls","pcre","oss","pd","pmd","mig","rtn","msg","ixm","dms","bps","bson","mth","opt","mon","dps","net", "sql","auth", "aggr","spd", "omsvc"],
_LIBDEPS='$_LIBDEPS_OBJS' )
# Install testcases
if hasTestcase:
@@ -1,13 +1,21 @@
import os
Import("clientCEnv")
+Import("linux")
+Import("windows")
+Import("ssllib_file")
+Import("ssllib_file1")
+Import("mergeStaticLibrary")
clientCFiles = [
"client/client.c"
]
clientCLibFiles = [
clientCFiles,
+ "oss/ossSSLCertificate.c",
+ "oss/ossSSLWrapper.c",
+ "oss/ossSSLContext.c",
"oss/oss.c",
"oss/ossUtil.c",
"oss/ossMem.c",
@@ -22,12 +30,27 @@ clientCLibFiles = [
"bson/md5.c"
]
-#Client Library
+#Shared Library
clientCLib = clientCEnv.SharedLibrary('sdbc', clientCLibFiles)
-clientCLibStatic = clientCEnv.StaticLibrary('staticsdbc', clientCLibFiles)
-
clientCEnv.Install( '#/client/lib', clientCLib )
-clientCEnv.Install( '#/client/lib', clientCLibStatic )
+
+#Static Library
+dir = ''
+def merge(target, source = None, env = clientCEnv):
+ pureLib = dir + '/libstaticpuresdbc.a'
+ clientCLibStatic = dir + '/libstaticsdbc.a'
+ mergeStaticLibrary(clientCLibStatic, ssllib_file, ssllib_file1, pureLib)
+ clientCEnv.Install( '#/client/lib/', clientCLibStatic )
+
+if linux:
+ staticPureSdbCLib = clientCEnv.StaticLibrary('staticpuresdbc', clientCLibFiles)
+ dir = os.path.dirname(staticPureSdbCLib[0].get_abspath())
+ clientCEnv.AddPostAction(staticPureSdbCLib, Action(merge))
+elif windows:
+ clientCLibStatic = clientCEnv.StaticLibrary('staticsdbc', [clientCLibFiles, ssllib_file, ssllib_file1])
+ clientCEnv.Install( '#/client/lib/', clientCLibStatic )
+
+#Header files
clientCEnv.Install( '#/client/include', "client/client.h" )
clientCEnv.Install( '#/client/include', "client/jstobs.h" )
clientCEnv.Install( '#/client/include', "client/base64c.h" )
@@ -2,6 +2,7 @@ import os
Import("clientCppEnv")
Import("linux")
+Import("windows")
Import("ssllib_file")
Import("ssllib_file1")
Import("mergeStaticLibrary")
@@ -60,6 +61,9 @@ if linux:
dir = os.path.dirname(staticPureSdbCPPLib[0].get_abspath())
clientCPPLibStatic = dir + '/libstaticsdbcpp.a'
clientCppEnv.AddPostAction(staticPureSdbCPPLib, Action(merge))
+elif windows:
+ clientCPPLibStatic = clientCppEnv.StaticLibrary('staticsdbcpp', [clientCPPLibFiles, ssllib_file, ssllib_file1])
+ clientCppEnv.Install( '#/client/lib/', clientCPPLibStatic )
#Header files
clientCppEnv.Install( '#/client/include/', "client/client.hpp" )
@@ -3,14 +3,49 @@ import os
Import("fapEnv")
fapMongoFiles = [
+ "fap/mongodb/commands.cpp",
"fap/mongodb/mongoAccess.cpp",
"fap/mongodb/mongoConverter.cpp",
"fap/mongodb/mongoSession.cpp",
- "fap/mongodb/commands.cpp",
"fap/mongodb/msgBuffer.cpp",
"fap/mongodb/mongodef.cpp",
"fap/mongodb/mongoReplyHelper.cpp"
]
-fapmongo = fapEnv.SharedLibrary( 'fapmongo', fapMongoFiles )
+rtnFiles = [
+ "rtn/rtnContextBuff.cpp",
+ ]
+
+pmdFiles = [
+ "pmd/pmdEnv.cpp",
+ "pmd/pmdEDU.cpp",
+ "pmd/pmdSessionBase.cpp",
+ ]
+
+pdFiles = [
+ "pd/pd.cpp",
+ "pd/pdTrace.cpp",
+ ]
+
+utilFiles = [
+ "util/utilCommon.cpp",
+ ]
+
+monFiles = [
+ "mon/monCB.cpp",
+ ]
+
+bsonFiles = [
+ "bson/bsonobj.cpp",
+ "bson/oid.cpp",
+ "bson/base64.cpp",
+ "bson/nonce.cpp",
+ "bson/md5.c",
+ "util/utilBsongen.cpp"
+ ]
+
+#fapmongo = fapEnv.SharedLibrary( 'fapmongo', [ bsonFiles, pdFiles, utilFiles, rtnFiles, pmdFiles, monFiles, fapMongoFiles ] )
+#fapmongo = fapEnv.SharedLibrary( 'fapmongo', [ bsonFiles, fapMongoFiles ] )
+fapmongo = fapEnv.SharedLibrary( 'fapmongo', [ pdFiles, fapMongoFiles ] )
+
fapEnv.Install( '#/bin/fap', fapmongo )
@@ -44,6 +44,9 @@ spt2Files = [
]
ossFiles = [
+ "oss/ossSSLCertificate.c",
+ "oss/ossSSLWrapper.c",
+ "oss/ossSSLContext.c",
"oss/oss.cpp",
"oss/ossErr.cpp",
"oss/ossUtil.cpp",
@@ -50,6 +50,9 @@ msgFiles = [
]
ossFiles = [
+ "oss/ossSSLCertificate.c",
+ "oss/ossSSLWrapper.c",
+ "oss/ossSSLContext.c",
"oss/ossErr.cpp",
"oss/oss.cpp",
"oss/ossUtil.cpp",
@@ -41,9 +41,11 @@ using namespace bson ;
namespace engine
{
- _authCB::_authCB():_needAuth( FALSE )
+ _authCB::_authCB()
+ :_needAuth( FALSE ),
+ _authEnabled( FALSE )
{
-
+ _authEnabled = pmdGetOptionCB()->authEnabled() ;
}
_authCB::~_authCB()
@@ -1809,7 +1809,7 @@ namespace engine
PD_LOG( PDEVENT, "Complete restore[%s]", backupName() ) ;
done:
- PMD_SHUTDOWN_DB( rc )
+ PMD_SHUTDOWN_DB( rc ) ;
return rc ;
error:
{
Oops, something went wrong.

0 comments on commit f99c361

Please sign in to comment.