Display and control your Android device
Unify release makefile
Romain Vimont230afd8966d3
diff --git a/Makefile.CrossWindows b/release.makesimilarity index 82%rename from Makefile.CrossWindowsrename to release.makeindex 8c093a2f..873762b4 100644--- a/Makefile.CrossWindows+++ b/release.make@@ -9,15 +9,17 @@# the server to the device..PHONY: default clean \+ test \build-server \prepare-deps-win32 prepare-deps-win64 \build-win32 build-win64 \dist-win32 dist-win64 \zip-win32 zip-win64 \- sums release+ releaseGRADLE ?= ./gradlew+TEST_BUILD_DIR := build-testSERVER_BUILD_DIR := build-serverWIN32_BUILD_DIR := build-win32WIN64_BUILD_DIR := build-win64@@ -30,19 +32,35 @@ VERSION := $(shell git describe --tags --always)WIN32_TARGET := $(WIN32_TARGET_DIR)-$(VERSION).zipWIN64_TARGET := $(WIN64_TARGET_DIR)-$(VERSION).zip-release: clean zip-win32 zip-win64 sums- @echo "Windows archives generated in $(DIST)/"+RELEASE_DIR := release-$(VERSION)++release: clean test build-server zip-win32 zip-win64+ mkdir -p "$(RELEASE_DIR)"+ cp "$(SERVER_BUILD_DIR)/server/scrcpy-server" \+ "$(RELEASE_DIR)/scrcpy-server-$(VERSION)"+ cp "$(DIST)/$(WIN32_TARGET)" "$(RELEASE_DIR)"+ cp "$(DIST)/$(WIN64_TARGET)" "$(RELEASE_DIR)"+ cd "$(RELEASE_DIR)" && \+ sha256sum "scrcpy-server-$(VERSION)" \+ "scrcpy-win32-$(VERSION).zip" \+ "scrcpy-win64-$(VERSION).zip" > SHA256SUMS.txt+ @echo "Release generated in $(RELEASE_DIR)/"clean:$(GRADLE) clean- rm -rf "$(SERVER_BUILD_DIR)" "$(WIN32_BUILD_DIR)" "$(WIN64_BUILD_DIR)" \- "$(DIST)"+ rm -rf "$(DIST)" "$(TEST_BUILD_DIR)" "$(SERVER_BUILD_DIR)" \+ "$(WIN32_BUILD_DIR)" "$(WIN64_BUILD_DIR)"++test:+ [ -d "$(TEST_BUILD_DIR)" ] || ( mkdir "$(TEST_BUILD_DIR)" && \+ meson "$(TEST_BUILD_DIR)" -Db_sanitize=address )+ ninja -C "$(TEST_BUILD_DIR)"+ $(GRADLE) -p server checkbuild-server:[ -d "$(SERVER_BUILD_DIR)" ] || ( mkdir "$(SERVER_BUILD_DIR)" && \- meson "$(SERVER_BUILD_DIR)" \- --buildtype release -Dcompile_app=false )- ninja -C "$(SERVER_BUILD_DIR)"+ meson "$(SERVER_BUILD_DIR)" --buildtype release -Dcompile_app=false )+ ninja -C "$(SERVER_BUILD_DIR)"prepare-deps-win32:-$(MAKE) -C prebuilt-deps prepare-win32@@ -109,7 +127,3 @@ zip-win32: dist-win32zip-win64: dist-win64cd "$(DIST)/$(WIN64_TARGET_DIR)"; \zip -r "../$(WIN64_TARGET)" .--sums:- cd "$(DIST)"; \- sha256sum *.zip > SHA256SUMS.txtdiff --git a/release.sh b/release.shindex 4c5afbf1..a824e958 100755--- a/release.sh+++ b/release.sh@@ -1,44 +1,2 @@#!/bin/bash-set -e--# test locally-TESTDIR=build_test-rm -rf "$TESTDIR"-# run client tests with ASAN enabled-meson "$TESTDIR" -Db_sanitize=address-ninja -C"$TESTDIR" test--# test server-GRADLE=${GRADLE:-./gradlew}-$GRADLE -p server check--BUILDDIR=build_release-rm -rf "$BUILDDIR"-meson "$BUILDDIR" --buildtype release --strip -Db_lto=true-cd "$BUILDDIR"-ninja-cd ---# build Windows releases-make -f Makefile.CrossWindows--# the generated server must be the same everywhere-cmp "$BUILDDIR/server/scrcpy-server" dist/scrcpy-win32/scrcpy-server-cmp "$BUILDDIR/server/scrcpy-server" dist/scrcpy-win64/scrcpy-server--# get version name-TAG=$(git describe --tags --always)--# create release directory-mkdir -p "release-$TAG"-cp "$BUILDDIR/server/scrcpy-server" "release-$TAG/scrcpy-server-$TAG"-cp "dist/scrcpy-win32-$TAG.zip" "release-$TAG/"-cp "dist/scrcpy-win64-$TAG.zip" "release-$TAG/"--# generate checksums-cd "release-$TAG"-sha256sum "scrcpy-server-$TAG" \- "scrcpy-win32-$TAG.zip" \- "scrcpy-win64-$TAG.zip" > SHA256SUMS.txt--echo "Release generated in release-$TAG/"+make -f release.make