Commit b2b07495 authored by Antoine Millet's avatar Antoine Millet
Browse files

New centralised versionning.

parent b2a6a09e
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ import ConfigParser
import signal
from optparse import OptionParser
from ccserver.ccserver import CCServer
from ccserver import __version__

import os
try:
    import daemon
@@ -15,7 +17,6 @@ try:
except ImportError:
    DAEMONIZE = False

__VERSION__ = 5

DEFAULT_CONFIG_FILE = '/etc/cc-server.conf'
DEFAULT_PID_FILE = '/var/run/cc-server.pid'
@@ -75,7 +76,7 @@ def run_server(options):

if __name__ == '__main__':

    op = OptionParser(version='%%prog %s' % __VERSION__)
    op = OptionParser(version='%%prog v%s' % __version__)
    op.add_option('-c', '--config', default=DEFAULT_CONFIG_FILE,
                  help='configuration file (default: %default)')
    op.add_option('-d', '--daemonize', default=False, action='store_true',
+2 −0
Original line number Diff line number Diff line
@@ -4,3 +4,5 @@
'''
CloudControl server libraries.
'''

__version__ = 6
+3 −2
Original line number Diff line number Diff line
@@ -45,9 +45,10 @@ copyright = u'2010, Smartjog'
# built documents.
#
# The short X.Y version.
version = '3'
from ccserver import __version__
version = __version__
# The full version, including alpha/beta/rc tags.
release = '3'
release = version

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.