From 70386f15b6a6e8350fd7c69ce97927c04ca9ebaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9A=D0=B0=D0=BF?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BA=D0=BE?= Date: Wed, 21 Oct 2026 17:51:05 +0300 Subject: [PATCH] scripts --- {chkgfx => ogs-chkgfx}/dialect.yml | 0 {chkgfx => ogs-chkgfx}/ver-mac/Info.plist | 0 {chkgfx => ogs-chkgfx}/ver-mac/Package.swift | 0 {chkgfx => ogs-chkgfx}/ver-mac/res | 0 .../ver-mac/src/AppDelegate.swift | 0 .../ver-mac/src/ChkgfxApp.swift | 0 .../ver-mac/src/chkgfx/chkgfx.swift | 0 .../ver-mac/src/chkgfx/chkgfxVM.swift | 0 .../ver-mac/src/chkgfx/view/ChkgfxView.swift | 0 .../ver-mac/src/other/other.swift | 0 .../ver-mac/src/raybri/raybri.c | 0 .../ver-mac/src/raybri/raybri.h | 0 .../ver-mac/src/render/render.swift | 0 .../ver-mac/src/render/renderAux.swift | 0 .../ver-mac/src/render/renderConst.swift | 0 .../src/render/renderConstShader.swift | 0 .../ver-mac/src/render/renderEffect.swift | 0 .../ver-mac/src/render/renderVM.swift | 0 .../src/render/view/RenderGLView.swift | 0 .../ver-mac/src/render/view/RenderView.swift | 0 {game => ogs-mahjong}/dialect.yml | 0 {game => ogs-mahjong}/ver-mac/Info.plist | 0 {game => ogs-mahjong}/ver-mac/Package.swift | 0 {game => ogs-mahjong}/ver-mac/res | 0 .../ver-mac/src/AppDelegate.swift | 0 .../ver-mac/src/GameApp.swift | 0 .../ver-mac/src/dialect.swift | 0 .../ver-mac/src/other/other.swift | 0 .../ver-mac/src/raybri/raybri.c | 0 .../ver-mac/src/raybri/raybri.h | 0 .../ver-mac/src/render/render.swift | 0 .../ver-mac/src/render/renderAux.swift | 0 .../ver-mac/src/render/renderConst.swift | 0 .../src/render/renderConstShader.swift | 0 .../ver-mac/src/render/renderEffect.swift | 0 .../ver-mac/src/render/renderVM.swift | 0 .../src/render/view/RenderGLView.swift | 0 .../ver-mac/src/render/view/RenderView.swift | 0 .../ver-mac/src/root/root.swift | 0 .../ver-mac/src/root/rootVM.swift | 0 .../ver-mac/src/root/view/RootView.swift | 0 util/build-game-mac | 10 ---------- util/build-ogs-mahjong-mac | 12 ++++++++++++ util/paths | 1 - util/run-mac | 2 +- util/step/packageMac | 19 +++++++++---------- util/step/runMac | 6 ++++-- 47 files changed, 26 insertions(+), 24 deletions(-) rename {chkgfx => ogs-chkgfx}/dialect.yml (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/Info.plist (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/Package.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/res (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/AppDelegate.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/ChkgfxApp.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/chkgfx/chkgfx.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/chkgfx/chkgfxVM.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/chkgfx/view/ChkgfxView.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/other/other.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/raybri/raybri.c (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/raybri/raybri.h (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/render/render.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/render/renderAux.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/render/renderConst.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/render/renderConstShader.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/render/renderEffect.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/render/renderVM.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/render/view/RenderGLView.swift (100%) rename {chkgfx => ogs-chkgfx}/ver-mac/src/render/view/RenderView.swift (100%) rename {game => ogs-mahjong}/dialect.yml (100%) rename {game => ogs-mahjong}/ver-mac/Info.plist (100%) rename {game => ogs-mahjong}/ver-mac/Package.swift (100%) rename {game => ogs-mahjong}/ver-mac/res (100%) rename {game => ogs-mahjong}/ver-mac/src/AppDelegate.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/GameApp.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/dialect.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/other/other.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/raybri/raybri.c (100%) rename {game => ogs-mahjong}/ver-mac/src/raybri/raybri.h (100%) rename {game => ogs-mahjong}/ver-mac/src/render/render.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/render/renderAux.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/render/renderConst.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/render/renderConstShader.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/render/renderEffect.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/render/renderVM.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/render/view/RenderGLView.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/render/view/RenderView.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/root/root.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/root/rootVM.swift (100%) rename {game => ogs-mahjong}/ver-mac/src/root/view/RootView.swift (100%) delete mode 100755 util/build-game-mac create mode 100755 util/build-ogs-mahjong-mac diff --git a/chkgfx/dialect.yml b/ogs-chkgfx/dialect.yml similarity index 100% rename from chkgfx/dialect.yml rename to ogs-chkgfx/dialect.yml diff --git a/chkgfx/ver-mac/Info.plist b/ogs-chkgfx/ver-mac/Info.plist similarity index 100% rename from chkgfx/ver-mac/Info.plist rename to ogs-chkgfx/ver-mac/Info.plist diff --git a/chkgfx/ver-mac/Package.swift b/ogs-chkgfx/ver-mac/Package.swift similarity index 100% rename from chkgfx/ver-mac/Package.swift rename to ogs-chkgfx/ver-mac/Package.swift diff --git a/chkgfx/ver-mac/res b/ogs-chkgfx/ver-mac/res similarity index 100% rename from chkgfx/ver-mac/res rename to ogs-chkgfx/ver-mac/res diff --git a/chkgfx/ver-mac/src/AppDelegate.swift b/ogs-chkgfx/ver-mac/src/AppDelegate.swift similarity index 100% rename from chkgfx/ver-mac/src/AppDelegate.swift rename to ogs-chkgfx/ver-mac/src/AppDelegate.swift diff --git a/chkgfx/ver-mac/src/ChkgfxApp.swift b/ogs-chkgfx/ver-mac/src/ChkgfxApp.swift similarity index 100% rename from chkgfx/ver-mac/src/ChkgfxApp.swift rename to ogs-chkgfx/ver-mac/src/ChkgfxApp.swift diff --git a/chkgfx/ver-mac/src/chkgfx/chkgfx.swift b/ogs-chkgfx/ver-mac/src/chkgfx/chkgfx.swift similarity index 100% rename from chkgfx/ver-mac/src/chkgfx/chkgfx.swift rename to ogs-chkgfx/ver-mac/src/chkgfx/chkgfx.swift diff --git a/chkgfx/ver-mac/src/chkgfx/chkgfxVM.swift b/ogs-chkgfx/ver-mac/src/chkgfx/chkgfxVM.swift similarity index 100% rename from chkgfx/ver-mac/src/chkgfx/chkgfxVM.swift rename to ogs-chkgfx/ver-mac/src/chkgfx/chkgfxVM.swift diff --git a/chkgfx/ver-mac/src/chkgfx/view/ChkgfxView.swift b/ogs-chkgfx/ver-mac/src/chkgfx/view/ChkgfxView.swift similarity index 100% rename from chkgfx/ver-mac/src/chkgfx/view/ChkgfxView.swift rename to ogs-chkgfx/ver-mac/src/chkgfx/view/ChkgfxView.swift diff --git a/chkgfx/ver-mac/src/other/other.swift b/ogs-chkgfx/ver-mac/src/other/other.swift similarity index 100% rename from chkgfx/ver-mac/src/other/other.swift rename to ogs-chkgfx/ver-mac/src/other/other.swift diff --git a/chkgfx/ver-mac/src/raybri/raybri.c b/ogs-chkgfx/ver-mac/src/raybri/raybri.c similarity index 100% rename from chkgfx/ver-mac/src/raybri/raybri.c rename to ogs-chkgfx/ver-mac/src/raybri/raybri.c diff --git a/chkgfx/ver-mac/src/raybri/raybri.h b/ogs-chkgfx/ver-mac/src/raybri/raybri.h similarity index 100% rename from chkgfx/ver-mac/src/raybri/raybri.h rename to ogs-chkgfx/ver-mac/src/raybri/raybri.h diff --git a/chkgfx/ver-mac/src/render/render.swift b/ogs-chkgfx/ver-mac/src/render/render.swift similarity index 100% rename from chkgfx/ver-mac/src/render/render.swift rename to ogs-chkgfx/ver-mac/src/render/render.swift diff --git a/chkgfx/ver-mac/src/render/renderAux.swift b/ogs-chkgfx/ver-mac/src/render/renderAux.swift similarity index 100% rename from chkgfx/ver-mac/src/render/renderAux.swift rename to ogs-chkgfx/ver-mac/src/render/renderAux.swift diff --git a/chkgfx/ver-mac/src/render/renderConst.swift b/ogs-chkgfx/ver-mac/src/render/renderConst.swift similarity index 100% rename from chkgfx/ver-mac/src/render/renderConst.swift rename to ogs-chkgfx/ver-mac/src/render/renderConst.swift diff --git a/chkgfx/ver-mac/src/render/renderConstShader.swift b/ogs-chkgfx/ver-mac/src/render/renderConstShader.swift similarity index 100% rename from chkgfx/ver-mac/src/render/renderConstShader.swift rename to ogs-chkgfx/ver-mac/src/render/renderConstShader.swift diff --git a/chkgfx/ver-mac/src/render/renderEffect.swift b/ogs-chkgfx/ver-mac/src/render/renderEffect.swift similarity index 100% rename from chkgfx/ver-mac/src/render/renderEffect.swift rename to ogs-chkgfx/ver-mac/src/render/renderEffect.swift diff --git a/chkgfx/ver-mac/src/render/renderVM.swift b/ogs-chkgfx/ver-mac/src/render/renderVM.swift similarity index 100% rename from chkgfx/ver-mac/src/render/renderVM.swift rename to ogs-chkgfx/ver-mac/src/render/renderVM.swift diff --git a/chkgfx/ver-mac/src/render/view/RenderGLView.swift b/ogs-chkgfx/ver-mac/src/render/view/RenderGLView.swift similarity index 100% rename from chkgfx/ver-mac/src/render/view/RenderGLView.swift rename to ogs-chkgfx/ver-mac/src/render/view/RenderGLView.swift diff --git a/chkgfx/ver-mac/src/render/view/RenderView.swift b/ogs-chkgfx/ver-mac/src/render/view/RenderView.swift similarity index 100% rename from chkgfx/ver-mac/src/render/view/RenderView.swift rename to ogs-chkgfx/ver-mac/src/render/view/RenderView.swift diff --git a/game/dialect.yml b/ogs-mahjong/dialect.yml similarity index 100% rename from game/dialect.yml rename to ogs-mahjong/dialect.yml diff --git a/game/ver-mac/Info.plist b/ogs-mahjong/ver-mac/Info.plist similarity index 100% rename from game/ver-mac/Info.plist rename to ogs-mahjong/ver-mac/Info.plist diff --git a/game/ver-mac/Package.swift b/ogs-mahjong/ver-mac/Package.swift similarity index 100% rename from game/ver-mac/Package.swift rename to ogs-mahjong/ver-mac/Package.swift diff --git a/game/ver-mac/res b/ogs-mahjong/ver-mac/res similarity index 100% rename from game/ver-mac/res rename to ogs-mahjong/ver-mac/res diff --git a/game/ver-mac/src/AppDelegate.swift b/ogs-mahjong/ver-mac/src/AppDelegate.swift similarity index 100% rename from game/ver-mac/src/AppDelegate.swift rename to ogs-mahjong/ver-mac/src/AppDelegate.swift diff --git a/game/ver-mac/src/GameApp.swift b/ogs-mahjong/ver-mac/src/GameApp.swift similarity index 100% rename from game/ver-mac/src/GameApp.swift rename to ogs-mahjong/ver-mac/src/GameApp.swift diff --git a/game/ver-mac/src/dialect.swift b/ogs-mahjong/ver-mac/src/dialect.swift similarity index 100% rename from game/ver-mac/src/dialect.swift rename to ogs-mahjong/ver-mac/src/dialect.swift diff --git a/game/ver-mac/src/other/other.swift b/ogs-mahjong/ver-mac/src/other/other.swift similarity index 100% rename from game/ver-mac/src/other/other.swift rename to ogs-mahjong/ver-mac/src/other/other.swift diff --git a/game/ver-mac/src/raybri/raybri.c b/ogs-mahjong/ver-mac/src/raybri/raybri.c similarity index 100% rename from game/ver-mac/src/raybri/raybri.c rename to ogs-mahjong/ver-mac/src/raybri/raybri.c diff --git a/game/ver-mac/src/raybri/raybri.h b/ogs-mahjong/ver-mac/src/raybri/raybri.h similarity index 100% rename from game/ver-mac/src/raybri/raybri.h rename to ogs-mahjong/ver-mac/src/raybri/raybri.h diff --git a/game/ver-mac/src/render/render.swift b/ogs-mahjong/ver-mac/src/render/render.swift similarity index 100% rename from game/ver-mac/src/render/render.swift rename to ogs-mahjong/ver-mac/src/render/render.swift diff --git a/game/ver-mac/src/render/renderAux.swift b/ogs-mahjong/ver-mac/src/render/renderAux.swift similarity index 100% rename from game/ver-mac/src/render/renderAux.swift rename to ogs-mahjong/ver-mac/src/render/renderAux.swift diff --git a/game/ver-mac/src/render/renderConst.swift b/ogs-mahjong/ver-mac/src/render/renderConst.swift similarity index 100% rename from game/ver-mac/src/render/renderConst.swift rename to ogs-mahjong/ver-mac/src/render/renderConst.swift diff --git a/game/ver-mac/src/render/renderConstShader.swift b/ogs-mahjong/ver-mac/src/render/renderConstShader.swift similarity index 100% rename from game/ver-mac/src/render/renderConstShader.swift rename to ogs-mahjong/ver-mac/src/render/renderConstShader.swift diff --git a/game/ver-mac/src/render/renderEffect.swift b/ogs-mahjong/ver-mac/src/render/renderEffect.swift similarity index 100% rename from game/ver-mac/src/render/renderEffect.swift rename to ogs-mahjong/ver-mac/src/render/renderEffect.swift diff --git a/game/ver-mac/src/render/renderVM.swift b/ogs-mahjong/ver-mac/src/render/renderVM.swift similarity index 100% rename from game/ver-mac/src/render/renderVM.swift rename to ogs-mahjong/ver-mac/src/render/renderVM.swift diff --git a/game/ver-mac/src/render/view/RenderGLView.swift b/ogs-mahjong/ver-mac/src/render/view/RenderGLView.swift similarity index 100% rename from game/ver-mac/src/render/view/RenderGLView.swift rename to ogs-mahjong/ver-mac/src/render/view/RenderGLView.swift diff --git a/game/ver-mac/src/render/view/RenderView.swift b/ogs-mahjong/ver-mac/src/render/view/RenderView.swift similarity index 100% rename from game/ver-mac/src/render/view/RenderView.swift rename to ogs-mahjong/ver-mac/src/render/view/RenderView.swift diff --git a/game/ver-mac/src/root/root.swift b/ogs-mahjong/ver-mac/src/root/root.swift similarity index 100% rename from game/ver-mac/src/root/root.swift rename to ogs-mahjong/ver-mac/src/root/root.swift diff --git a/game/ver-mac/src/root/rootVM.swift b/ogs-mahjong/ver-mac/src/root/rootVM.swift similarity index 100% rename from game/ver-mac/src/root/rootVM.swift rename to ogs-mahjong/ver-mac/src/root/rootVM.swift diff --git a/game/ver-mac/src/root/view/RootView.swift b/ogs-mahjong/ver-mac/src/root/view/RootView.swift similarity index 100% rename from game/ver-mac/src/root/view/RootView.swift rename to ogs-mahjong/ver-mac/src/root/view/RootView.swift diff --git a/util/build-game-mac b/util/build-game-mac deleted file mode 100755 index ac85d2f..0000000 --- a/util/build-game-mac +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -e -SDIR=$(cd "$(dirname "$0")" ; pwd -P) - -T=$SDIR/step -source $SDIR/paths - -STEP=0 -source $T/generateDialect game -source $T/buildMac game -#source $T/packageMac game diff --git a/util/build-ogs-mahjong-mac b/util/build-ogs-mahjong-mac new file mode 100755 index 0000000..cc120a9 --- /dev/null +++ b/util/build-ogs-mahjong-mac @@ -0,0 +1,12 @@ +#!/bin/bash -e +SDIR=$(cd "$(dirname "$0")" ; pwd -P) + +T=$SDIR/step +source $SDIR/paths + +TARGET=ogs-mahjong + +STEP=0 +source $T/generateDialect $TARGET +source $T/buildMac $TARGET +source $T/packageMac $TARGET "OGS Mahjong" diff --git a/util/paths b/util/paths index 9b43d63..e69de29 100644 --- a/util/paths +++ b/util/paths @@ -1 +0,0 @@ -APP_MAC="$SDIR/../game/ver-mac/.build/OGS Mahjong.app" diff --git a/util/run-mac b/util/run-mac index 4a795e9..4c66bbf 100755 --- a/util/run-mac +++ b/util/run-mac @@ -5,4 +5,4 @@ T=$SDIR/step source $SDIR/paths STEP=0 -source $T/runMac +source $T/runMac ogs-mahjong "OGS Mahjong" diff --git a/util/step/packageMac b/util/step/packageMac index 43f8340..529a496 100755 --- a/util/step/packageMac +++ b/util/step/packageMac @@ -1,18 +1,17 @@ #!/bin/bash -e -STEP=$((STEP+1)) -echo -e "\n> > > > Step №$STEP. Make an app package for macOS" +TARGET=$1 +APP_NAME=$2 +STEP=$((STEP+1)) +echo -e "\n> > > > Step №$STEP. Make '$APP_NAME' macOS package for '$TARGET'" + +APP_MAC="$SDIR/../$TARGET/ver-mac/.build/$APP_NAME.app" rm -rf "$APP_MAC" APP_DAT="$APP_MAC/Contents" - mkdir -p "$APP_DAT/MacOS" mkdir -p "$APP_DAT/Resources" - -cp "$SDIR/../game/ver-mac/.build/debug/ogs-mahjong" "$APP_DAT/MacOS/ogs-mahjong" -cp "$SDIR/../game/ver-mac/Info.plist" "$APP_DAT/Info.plist" - -# App resources (icons + glTF assets) live in the repo-level res/ directory, -# symlinked as game/ver-mac/res. -cp -R "$SDIR/../game/ver-mac/res/." "$APP_DAT/Resources/" +cp "$SDIR/../$TARGET/ver-mac/.build/debug/$TARGET" "$APP_DAT/MacOS/$TARGET" +cp "$SDIR/../$TARGET/ver-mac/Info.plist" "$APP_DAT/Info.plist" +cp -R "$SDIR/../$TARGET/ver-mac/res/." "$APP_DAT/Resources/" diff --git a/util/step/runMac b/util/step/runMac index 93edc86..93bef6f 100755 --- a/util/step/runMac +++ b/util/step/runMac @@ -1,6 +1,8 @@ #!/bin/bash -e +TARGET=$1 +APP_NAME=$2 STEP=$((STEP+1)) -echo -e "\n> > > > Step №$STEP. Run macOS app" +echo -e "\n> > > > Step №$STEP. Run macOS app for '$TARGET'" -"$APP_MAC/Contents/MacOS/ogs-mahjong" +"$SDIR/../$TARGET/ver-mac/.build/$APP_NAME.app/Contents/MacOS/$TARGET"