diff --git a/doc/continuumatrice-linux-install.md b/doc/continuumatrice-linux-install.md index a344d2ab2..aa95a665b 100644 --- a/doc/continuumatrice-linux-install.md +++ b/doc/continuumatrice-linux-install.md @@ -7,13 +7,13 @@ Continuumatrice is an independent application. You can keep normal upstream **Co The CMake client target is now `continuumatrice` on every platform. A compatibility build target named `cockatrice` remains for older automation, but it creates **no executable** with the old name. ```bash -git pull --ff-only origin feature/continuumatrice-zone-bands -cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_CLIENT=ON -DWITH_SERVER=OFF -DWITH_ORACLE=OFF -cmake --build build --target continuumatrice --parallel 16 -./build/cockatrice/continuumatrice +git pull --ff-only origin feature/continuumatrice-product-migration +cmake -S . -B build --fresh -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_CLIENT=ON -DWITH_SERVER=ON -DWITH_ORACLE=OFF +cmake --build build --target continuumatrice continuum-servatrice --parallel 16 +./build/continuumatrice/continuumatrice ``` -If you previously compiled the fork under the old name, `build/cockatrice/cockatrice` can remain as an **outdated, stale executable** in the build directory. Launch `build/cockatrice/continuumatrice` instead. Do not remove your system's normal `/usr/bin/cockatrice` application. +If you previously compiled the fork under the old name, `build/cockatrice/cockatrice` can remain as an **outdated, stale executable** in the build directory. Launch `build/continuumatrice/continuumatrice` instead. Do not remove your system's normal `/usr/bin/cockatrice` application. The standalone executable on Linux installs as `bin/continuumatrice`. The new `continuumatrice.desktop` launcher installs alongside the normal `cockatrice.desktop`. Its application name and desktop-file ID are also `continuumatrice`, so Wayland and desktop launchers distinguish the applications. @@ -51,3 +51,9 @@ For immediate testing, skip installation and run the executable directly from th ## Cross-platform status This migration also gives the Windows and macOS application package and URL registrations separate names. Those packaging flows have **not** been validated on Windows or macOS; installers must not be published until installation, upgrade, and uninstall testing demonstrates that neither platform affects upstream Cockatrice. + +## Dedicated multiplayer server: Continuum-Servatrice + +Both components are built by default. The server target is `continuum-servatrice` and its binary is `build/continuum-servatrice/continuum-servatrice`. The original MTG Servatrice executable and configuration are not used. + +See [server hosting guide](continuum-servatrice-hosting.md) for the isolated MySQL schema and configuration commands. The default sample ports are TCP **4757** and WebSocket **4758**, chosen not to collide with MTG Servatrice's 4747/4748. Hosting outside your local network requires explicit firewall/reverse proxy/TLS planning.