Cleanup

[rbdr/blog] / Makefile

diff --git a/Makefile b/Makefile
index 5522ece3077f95e8b4e0a26f814ec40fa0bdb380..9ba4d974ee15b735c0bd647942bc8675db585c0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ prepare:
 build: prepare
        cargo build --profile $(profile) --target $(target)
 
 build: prepare
        cargo build --profile $(profile) --target $(target)
 

-release: rpm tar
+release: rpm tar deb

        @$(eval filename := $(app_name)-$(target)-$(channel))
 
 $(architectures):
        @$(eval filename := $(app_name)-$(target)-$(channel))
 
 $(architectures):


@@ -24,16 +24,28 @@ else
        $(MAKE) -e target=$@ build
 endif
 
        $(MAKE) -e target=$@ build
 endif
 

+deb: build
+       @$(eval filename := $(app_name)-$(target)-$(channel))
+       cargo deb --profile $(profile) --target $(target)
+       mv target/$(target)/debian/*.deb $(filename).deb
+       sha256sum $(filename).deb > $(filename).deb.sha256
+       rsync -avz $(filename).deb deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+       rsync -avz $(filename).deb.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+

 rpm: build
 rpm: build

-       cargo generate-rpm --profile $(profile) --target $(target) -s'release = "$(channel)"'
-       rsync -avz target/$(target)/generate-rpm/*.rpm deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+       @$(eval filename := $(app_name)-$(target)-$(channel))
+       cargo generate-rpm --profile $(profile) --target $(target)
+       mv target/$(target)/generate-rpm/*.rpm $(filename).rpm
+       sha256sum $(filename).rpm > $(filename).rpm.sha256
+       rsync -avz $(filename).rpm deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+       rsync -avz $(filename).rpm.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)

 
 tar: build
        @$(eval filename := $(app_name)-$(target)-$(channel))
        tar -czvf $(filename).tar.gz -C target/$(target)/$(profile)/ $(app_name)
 
 tar: build
        @$(eval filename := $(app_name)-$(target)-$(channel))
        tar -czvf $(filename).tar.gz -C target/$(target)/$(profile)/ $(app_name)

-       sha256sum $(filename).tar.gz > $(filename).sha256
+       sha256sum $(filename).tar.gz > $(filename).tar.gz.sha256

        rsync -avz $(filename).tar.gz deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
        rsync -avz $(filename).tar.gz deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)

-       rsync -avz $(filename).sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+       rsync -avz $(filename).tar.gz.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)

 
 package: $(architectures)
 
 
 package: $(architectures)