Version number is now in 1 place

nowsecure · Feb 14, 2019 · bf859e1 · bf859e1
1 parent d9e24b7
commit bf859e1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -3,17 +3,22 @@ ARCHS=armv7 arm64
 CFLAGS+=-I.
 CFLAGS+=-Wall
 
+include config.mk
+CFLAGS+=-DFSMON_VERSION=\"$(VERSION)\"
+
 SOURCES=main.c util.c
 SOURCES+=backend/*.c
 
 ifeq ($(shell uname),Linux)
+
 # LINUX: GNU / ANDROID
 #     __
 #  -=(o '.
 #     \.-.\
 #     /|  \\
 #     '|  ||
 #      _\_):,_
+
 FANOTIFY_CFLAGS+=-DHAVE_FANOTIFY=1
 FANOTIFY_CFLAGS+=-DHAVE_SYS_FANOTIFY=1
 

diff --git a/config.mk b/config.mk
@@ -0,0 +1 @@
+VERSION=1.6.1
diff --git a/cydia/CONFIG b/cydia/CONFIG
@@ -1,5 +1,5 @@
 PACKAGE=fsmon
-VERSION=1.6
+include ../config.mk
 ARCH=iphoneos-arm
 SECTION=user/shell
 PRIORITY=optional

diff --git a/fsmon.h b/fsmon.h
@@ -1,7 +1,9 @@
 #ifndef INCLUDE_FM_FSMON_H
 #define INCLUDE_FM_FSMON_H
 
-#define FSMON_VERSION "1.6"
+#ifndef FSMON_VERSION
+#error FSMON_VERSION is not defined
+#endif
 
 #include <stdint.h>
 #include <signal.h>

diff --git a/pkg.sh b/pkg.sh
@@ -9,9 +9,8 @@
 DESTDIR=/tmp/fsmon_pkg
 PREFIX=/usr/local
 PKGDIR="$(pwd)/fsmon.unpkg"
-[ -z "${VERSION}" ] && VERSION=1.6
 [ -z "${MAKE}" ] && MAKE=make
-VERSION=1.6
+. config.mk # VERSION
 
 rm -rf "${DESTDIR}"
 ${MAKE} clean