summaryrefslogtreecommitdiff
path: root/branding/templates/makefile
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2019-08-28 01:47:08 +0200
committerKali Kaneko (leap communications) <kali@leap.se>2019-08-28 19:23:30 +0200
commit32058fa0d48d58f3ab07745f6c252ee06204ab17 (patch)
treea5d2b564c8ab44f7e03c2ab83c997921e3adc6ec /branding/templates/makefile
parent4bcd4ab264d784364e918b65fd1cc15ffb12680c (diff)
[pkg] move artifacts to deploy folder
Diffstat (limited to 'branding/templates/makefile')
-rwxr-xr-xbranding/templates/makefile/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/branding/templates/makefile/Makefile b/branding/templates/makefile/Makefile
index 0a611a2..1ea4e69 100755
--- a/branding/templates/makefile/Makefile
+++ b/branding/templates/makefile/Makefile
@@ -39,6 +39,7 @@ pkg_win: staging/nssm.exe staging/openvpn/openvpn.exe
cp ../bin/windows/bitmask-vpn staging/bitmask-vpn.exe
cp ../bin/windows/bitmask-helper staging/bitmask_helper.exe
makensis windows/$(APPNAME)-installer.nsi
+ mv dist/$(APPNAME)-$(VERSION).exe ../../deploy/
endif
sign_win:
@@ -71,8 +72,9 @@ else
cd dist && find $(APPNAME).app | cpio -o --format odc --owner 0:80 | gzip -c > $(APPNAME)/Payload
cd osx/scripts && find . | cpio -o --format odc --owner 0:80 | gzip -c > ../../dist/$(APPNAME)/Scripts
- xar --compression none -cf dist/RiseupVPN-$(VERSION)_unsigned.pkg dist/$(APPNAME)/
+ xar --compression none -cf dist/$(APPNAME)-$(VERSION)_unsigned.pkg dist/$(APPNAME)/
endif
+ mv dist/$(APPNAME)-$(VERSION)_unsigned.pkg ../../deploy/
# -----------------------------------------------------------------------------
# Linux
@@ -101,7 +103,7 @@ pkg_deb:
@cd build && tar xzf $(BINNAME)_${DEB_VERSION}.orig.tar.gz && mv bitmask-vpn_${VERSION}-src ${BINNAME}_${DEB_VERSION}
@cp -r debian/ build/$(BINNAME)_$(DEB_VERSION)/
@cd build/$(BINNAME)_$(DEB_VERSION) && debuild -us -uc
- @cp build/*.deb ../../deploy
+ @mv build/*.deb ../../deploy
# -----------------------------------------------------------------------------
# Utils