SeanOMik
/
znc-push
mirror of https://github.com/SeanOMik/znc-push.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #179 from larsks/feature/version_h 

change handling of embedded version information
This commit is contained in:
John Reese 2015-09-28 19:05:09 -07:00
parent 4bb45ac3e7 4087133a5e
commit 878af545ac
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -1,4 +1,4 @@
version := $(shell git describe --dirty) version = $(shell git describe --dirty || echo dev)
curl=no curl=no
ifneq ($(curl),no) ifneq ($(curl),no)
@ -7,10 +7,11 @@ else
flags= flags=
endif endif
all: push.so
push.so: push.cpp push.so: push.cpp
sed -i "" -e "s|PUSHVERSION \".*\"|PUSHVERSION \"$(version)\"|" push.cpp CXXFLAGS="$(CXXFLAGS) -DPUSHVERSION=\"$(version)\" $(flags)" LIBS="$(LIBS) $(flags)" \
CXXFLAGS="$(CXXFLAGS) $(flags)" LIBS="$(LIBS) $(flags)" znc-buildmod push.cpp znc-buildmod push.cpp
sed -i "" -e "s|PUSHVERSION \".*\"|PUSHVERSION \"dev\"|" push.cpp
install: push.so install: push.so
mkdir -p $(HOME)/.znc/modules/ mkdir -p $(HOME)/.znc/modules/

2
push.cpp
View File

@ -9,7 +9,9 @@
*/ */
#define REQUIRESSL #define REQUIRESSL
#ifndef PUSHVERSION
#define PUSHVERSION "dev" #define PUSHVERSION "dev"
#endif
#include <znc/znc.h> #include <znc/znc.h>
#include <znc/Chan.h> #include <znc/Chan.h>