Merge pull request #128 from ddvk/new_version_info

Change to using version number instead of /etc/version

.github/workflows/release.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
         - 'v*.*.*'
+  pull_request:
 
 jobs:
   build:
@@ -12,12 +13,18 @@ jobs:
     container: ghcr.io/toltec-dev/qt
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Build 
         run: |
           ./dist.sh
 
+      - uses: actions/upload-artifact@v4
+        with:
+          name: build
+          path: dist/*
+          if-no-files-found: error
+
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')

.gitignore

@@ -6,3 +6,4 @@ rm2-framebuffer
 *.so.*
 *.so
 dist
+rm2fb*.tar.gz

dist.sh

@@ -1,7 +1,8 @@
 qmake
 make
 mkdir -p ./dist
-arm-linux-gnueabihf-strip ./src/client/librm2fb_client.so.1.0.1
-cp ./src/xofb/librm2fb_xofb.so.1.0.1 ./dist
-cp ./src/server/librm2fb_server.so.1.0.1 ./dist
-cp ./src/client/librm2fb_client.so.1.0.1 ./dist
+version=$(grep VERSION= version.pri | cut -d= -f2)
+arm-linux-gnueabihf-strip ./src/client/librm2fb_client.so.$version
+cp ./src/xofb/librm2fb_xofb.so.$version ./dist
+cp ./src/server/librm2fb_server.so.$version ./dist
+cp ./src/client/librm2fb_client.so.$version ./dist

rm2fb.pro

@@ -1,8 +1,10 @@
 TEMPLATE = subdirs
 
+include(version.pri)
+
 SUBDIRS = \
-					src/loader \   # relative paths
-					src/server \
-					src/client \
-          src/xofb   \
+	src/loader \   # relative paths
+	src/server \
+	src/client \
+	src/xofb   \
 

scripts/build.sh

@@ -1,9 +1,10 @@
 qmake
 make
 mkdir -p dist/rm2fb
-cp src/loader/librm2fb_demo.so.1.0.0 dist/rm2fb/
-cp src/server/librm2fb_server.so.1.0.0 dist/rm2fb/
-cp src/client/librm2fb_client.so.1.0.0 dist/rm2fb/
+version=$(grep VERSION= version.pri | cut -d= -f2)
+cp src/loader/librm2fb_demo.so.$version dist/rm2fb/
+cp src/server/librm2fb_server.so.$version dist/rm2fb/
+cp src/client/librm2fb_client.so.$version dist/rm2fb/
 cp scripts/run.sh dist/rm2fb/rm2fb.sh
 chmod +x dist/rm2fb/rm2fb.sh
 cd dist/

scripts/run.sh

@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 systemctl stop xochitl
-LD_PRELOAD=${DIR}/librm2fb_server.so.1.0.0 `which xochitl` &
+version=$(grep VERSION= version.pri | cut -d= -f2)
+LD_PRELOAD=${DIR}/librm2fb_server.so.$version `which xochitl` &
 pid=$!
 sleep 2
-LD_PRELOAD=${DIR}/librm2fb_client.so.1.0.0 $*
+LD_PRELOAD=${DIR}/librm2fb_client.so.$version $*
 pid2=$!
 wait $pid2
 kill -9 -${pid}

src/client/client.pro

@@ -4,8 +4,8 @@
 
 TEMPLATE = lib
 TARGET = rm2fb_client
-VERSION = 1.0.1
 INCLUDEPATH += .
+include(../../version.pri)
 
 # The following define makes your compiler warn you if you use any
 # feature of Qt which has been marked as deprecated (the exact warnings

src/loader/loader.pro

@@ -5,6 +5,7 @@
 TEMPLATE = lib
 TARGET = rm2fb_demo
 INCLUDEPATH += .
+include(../../version.pri)
 
 # The following define makes your compiler warn you if you use any
 # feature of Qt which has been marked as deprecated (the exact warnings

src/server/server.pro

@@ -5,7 +5,7 @@
 TEMPLATE = lib
 TARGET = rm2fb_server
 INCLUDEPATH += .
-VERSION = 1.0.1
+include(../../version.pri)
 
 # The following define makes your compiler warn you if you use any
 # feature of Qt which has been marked as deprecated (the exact warnings