Commit 84ed3951 authored by Seblu's avatar Seblu
Browse files

Use @VERSION@ only in archversion python package 

This will avoid to run make every time a fix is provided in archversion (dev only)
parent efc61ab8

src/bin/Makefile.am

+0 −15
Original line number Diff line number Diff line 
bin_SCRIPTS = archversion

CLEANFILES = $(bin_SCRIPTS)

EXTRA_DIST = archversion.in



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

	-e 's,[@]PACKAGE[@],$(PACKAGE),g' \

	-e 's,[@]VERSION[@],$(VERSION),g'



archversion: archversion.in

	$(do_substitution) < $(srcdir)/archversion.in > $@

	chmod +x $@



install-exec-hook:

	ln -s archversion $(DESTDIR)$(bindir)/avc
 


#.py: .in

#	$(do_substitution) $<  > $@

#

#archversion_PYTHON = archversion.py

#archversiondir = $(pythondir)/archversion

src/bin/archversion.in→src/bin/archversion

100644 → 100755
+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 DEFAULT_CONFIG_FILENAME, DEFAULT_CACHE_FILENAME

from archversion import VERSION, 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 v@VERSION@")

                        version="%(prog)s version %s" + VERSION)

    p_main.add_argument("--debug", action="store_true",

                        help="debug mode")

    p_main.add_argument("-c", "--config", default=None,

src/lib/archversion/__init__.py.in

+4 −1
Original line number Diff line number Diff line
@@ -30,5 +30,8 @@ DEFAULT_CONFIG_FILENAME = "archversion.conf" 
# Cache is stored package versions

DEFAULT_CACHE_FILENAME = "archversion.cache"



# Annouced version (from autoconf)

VERSION = "@VERSION@"



# user agent using with http request

USER_AGENT = "archversion v@VERSION@"
 
USER_AGENT = "archversion v%s" % VERSION