Fix generation of revisions.txt in makefile
authorEdouard Tisserant <edouard.tisserant@gmail.com>
Sat, 13 Aug 2022 16:30:38 +0200
changeset 87 3682a91e7bb2
parent 86 3564991cd359
child 88 58cff3acaf3d
Fix generation of revisions.txt in makefile
Makefile
snap.mk
--- a/Makefile	Sat Aug 13 15:51:59 2022 +0200
+++ b/Makefile	Sat Aug 13 16:30:38 2022 +0200
@@ -86,7 +86,7 @@
 all_sources: own_sources sources/open62541_src
 	touch $@
 
-sources/open62541_src:
+sources/open62541_src: | sources
 	rm -rf sources/open62541
 	$(call get_src_http,https://github.com/open62541/open62541/archive/refs/tags,v1.3.2.tar.gz)\
 	tar -xzf $$dld
@@ -100,7 +100,7 @@
 revisions.txt: $(src)/revisions.txt own_sources
 	echo "Generate revisions.txt"
 	echo "\n******* PACKAGE REVISIONS ********\n" > revisions.txt
-	(echo -n "beremiz_dist revision is: "; hg -R $(src) id;) >> revisions.txt
+	(echo -n "beremiz_public_dist revision is: "; hg -R $(src) id;) >> revisions.txt
 	($(foreach project,$(OWN_PROJECTS),$(call show_revision_details,$(project)))) >> revisions.txt
 	bash -c 'hg -R $(src) st | ( if read ; then echo -e "\n******* beremiz_public_dist IS MODIFIED ********\n" ; hg -R $(src) st ; fi ) >> revisions.txt'
 
--- a/snap.mk	Sat Aug 13 15:51:59 2022 +0200
+++ b/snap.mk	Sat Aug 13 16:30:38 2022 +0200
@@ -6,6 +6,7 @@
 
 Snap: snap_built
 snap_built: all_sources revisions.txt
-	tar -C $(src) $(tar_opts) -c snap revisions.txt | tar -C sources -x
+	tar -C $(src) $(tar_opts) -c snap | tar -C sources -x
+	cp revisions.txt sources
 	cd sources;  snapcraft --debug 
 	touch $@