Commit 09adedd7 authored by Seblu's avatar Seblu
Browse files

Use software version from configure.ac

parent 5dbc534f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ from archversion.controller import VersionController
from archversion.database import JsonDatabase
from archversion.error import BaseError, MissingConfigFile
from archversion.error import ERR_FATAL, ERR_ABORT, ERR_UNKNOWN
from archversion import VERSION, DEFAULT_CONFIG_FILENAME, DEFAULT_CACHE_FILENAME
from archversion import DEFAULT_CONFIG_FILENAME, DEFAULT_CACHE_FILENAME
from collections import OrderedDict
import argparse
import logging
@@ -34,7 +34,7 @@ def parse_argv():
    '''Parse command line arguments'''
    p_main = argparse.ArgumentParser()
    p_main.add_argument("--version", action="version",
                        version="%(prog)s version " + VERSION)
                        version="%(prog)s v@VERSION@")
    p_main.add_argument("--debug", action="store_true",
                        help="debug mode")
    p_main.add_argument("-c", "--config", default=None,
+9 −0
Original line number Diff line number Diff line
bin_SCRIPTS=__init__.py
CLEANFILES = $(bin_SCRIPTS)
EXTRA_DIST = __init__.py.in

archversion_PYTHON =  __init__.py config.py controller.py database.py error.py

do_substitution = sed -e 's,[@]pythondir[@],$(pythondir),g' \
	-e 's,[@]PACKAGE[@],$(PACKAGE),g' \
	-e 's,[@]VERSION[@],$(VERSION),g'

__init__.py: __init__.py.in
	$(do_substitution) < $(srcdir)/$< > $@

archversiondir = $(pythondir)/archversion
+1 −4
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ import logging
# Init log systems
logging.basicConfig(format="%(levelname)s: %(message)s")

# Annouced version
VERSION = "0"

# Stored list of packagas we want to track
DEFAULT_CONFIG_FILENAME = "archversion.conf"

@@ -34,4 +31,4 @@ DEFAULT_CONFIG_FILENAME = "archversion.conf"
DEFAULT_CACHE_FILENAME = "archversion.cache"

# user agent using with http request
USER_AGENT = "archversion v%s" % VERSION
USER_AGENT = "archversion v@VERSION@"