do some clean

Author: Bamcane

.github/workflows/build.yaml

@@ -109,7 +109,7 @@ jobs:
       env: ${{ matrix.env }}
       run: |
         cd debug
-        ./teeworlds_srv shutdown
+        ./ArchiveServer shutdown
 
     - name: Build in release mode
       env: ${{ matrix.env }}
@@ -128,7 +128,7 @@ jobs:
       env: ${{ matrix.env }}
       run: |
         cd release
-        ./teeworlds_srv shutdown
+        ./ArchiveServer shutdown
 
     - name: Package
       run: |
@@ -241,10 +241,10 @@ jobs:
     - name: Build in debug mode
       run: ./bam/bam conf=debug all
     - name: Test debug
-      run: ./build/${{ matrix.archtitecture }}/debug/teeworlds_srv shutdown
+      run: ./build/${{ matrix.archtitecture }}/debug/ArchiveServer shutdown
 
     - name: Build in release mode
       run: ./bam/bam conf=release all
     - name: Test release
-      run: ./build/${{ matrix.archtitecture }}/release/teeworlds_srv shutdown
+      run: ./build/${{ matrix.archtitecture }}/release/ArchiveServer shutdown
 

.gitignore

@@ -25,12 +25,11 @@ map_resave*
 map_version*
 mastersrv*
 packetgen*
-teeworlds*
-!other/bash-completion/teeworlds
+ArchiveClient*
+!ArchiveClient.desktop
 !teeworlds.manifest
 !teeworlds.rc
-teeworlds_srv*
-!other/bash-completion/teeworlds_srv
+ArchiveServer*
 testrunner
 versionsrv*
 

CMakeLists.txt

@@ -85,8 +85,8 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
   src/game/version.h
 )
 
-set(SERVER_EXECUTABLE teeworlds_srv CACHE STRING "Name of the built server executable")
-set(CLIENT_EXECUTABLE teeworlds CACHE STRING "Name of the build client executable")
+set(SERVER_EXECUTABLE ArchiveServer CACHE STRING "Name of the built server executable")
+set(CLIENT_EXECUTABLE ArchiveClient CACHE STRING "Name of the build client executable")
 
 ########################################################################
 # Compiler flags
@@ -1492,7 +1492,7 @@ if(CLIENT)
   )
 
   if(TARGET_OS STREQUAL "windows")
-    set(CLIENT_ICON "other/icons/${CLIENT_EXECUTABLE}.rc")
+    set(CLIENT_ICON "other/icons/teeworlds.rc")
     if(NOT MINGW)
       set(CLIENT_MANIFEST "other/manifest/teeworlds.manifest")
     else()
@@ -1578,7 +1578,7 @@ set(GAME_GENERATED_SERVER
 )
 set(SERVER_SRC ${ENGINE_SERVER} ${GAME_SERVER} ${GAME_GENERATED_SERVER})
 if(TARGET_OS STREQUAL "windows")
-  set(SERVER_ICON "other/icons/${SERVER_EXECUTABLE}.rc")
+  set(SERVER_ICON "other/icons/teeworlds_srv.rc")
 else()
   set(SERVER_ICON)
 endif()

README.md

@@ -66,8 +66,8 @@ Building
 
 On subsequent builds, you only have to repeat the `ninja` step.
 
-You can then run the client with `./teeworlds` and the server with
-`./teeworlds_srv`.
+You can then run the client with `./ArchiveClient` and the server with
+`./ArchiveServer`.
 
 
 Build options
@@ -108,7 +108,7 @@ Building
     bam
 ```
 
-The compiled game is located in a sub-folder of `build`. You can run the client from there with `./teeworlds` and the server with `./teeworlds_srv`.
+The compiled game is located in a sub-folder of `build`. You can run the client from there with `./ArchiveClient` and the server with `./ArchiveServer`.
 
 
 Build options

bam.lua

@@ -385,15 +385,15 @@ function BuildClient(settings, family, platform)
 	local game_client = Compile(settings, CollectRecursive("src/game/client/*.cpp"), SharedClientFiles())
 	local game_editor = Compile(settings, Collect("src/game/editor/*.cpp"))
 
-	Link(settings, "teeworlds", libs["zlib"], libs["png"], libs["json"], libs["glad"], client, game_client, game_editor)
+	Link(settings, "ArchiveClient", libs["zlib"], libs["png"], libs["json"], libs["glad"], client, game_client, game_editor)
 end
 
 function BuildServer(settings, family, platform)
 	local server = Compile(settings, Collect("src/engine/server/*.cpp"))
 
 	local game_server = Compile(settings, CollectRecursive("src/game/server/*.cpp"), SharedServerFiles())
 
-	return Link(settings, "teeworlds_srv", libs["zlib"], libs["json"], server, game_server)
+	return Link(settings, "ArchiveServer", libs["zlib"], libs["json"], server, game_server)
 end
 
 function BuildTools(settings)
@@ -539,7 +539,7 @@ else
 	headless = nil
 end
 
-targets = {client="teeworlds", server="teeworlds_srv",
+targets = {client="ArchiveClient", server="ArchiveServer",
            versionserver="versionsrv", masterserver="mastersrv",
            tools="pseudo_tools", content="content"}
 

cmake/FixupBundleHelper.cmake.in

@@ -4,8 +4,8 @@ message(STATUS "Running post-install script to fix up bundle...")
 
 set(PACKAGE_DIR "${CMAKE_INSTALL_PREFIX}")
 
-set(CLIENT_EXECUTABLE_PATH "${PACKAGE_DIR}/teeworlds@CMAKE_EXECUTABLE_SUFFIX@")
-set(SERVER_EXECUTABLE_PATH "${PACKAGE_DIR}/teeworlds_srv@CMAKE_EXECUTABLE_SUFFIX@")
+set(CLIENT_EXECUTABLE_PATH "${PACKAGE_DIR}/ArchiveClient@CMAKE_EXECUTABLE_SUFFIX@")
+set(SERVER_EXECUTABLE_PATH "${PACKAGE_DIR}/ArchiveServer@CMAKE_EXECUTABLE_SUFFIX@")
 
 function(fixup_single_executable EXEC_PATH)
     if(EXISTS "${EXEC_PATH}")

other/ArchiveClient.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Teeworlds Archive
+GenericName=Online multi-player 2D platform shooter modification
+Type=Application
+Terminal=false
+Exec=ArchiveClient
+Icon=ArchiveClient
+Comment=Teeworlds Archive
+Categories=Game;ArcadeGame;

other/bash-completion/teeworlds

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <assemblyIdentity version="1.0.0.0" name="teeworlds.exe"/>
+  <assemblyIdentity version="1.0.0.0" name="ArchiveClient.exe"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">