Commit c899a4cb authored by Elisa Londero's avatar Elisa Londero
Browse files

derives version string from git tags

parent 3240fb04

Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ EXEC_NAME=fitsImporter-srv 
INST_NAME=test

INST_NAME=test

DEBUG_LEV=-v1

DEBUG_LEV=-v1

INSTALL_DIR=/usr/local/bin

INSTALL_DIR=/usr/local/bin

VERSION := `git describe --tags`

VERSION := "$(shell git describe --tags)"

TAR_NAME := `basename $(PWD)`

TAR_NAME := `basename $(PWD)`

#================================================================================

#================================================================================

INC_DIR=/usr/local/omniORB/include \

INC_DIR=/usr/local/omniORB/include \
@@ -31,7 +31,7 @@ LIB_DIR=/usr/local/omniORB/lib \ 
CC=g++

CC=g++

CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG

CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG

CXX_RELEASE_FLAGS=-O3

CXX_RELEASE_FLAGS=-O3

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x -DHAVE_BOOST

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x -DHAVE_BOOST -DVERSIONSTR=\"$(VERSION)\"

LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \

LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \

	-lsoci_core -lsoci_mysql -lcfitsio -lCCfits -lboost_thread -lboost_filesystem \

	-lsoci_core -lsoci_mysql -lcfitsio -lCCfits -lboost_thread -lboost_filesystem \

	-lboost_system -lboost_iostreams -lboost_date_time -lboost_regex -lssl -lcrypto \

	-lboost_system -lboost_iostreams -lboost_date_time -lboost_regex -lssl -lcrypto \

src/main.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ int main(int argc,char *argv[]) 
{

{

	if (std::string(argv[1]).compare("--version") == 0)

	if (std::string(argv[1]).compare("--version") == 0)

	{

	{

		cout << version << endl;

		cout << VERSIONSTR << endl;

		return(0);

		return(0);

	}

	}

	else if ((argc ==3) && (std::string(argv[1]).compare("--dataunitsum") == 0))

	else if ((argc ==3) && (std::string(argv[1]).compare("--dataunitsum") == 0))