Merge branch 'master' into dev

Makefile.CrossWindows

@@ -34,7 +34,7 @@ WIN32_TARGET := $(WIN32_TARGET_DIR)-$(VERSION).zip
 WIN64_TARGET := $(WIN64_TARGET_DIR)-$(VERSION).zip
 
 release: clean zip-win32 zip-win64 sums
-	@echo "Release created in $(DIST)/."
+	@echo "Windows archives generated in $(DIST)/"
 
 clean:
 	$(GRADLE) clean

app/tests/test_control_event_serialize.c

@@ -87,13 +87,13 @@ static void test_serialize_mouse_event(void) {
 
     unsigned char buf[SERIALIZED_EVENT_MAX_SIZE];
     int size = control_event_serialize(&event, buf);
-    assert(size == 14);
+    assert(size == 18);
 
     const unsigned char expected[] = {
         0x02, // CONTROL_EVENT_TYPE_MOUSE
         0x00, // AKEY_EVENT_ACTION_DOWN
         0x00, 0x00, 0x00, 0x01, // AMOTION_EVENT_BUTTON_PRIMARY
-        0x01, 0x04, 0x04, 0x02, // 260 1026
+        0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x04, 0x02, // 260 1026
         0x04, 0x38, 0x07, 0x80, // 1080 1920
     };
     assert(!memcmp(buf, expected, sizeof(expected)));
@@ -120,11 +120,11 @@ static void test_serialize_scroll_event(void) {
 
     unsigned char buf[SERIALIZED_EVENT_MAX_SIZE];
     int size = control_event_serialize(&event, buf);
-    assert(size == 17);
+    assert(size == 21);
 
     const unsigned char expected[] = {
         0x03, // CONTROL_EVENT_TYPE_SCROLL
-        0x01, 0x04, 0x04, 0x02, // 260 1026
+        0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x04, 0x02, // 260 1026
         0x04, 0x38, 0x07, 0x80, // 1080 1920
         0x00, 0x00, 0x00, 0x01, // 1
         0xFF, 0xFF, 0xFF, 0xFF, // -1

release.sh

+#!/bin/bash
+set -e
+
+# build and test locally
+BUILDDIR=build_release
+rm -rf "$BUILDDIR"
+meson "$BUILDDIR" --buildtype release --strip -Db_lto=true
+cd "$BUILDDIR"
+ninja
+ninja test
+cd -
+
+# build Windows releases
+make -f Makefile.CrossWindows
+
+# the generated server must be the same everywhere
+cmp "$BUILDDIR/server/scrcpy-server.jar" dist/scrcpy-win32/scrcpy-server.jar
+cmp "$BUILDDIR/server/scrcpy-server.jar" dist/scrcpy-win64/scrcpy-server.jar
+
+# get version name
+TAG=$(git describe --tags --always)
+
+# create release directory
+mkdir -p "release-$TAG"
+cp "$BUILDDIR/server/scrcpy-server.jar" "release-$TAG/scrcpy-server-$TAG.jar"
+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.jar" \
+          "scrcpy-win32-$TAG.zip" \
+          "scrcpy-win64-$TAG.zip" > SHA256SUMS.txt
+
+echo "Release generated in release-$TAG/"