Merge pull request #1 from qtc-de/dev

Prepare v1.1.0 Release

.github/workflows/build.yml

@@ -1,9 +1,11 @@
 name: Build rpv-web
 
 on:
+  pull_request:
   push:
     branches:
       - main
+      - dev
     paths:
       - frontend/**
       - src/**
@@ -20,8 +22,6 @@ jobs:
 
       - name: Install V
         uses: vlang/[email protected]
-        with:
-          version: '0.4'
 
       - name: Install mingw
         run: |
@@ -47,8 +47,6 @@ jobs:
 
       - name: Install V
         uses: vlang/[email protected]
-        with:
-          version: '0.4'
 
       - name: Install mingw
         run: |

CHANGELOG.md

@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## v1.1.0 - Sep 22, 2023
+
+### Added
+
+* Add resource files to compiled executable (icon and file info)
+
+### Changed
+
+* Compile executables with `-prod`
+* Remove version pinning of *v* from CI
+
+
 ## v1.0.0 - Sep 08, 2023
 
 Initial Release :)

Makefile

@@ -1,17 +1,26 @@
-Options := -os windows -enable-globals
+RC := resources/rpv-web.rc
+RES := resources/rpv-web.res
+Options := -os windows -prod -enable-globals -cflags $(shell pwd)/${RES}
 DebugOptions := ${Options} -d debug
 
-rpv-web-x64 x64:
+rpv-web-x64 x64: ${RC}
+	x86_64-w64-mingw32-windres ${RC} -O coff -o ${RES}
 	v ${Options} . -o ${@}.exe
 
-rpv-web-x64-debug debug:
+rpv-web-x64-debug debug: ${RC}
+	x86_64-w64-mingw32-windres ${RC} -O coff -o ${RES}
 	v ${DebugOptions} . -o ${@}.exe
 
-rpv-web-x86 x86:
+rpv-web-x86 x86: ${RC}
+	i686-w64-mingw32-windres ${RC} -O coff -o ${RES}
 	v -m32 ${Options} . -o ${@}.exe
 
-rpv-web-x86-debug x86-debug:
+rpv-web-x86-debug x86-debug: ${RC}
+	i686-w64-mingw32-windres ${RC} -O coff -o ${RES}
 	v -m32 ${DebugOptions} . -o ${@}.exe
 
+resources/rpv-web.rc:
+	bash resources/adjust.sh > ${RC}
+
 clean:
-	rm -f *.exe
+	rm -f *.exe ${RC} ${RES}

README.md

@@ -4,9 +4,9 @@
 <br/>
 
 [![](https://github.com/qtc-de/rpv-web/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/qtc-de/rpv-web/actions/workflows/build.yml)
-[![](https://github.com/qtc-de/rpv-web/actions/workflows/build-dev.yml/badge.svg?branch=develop)](https://github.com/qtc-de/rpv-web/actions/workflows/build-dev.yml)
-[![](https://img.shields.io/badge/version-1.0.0-blue)](https://github.com/qtc-de/rpv-web/releases)
-[![](https://img.shields.io/badge/language-v-blue)](https://vlang.io/)
+[![](https://github.com/qtc-de/rpv-web/actions/workflows/build.yml/badge.svg?branch=dev)](https://github.com/qtc-de/rpv-web/actions/workflows/build.yml)
+[![](https://img.shields.io/badge/version-1.1.0-blue)](https://github.com/qtc-de/rpv-web/releases)
+[![](https://img.shields.io/badge/language-v%20%26%20vue-blue)](https://vlang.io/)
 [![](https://img.shields.io/badge/license-GPL%20v3.0-blue)](https://github.com/qtc-de/rpv-web/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Pages-fa6b05)](https://qtc-de.github.io/rpv-web/)
 [![](https://img.shields.io/badge/Wiki-5669fc)](https://github.com/qtc-de/rpv-web/wiki)
@@ -35,7 +35,7 @@ can run the following commands to build *rpv-web*:
 
 ```console
 [user@host ~]$ v install qtc_de.rpv
-[user@host ~]$ https://github.com/qtc-de/rpv-web
+[user@host ~]$ git clone https://github.com/qtc-de/rpv-web
 [user@host ~]$ cd rpv-web
 [user@host rpv-web]$ make
 ```

frontend/src/components/Headline.vue

@@ -374,7 +374,7 @@
             <p id="Logo" class="d-inline-block">RP</p>
             <img id="LogoPng" src="../assets/icons/rpv-web.png"/>
             <p id="Web" class="d-inline-block">WEB</p>
-            <p class="Fs-8 mb-0 ml-4">v1.0.0</p>
+            <p class="Fs-8 mb-0 ml-4">v1.1.0</p>
         </div>
 
         <div id="RightHeadline">

resources/adjust.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+LATEST=$(sed -n 's/^## v\([^ ]\+\).*/\1/p' CHANGELOG.md | head -n 1)
+
+PREPARED=$(sed "s/<FILEVERSION>/${LATEST//./, }/" resources/rpv-web-template.rc)
+PREPARED=$(echo "${PREPARED}" | sed "s/<VERSION>/${LATEST}/")
+
+echo "${PREPARED}"

resources/rpv-web-template.rc

@@ -0,0 +1,24 @@
+ID ICON "rpv-web.ico"
+1 VERSIONINFO
+FILEVERSION     <FILEVERSION>, 0
+PRODUCTVERSION  <FILEVERSION>, 0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904B0"
+    BEGIN
+      VALUE "CompanyName", "Tobias Neitzel"
+      VALUE "FileDescription", "rpv-web server executable"
+      VALUE "FileVersion", "<VERSION>"
+      VALUE "InternalName", "rpv-web"
+      VALUE "LegalCopyright", "Copyright 2023 © Tobias Neitzel"
+      VALUE "OriginalFilename", "rpv-web.exe"
+      VALUE "ProductName", "rpv-web"
+      VALUE "ProductVersion", "<VERSION>"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1200
+  END
+END