kopia lustrzana https://github.com/weetmuts/wmbusmeters
Added automatic extraction of version from git.
rodzic
01642e931f
commit
545654772b
33
Makefile
33
Makefile
|
@ -20,7 +20,29 @@
|
||||||
# make DEBUG=true
|
# make DEBUG=true
|
||||||
# make DEBUG=true HOST=arm
|
# make DEBUG=true HOST=arm
|
||||||
|
|
||||||
VERSION=0.9.4
|
COMMIT_HASH:=$(shell git log --pretty=format:'%H' -n 1)
|
||||||
|
TAG:=$(shell git describe --tags)
|
||||||
|
CHANGES:=$(shell git status -s | grep -v '?? ')
|
||||||
|
TAG_COMMIT_HASH:=$(shell git show-ref --tags | grep $(TAG) | cut -f 1 -d ' ')
|
||||||
|
|
||||||
|
ifeq ($(COMMIT),$(TAG_COMMIT))
|
||||||
|
# Exactly on the tagged commit. The version is the tag!
|
||||||
|
VERSION:=$(TAG)
|
||||||
|
DEBVERSION:=$(TAG)
|
||||||
|
else
|
||||||
|
VERSION:=$(TAG)++
|
||||||
|
DEBVERSION:=$(TAG)++
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq ($(strip $(CHANGES)),)
|
||||||
|
# There are changes, signify that with a +changes
|
||||||
|
VERSION:=$(VERSION) with local changes
|
||||||
|
DEBVERSION:=$(DEBVERSION)l
|
||||||
|
endif
|
||||||
|
|
||||||
|
VERSION:=$(VERSION) $(COMMIT_HASH)
|
||||||
|
|
||||||
|
$(info Building $(VERSION))
|
||||||
|
|
||||||
ifeq "$(HOST)" "arm"
|
ifeq "$(HOST)" "arm"
|
||||||
CXX=arm-linux-gnueabihf-g++
|
CXX=arm-linux-gnueabihf-g++
|
||||||
|
@ -83,7 +105,7 @@ all: $(BUILD)/wmbusmeters $(BUILD)/testinternals
|
||||||
@$(STRIP_BINARY)
|
@$(STRIP_BINARY)
|
||||||
@cp $(BUILD)/wmbusmeters $(BUILD)/wmbusmetersd
|
@cp $(BUILD)/wmbusmeters $(BUILD)/wmbusmetersd
|
||||||
|
|
||||||
dist: wmbusmeters_$(VERSION)_$(DEBARCH).deb
|
dist: wmbusmeters_$(DEBVERSION)_$(DEBARCH).deb
|
||||||
|
|
||||||
install: $(BUILD)/wmbusmeters
|
install: $(BUILD)/wmbusmeters
|
||||||
@./install.sh $(BUILD)/wmbusmeters /
|
@./install.sh $(BUILD)/wmbusmeters /
|
||||||
|
@ -91,19 +113,20 @@ install: $(BUILD)/wmbusmeters
|
||||||
uninstall:
|
uninstall:
|
||||||
@./uninstall.sh /
|
@./uninstall.sh /
|
||||||
|
|
||||||
wmbusmeters_$(VERSION)_$(DEBARCH).deb:
|
wmbusmeters_$(DEBVERSION)_$(DEBARCH).deb:
|
||||||
@rm -rf $(BUILD)/debian/wmbusmeters
|
@rm -rf $(BUILD)/debian/wmbusmeters
|
||||||
@mkdir -p $(BUILD)/debian/wmbusmeters/DEBIAN
|
@mkdir -p $(BUILD)/debian/wmbusmeters/DEBIAN
|
||||||
@./install.sh --no-adduser $(BUILD)/wmbusmeters $(BUILD)/debian/wmbusmeters
|
@./install.sh --no-adduser $(BUILD)/wmbusmeters $(BUILD)/debian/wmbusmeters
|
||||||
@rm -f $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
@rm -f $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
||||||
@echo "Package: wmbusmeters" >> $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
@echo "Package: wmbusmeters" >> $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
||||||
@echo "Version: $(VERSION)" >> $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
@echo "Version: $(DEBVERSION)" >> $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
||||||
@echo "Maintainer: Fredrik Öhrström" >> $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
@echo "Maintainer: Fredrik Öhrström" >> $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
||||||
@echo "Architecture: $(DEBARCH)" >> $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
@echo "Architecture: $(DEBARCH)" >> $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
||||||
@echo "Description: A tool to read wireless mbus telegrams from utility meters." >> $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
@echo "Description: A tool to read wireless mbus telegrams from utility meters." >> $(BUILD)/debian/wmbusmeters/DEBIAN/control
|
||||||
@(cd $(BUILD)/debian; dpkg-deb --build wmbusmeters .)
|
@(cd $(BUILD)/debian; dpkg-deb --build wmbusmeters .)
|
||||||
@mv $(BUILD)/debian/wmbusmeters_$(VERSION)_$(DEBARCH).deb .
|
@mv $(BUILD)/debian/wmbusmeters_$(DEBVERSION)_$(DEBARCH).deb .
|
||||||
@echo Built package $@
|
@echo Built package $@
|
||||||
|
@echo But the deb package is not yet working correctly! Work in progress.
|
||||||
|
|
||||||
$(BUILD)/wmbusmeters: $(METER_OBJS) $(BUILD)/main.o
|
$(BUILD)/wmbusmeters: $(METER_OBJS) $(BUILD)/main.o
|
||||||
$(CXX) -o $(BUILD)/wmbusmeters $(METER_OBJS) $(BUILD)/main.o $(DEBUG_LDFLAGS) -lpthread
|
$(CXX) -o $(BUILD)/wmbusmeters $(METER_OBJS) $(BUILD)/main.o $(DEBUG_LDFLAGS) -lpthread
|
||||||
|
|
|
@ -99,7 +99,7 @@ then
|
||||||
# Create /var/run
|
# Create /var/run
|
||||||
mkdir -p $ROOT/var/log/wmbusmeters/meter_readings
|
mkdir -p $ROOT/var/log/wmbusmeters/meter_readings
|
||||||
chown -R wmbusmeters:wmbusmeters $ROOT/var/log/wmbusmeters
|
chown -R wmbusmeters:wmbusmeters $ROOT/var/log/wmbusmeters
|
||||||
echo log: created /var/log/wmbusmeters/meter_readings
|
echo log: created $ROOT/var/log/wmbusmeters/meter_readings
|
||||||
fi
|
fi
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
|
@ -121,7 +121,7 @@ then
|
||||||
start-stop-daemon -K -p /var/run/wmbusmeters.pid -s HUP -x /usr/sbin/wmbusmeters -q
|
start-stop-daemon -K -p /var/run/wmbusmeters.pid -s HUP -x /usr/sbin/wmbusmeters -q
|
||||||
endscript
|
endscript
|
||||||
EOF
|
EOF
|
||||||
echo logrotate: created /etc/logrotate.d/wmbusmeters
|
echo logrotate: created $ROOT/etc/logrotate.d/wmbusmeters
|
||||||
fi
|
fi
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
|
|
Ładowanie…
Reference in New Issue