Build update, use BASEVERSION.FS

Author: FrodeSolheim

.github/workflows/fsbuild.yml

@@ -101,7 +101,6 @@ jobs:
     - uses: actions/upload-artifact@v2
       with:
         name: Linux_x86-64
-
         path: fsbuild/_dist/*
 
     - name: Upload build to Dropbox folder

BASEVERSION.FS

@@ -0,0 +1 @@
+BASEVERSION_FS=4.0.40

PACKAGE.FS

@@ -3,8 +3,8 @@ PACKAGE_MACOS_BUNDLE_ID=no.fengestad.fs-uae
 PACKAGE_NAME=fs-uae
 PACKAGE_NAME_PRETTY=FS-UAE
 PACKAGE_TYPE=fs-app-plugin
-PACKAGE_VERSION=4.0.19-master
-PACKAGE_VERSION_MAJOR=4
+PACKAGE_VERSION=0.0.0
+PACKAGE_VERSION_MAJOR=0
 PACKAGE_VERSION_MINOR=0
-PACKAGE_VERSION_REVISION=19
-PACKAGE_VERSION_TAG=-master
+PACKAGE_VERSION_REVISION=0
+PACKAGE_VERSION_TAG=

configure.ac

@@ -3,10 +3,10 @@
 
 AC_PREREQ([2.67])
 
-m4_define([fsbuild_version], [4.0.15-dev])
-m4_define([fsbuild_version_major], [4])
+m4_define([fsbuild_version], [0.0.0])
+m4_define([fsbuild_version_major], [0])
 m4_define([fsbuild_version_minor], [0])
-m4_define([fsbuild_version_revision], [15])
+m4_define([fsbuild_version_revision], [0])
 m4_define([fsbuild_commit], [])
 
 AC_INIT([FS-UAE], [fsbuild_version],

debian/changelog

@@ -1,5 +1,5 @@
-fs-uae (4.0.15-dev-0) unstable; urgency=low
+fs-uae (0.0.0-0) unstable; urgency=low
 
   * Dummy changelog entry.
 
- -- Frode Solheim <[email protected]>  Tue, 16 Mar 2021 00:14:07 
+ -- Frode Solheim <[email protected]>  Sun, 10 Oct 2021 09:03:58 +00:00

fs-uae.spec

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-%define fsbuild_version 4.0.15-dev
+%define fsbuild_version 0.0.0
 
 %define name fs-uae
 %define version %{fsbuild_version}

fsbuild/standalone.py

@@ -5,6 +5,7 @@
 import shutil
 import subprocess
 import sys
+from typing import Dict, List, Set
 
 strip = False
 rpath = False
@@ -14,11 +15,11 @@
 steam_runtime = False
 
 
-excluded_libraries = {}
-included_libraries = {}
+excluded_libraries: Dict[str, Set[str]] = {}
+included_libraries: Dict[str, Set[str]] = {}
 
 
-def fix_linux_binary(path):
+def fix_linux_binary(path: str):
     changes = 0
     if os.path.exists(path + ".standalone"):
         return changes
@@ -41,7 +42,7 @@ def fix_linux_binary(path):
         return 0
     data = p.stdout.decode("UTF-8")
     print("fixing", path, "no_copy =", no_copy)
-    library_locations = {}
+    library_locations: Dict[str, str] = {}
     for line in data.split("\n"):
         line = line.strip()
         if "=>" not in line:
@@ -128,7 +129,7 @@ def fix_linux_binary(path):
 )
 
 
-def ignore_linux_library(name):
+def ignore_linux_library(name: str):
     if os.getenv("LIBGPG_ERROR_CHECK", "") != "0":
         if name.startswith("libgpg-error.so"):
             raise Exception(
@@ -218,8 +219,8 @@ def ignore_linux_library(name):
     return False
 
 
-def linux_iteration(app):
-    binaries = []
+def linux_iteration(app: str):
+    binaries: List[str] = []
     binaries_dir = app
     for name in sorted(os.listdir(binaries_dir)):
         binaries.append(os.path.join(binaries_dir, name))
@@ -251,7 +252,7 @@ def linux_main():
             os.remove(os.path.join(app, name))
 
 
-def fix_macos_binary(path, frameworks_dir):
+def fix_macos_binary(path: str, frameworks_dir: str):
     if path.endswith(".txt"):
         return 0
     print("fixing", path)
@@ -278,7 +279,7 @@ def fix_macos_binary(path, frameworks_dir):
         if "Contents" in old:
             continue
         print(old)
-        old_dir, name = os.path.split(old)
+        _, name = os.path.split(old)
         # new = old.replace(old, "@executable_path/../Frameworks/" + name)
         if rpath:
             new = old.replace(old, "@rpath/" + name)
@@ -311,8 +312,8 @@ def fix_macos_binary(path, frameworks_dir):
     return changes
 
 
-def macos_iteration(app):
-    binaries = []
+def macos_iteration(app: str):
+    binaries: List[str] = []
     if os.path.isdir(app):
         # mac_os_dir = os.path.join(app, "Contents", "MacOS")
         frameworks_dir = app
@@ -331,7 +332,7 @@ def macos_iteration(app):
     return changes
 
 
-def fix_macos_binary_2(path, frameworks_dir):
+def fix_macos_binary_2(path: str, frameworks_dir: str):
     print("fixing", path)
     changes = 0
     if not os.path.exists(path):
@@ -354,7 +355,7 @@ def fix_macos_binary_2(path, frameworks_dir):
         if "Contents" in old:
             continue
         print(old)
-        old_dir, name = os.path.split(old)
+        _, name = os.path.split(old)
         new = old.replace(old, "@executable_path/../Frameworks/" + name)
         dst = os.path.join(frameworks_dir, os.path.basename(old))
         if not os.path.exists(dst):
@@ -373,8 +374,8 @@ def fix_macos_binary_2(path, frameworks_dir):
     return changes
 
 
-def macos_iteration_2(app):
-    binaries = []
+def macos_iteration_2(app: str):
+    binaries: List[str] = []
     mac_os_dir = os.path.join(app, "Contents", "MacOS")
     frameworks_dir = os.path.join(app, "Contents", "Frameworks")
     if not os.path.exists(frameworks_dir):
@@ -438,8 +439,8 @@ def macos_main():
 ]
 
 
-def fix_windows_binary(path, app_dir):
-    name, ext = os.path.splitext(os.path.basename(path))
+def fix_windows_binary(path: str, app_dir: str):
+    _, ext = os.path.splitext(os.path.basename(path))
     if ext.lower() not in [".dll", ".exe"]:
         return 0
     # if path.endswith(".txt"):
@@ -502,8 +503,8 @@ def fix_windows_binary(path, app_dir):
     return changes
 
 
-def windows_iteration(app):
-    binaries = []
+def windows_iteration(app: str):
+    binaries: List[str] = []
     if os.path.isdir(app):
         for name in sorted(os.listdir(app)):
             binaries.append(os.path.join(app, name))

fsbuild/version.py

@@ -229,16 +229,17 @@ def calculate_version(
     auto_revision=False, increment_revision=False, include_commit=False
 ):
     # with open("fsbuild/VERSION") as f:
-    #     # with open("VERSION.FS") as f:
-    #     version_str = f.read().strip()
-    with open("PACKAGE.FS") as f:
-        for line in f:
-            if line.startswith("PACKAGE_VERSION="):
-                version_str = line[16:].strip()
+    with open("BASEVERSION.FS") as f:
+        version_str = f.read().strip()
+    if version_str.startswith("BASEVERSION_FS="):
+        version_str = version_str[len("BASEVERSION_FS="):].strip()
+    # with open("PACKAGE.FS") as f:
+    #     for line in f:
+    #         if line.startswith("PACKAGE_VERSION="):
+    #             version_str = line[16:].strip()
     version = Version(version_str)
     if auto_revision:
-        # version_commit = find_last_commit_for_file("VERSION.FS")
-        version_commit = find_last_commit_for_file("PACKAGE.FS")
+        version_commit = find_last_commit_for_file("BASEVERSION.FS")
         increment = num_commits_since(version_commit)
         if increment_revision:
             increment += 1
@@ -248,6 +249,25 @@ def calculate_version(
             version.revision += increment
     if "--commit" in sys.argv:
         version.commit = find_last_commit()
+
+    if True:
+        branch = None
+        githubRef = os.environ.get("GITHUB_REF")
+        if githubRef is not None:
+            if githubRef.startswith("refs/heads/"):
+                branch = githubRef[len("refs/heads/"):]
+            if githubRef.startswith("refs/pull/"):
+                branch = "pull" + githubRef[len("refs/pull/"):].replace("/", "")
+        if not branch:
+            branch = subprocess.check_output(["git", "branch", "--show-current"], encoding="UTF-8").strip()
+
+        if branch == "stable":
+            version.tag = ""
+        elif branch:
+            version.tag = f"-{branch}"
+        else:
+            raise Exception("Cannot calculate version tag from git ref")
+
     return version
 
 
@@ -271,9 +291,11 @@ def main():
     # For date/time formatting
     locale.setlocale(locale.LC_TIME, "C")
 
-    auto_revision = "--auto" in sys.argv
+    # auto_revision = "--auto" in sys.argv
+    auto_revision = True
     increment_revision = "--next" in sys.argv
-    include_commit = "--commit" in sys.argv
+    # include_commit = "--commit" in sys.argv
+    include_commit = True
     # if "--auto-next" in sys.argv:
     #     auto_revision = True
     #     increment_revision = True

fsdeps/dep/SDL2

@@ -4,8 +4,13 @@ set -e
 # Dependency: pulseaudio?
 # Dependency: wayland?
 
+if [ "`uname`" = "Darwin" ]; then
+PACKAGE=SDL2-2.0.14
+CHECKSUM=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+else
 PACKAGE=SDL2-2.0.16
 CHECKSUM=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
+fi
 REVISION=0
 
 . fsdeps/dep.sh