shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-26 06:50:09 +03:00
Code Releases Wiki Activity

M #-: add enterprise label to version option

Browse Source 
co-authored-by: Alejandro Huertas <ahuertas@opennebula.io>
This commit is contained in:
Ruben S. Montero 2020-06-05 13:59:16 +02:00
parent 3310418230
commit 9076c5bdfe
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
4 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/monitor/SConstruct
View File

@ -33,6 +33,9 @@ env.Append(LIBPATH=[
cwd+'/src/monitor'
])
if env['enterprise']=='yes':
env.Append(CPPDEFINES=['ENTERPRISE'])
################################################################################
# SCONS scripts to build
################################################################################

22
src/monitor/src/monitor/onemonitord.cc
View File

@ -24,10 +24,24 @@ using namespace std;
static void print_license()
{
cout<< "Copyright 2002-2020, OpenNebula Project, OpenNebula Systems \n\n"
<< Nebula::version() << " is distributed and licensed for use under the"
<< " terms of the\nApache License, Version 2.0 "
<< "(http://www.apache.org/licenses/LICENSE-2.0).\n";
ostringstream oss;
oss << Nebula::version();
#ifdef ENTERPRISE
oss << " Enterprise Edition \n";
#else
oss << "\n";
#endif
oss << "Copyright 2002-2020, OpenNebula Project, OpenNebula Systems \n\n"
<< "Licensed under the Apache License, Version 2.0 "
<< "(the \"License\"); you may \nnot use this file "
<< "except in compliance with the License. You may obtain\n"
<< "a copy of the License at "
<< "http://www.apache.org/licenses/LICENSE-2.0\n";
cout << oss.str();
}
static void print_usage(ostream& str)

3
src/nebula/SConstruct
View File

@ -85,4 +85,7 @@ if not env.GetOption('clean'):
env.ParseConfig("%s ../../share/scons/get_xmlrpc_config server" % (
env_xmlrpc_flags,))
if env['enterprise']=='yes':
env.Append(CPPDEFINES=['ENTERPRISE'])
env.Program('oned.cc')

22
src/nebula/oned.cc
View File

@ -31,10 +31,24 @@ using namespace std;
static void print_license()
{
cout<< "Copyright 2002-2020, OpenNebula Project, OpenNebula Systems \n\n"
<< Nebula::version() << " is distributed and licensed for use under the"
<< " terms of the\nApache License, Version 2.0 "
<< "(http://www.apache.org/licenses/LICENSE-2.0).\n";
ostringstream oss;
oss << Nebula::version();
#ifdef ENTERPRISE
oss << " Enterprise Edition \n";
#else
oss << "\n";
#endif
oss << "Copyright 2002-2020, OpenNebula Project, OpenNebula Systems \n\n"
<< "Licensed under the Apache License, Version 2.0 "
<< "(the \"License\"); you may \nnot use this file "
<< "except in compliance with the License. You may obtain\n"
<< "a copy of the License at "
<< "http://www.apache.org/licenses/LICENSE-2.0\n";
cout << oss.str();
}
static void print_usage(ostream& str)