FOSS/nethogs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Determine version based on git tag or pwd (fixes #92)

Browse Source
This commit is contained in:
Arnout Engelen
2016-07-12 08:15:24 +02:00
parent a1efe5b023
commit 9defe58674
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -1,6 +1,4 @@
export VERSION := 0 export VERSION := $(shell ./determineVersion.sh)
export SUBVERSION := 8
export MINORVERSION := 3-SNAPSHOT
#export PREFIX := /usr #export PREFIX := /usr
export PREFIX ?= /usr/local export PREFIX ?= /usr/local
@@ -9,9 +7,9 @@ all: nethogs decpcap_test test
$(MAKE) -C src -f MakeApp.mk $@ $(MAKE) -C src -f MakeApp.mk $@
$(MAKE) -C src -f MakeLib.mk $@ $(MAKE) -C src -f MakeLib.mk $@
.PHONY: .PHONY: tgz
tgz: clean tgz: clean
cd .. ; tar czvf nethogs-$(VERSION).$(SUBVERSION).$(MINORVERSION).tar.gz --exclude-vcs nethogs/* git archive --prefix="nethogs-$(VERSION)/" -o "../nethogs-$(VERSION).tar.gz" HEAD
check: check:
$(MAKE) -C src -f MakeApp.mk $@ $(MAKE) -C src -f MakeApp.mk $@

3
determineVersion.sh Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/bash
(git describe 2>/dev/null || pwd | sed -e "s/.*\\///" | sed -e "s/[^-]*//") | tail -c +2

8
src/MakeApp.mk
View File

@@ -11,8 +11,6 @@ OBJS=packet.o connection.o process.o decpcap.o cui.o inode2prog.o conninode.o de
NCURSES_LIBS?=-lncurses NCURSES_LIBS?=-lncurses
.PHONY: tgz
.PHONY: check uninstall .PHONY: check uninstall
check: check:
@echo "Not implemented" @echo "Not implemented"
@@ -29,9 +27,9 @@ uninstall:
rm $(DESTDIR)$(sbin)/nethogs || true rm $(DESTDIR)$(sbin)/nethogs || true
nethogs: main.cpp nethogs.cpp $(OBJS) nethogs: main.cpp nethogs.cpp $(OBJS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) main.cpp $(OBJS) -o nethogs -lpcap -lm ${NCURSES_LIBS} -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) main.cpp $(OBJS) -o nethogs -lpcap -lm ${NCURSES_LIBS} -DVERSION=\"$(VERSION)\"
nethogs_testsum: nethogs_testsum.cpp $(OBJS) nethogs_testsum: nethogs_testsum.cpp $(OBJS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm ${NCURSES_LIBS} -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm ${NCURSES_LIBS} -DVERSION=\"$(VERSION)\"
decpcap_test: decpcap_test.cpp decpcap.o decpcap_test: decpcap_test.cpp decpcap.o
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm
@@ -53,7 +51,7 @@ conninode.o: conninode.cpp nethogs.h conninode.h
#devices.o: devices.cpp devices.h #devices.o: devices.cpp devices.h
# $(CXX) $(CXXFLAGS) -c devices.cpp # $(CXX) $(CXXFLAGS) -c devices.cpp
cui.o: cui.cpp cui.h nethogs.h cui.o: cui.cpp cui.h nethogs.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c cui.cpp -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c cui.cpp -DVERSION=\"$(VERSION)\"
TESTS=conninode_test TESTS=conninode_test

7
src/MakeLib.mk
View File

@@ -1,5 +1,6 @@
LIBRARY=libnethogs.so LIBRARY=libnethogs.so
LIBNAME=$(LIBRARY).$(LIBVERSION).$(LIBSUBVERSION).$(LIBMINORVERSION) LIBVERSION=$(VERSION)
LIBNAME=$(LIBRARY).$(LIBVERSION)
SO_NAME=$(LIBRARY).$(LIBVERSION) SO_NAME=$(LIBRARY).$(LIBVERSION)
libdir := $(PREFIX)/lib libdir := $(PREFIX)/lib
@@ -38,8 +39,6 @@ OBJS=$(addprefix $(ODIR)/,$(OBJ_NAMES))
#$(info $(OBJS)) #$(info $(OBJS))
.PHONY: tgz
.PHONY: uninstall .PHONY: uninstall
install: $(LIBNAME) install: $(LIBNAME)
@@ -102,7 +101,7 @@ $(ODIR)/devices.o: devices.cpp devices.h
$(ODIR)/libnethogs.o: libnethogs.cpp libnethogs.h $(ODIR)/libnethogs.o: libnethogs.cpp libnethogs.h
@mkdir -p $(ODIR) @mkdir -p $(ODIR)
$(CXX) $(CXXFLAGS) -o $@ -c libnethogs.cpp -DVERSION=\"$(LIBVERSION)\" -DSUBVERSION=\"$(LIBSUBVERSION)\" -DMINORVERSION=\"$(LIBMINORVERSION)\" $(CXX) $(CXXFLAGS) -o $@ -c libnethogs.cpp -DVERSION=\"$(LIBVERSION)\"
.PHONY: clean .PHONY: clean
clean: clean:

2
src/nethogs.cpp
View File

@@ -61,7 +61,7 @@ bool bughuntmode = false;
bool sortRecv = true; bool sortRecv = true;
// viewMode: kb/s or total // viewMode: kb/s or total
int viewMode = VIEWMODE_KBPS; int viewMode = VIEWMODE_KBPS;
const char version[] = " version " VERSION "." SUBVERSION "." MINORVERSION; const char version[] = " version " VERSION;
timeval curtime; timeval curtime;