Marathon is now Classic Marathon

Squashed commit of the following: commit 60103f1430089452529d29fc48bae76953e829af Merge: bb65942 29528b6 Author: Gregory Smith <[email protected]> Date: Thu Jan 18 20:59:32 2024 -0500 Merge branch 'master' into rename-marathon-classic commit bb65942 Author: Gregory Smith <[email protected]> Date: Thu Jan 18 20:57:54 2024 -0500 update names in flatpak desktop files commit f193d52 Author: Gregory Smith <[email protected]> Date: Wed Jan 3 21:13:34 2024 -0500 rename mac apps to Classic Marathon commit 3c872e9 Merge: 8a29de1 93e14fd Author: Gregory Smith <[email protected]> Date: Wed Jan 3 20:04:51 2024 -0500 Merge branch 'master' into rename-marathon-classic commit 8a29de1 Author: Kolfering <[email protected]> Date: Fri Dec 29 17:11:07 2023 +0100 Rename Marathon exes to Classic Marathon for windows
Aleph-One-Marathon · Jan 19, 2024 · 05c171c · 05c171c
1 parent 29528b6
commit 05c171c
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 43 deletions.
diff --git a/.github/workflows/release-mac-osx.yml b/.github/workflows/release-mac-osx.yml
@@ -64,9 +64,9 @@ jobs:
 
         # We finally codesign our app bundle, specifying the Hardened runtime option
         /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Aleph One.app" -v
-        /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Marathon.app" -v
-        /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Marathon 2.app" -v        
-        /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Marathon Infinity.app" -v
+        /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon.app" -v
+        /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon 2.app" -v        
+        /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon Infinity.app" -v
 
     - name: "Notarize app bundle"
       # Extract the secrets we defined earlier as environment variables
@@ -87,9 +87,9 @@ jobs:
 
         echo "Creating temp notarization archives"
         ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Aleph One.app" "alephone.zip"
-        ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Marathon.app" "marathon.zip"
-        ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Marathon 2.app" "marathon2.zip"
-        ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Marathon Infinity.app" "infinity.zip"        
+        ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon.app" "marathon.zip"
+        ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon 2.app" "marathon2.zip"
+        ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon Infinity.app" "infinity.zip"        
 
         # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
         # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
@@ -107,17 +107,17 @@ jobs:
         echo "Notarize Marathon"
         xcrun notarytool submit "marathon.zip" --keychain-profile "notarytool-profile" --wait
         echo "Attach staple"
-        xcrun stapler staple "$GITHUB_WORKSPACE/PBProjects/build/Release/Marathon.app"
+        xcrun stapler staple "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon.app"
 
         echo "Notarize Marathon 2"
         xcrun notarytool submit "marathon2.zip" --keychain-profile "notarytool-profile" --wait
         echo "Attach staple"
-        xcrun stapler staple "$GITHUB_WORKSPACE/PBProjects/build/Release/Marathon 2.app"
+        xcrun stapler staple "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon 2.app"
 
         echo "Notarize Marathon Infinity"
         xcrun notarytool submit "infinity.zip" --keychain-profile "notarytool-profile" --wait
         echo "Attach staple"
-        xcrun stapler staple "$GITHUB_WORKSPACE/PBProjects/build/Release/Marathon Infinity.app"
+        xcrun stapler staple "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon Infinity.app"
 
     - name: Create DMGs
       run: cd tools && ./build_dmg.sh $GITHUB_WORKSPACE $GITHUB_WORKSPACE/PBProjects/build/Release
@@ -127,4 +127,4 @@ jobs:
       with:
         name: alephone-release
         if-no-files-found: error
-        path: 'PBProjects/build/Release/*.dmg'
+        path: 'PBProjects/build/Release/*.dmg'
diff --git a/PBProjects/AlephOne.xcodeproj/project.pbxproj b/PBProjects/AlephOne.xcodeproj/project.pbxproj
@@ -1918,7 +1918,7 @@
 		AE437C8B08779BC900038E30 /* shared_widgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shared_widgets.h; path = ../Source_Files/Misc/shared_widgets.h; sourceTree = SOURCE_ROOT; };
 		AE437C8E08779BE500038E30 /* shared_widgets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = shared_widgets.cpp; path = ../Source_Files/Misc/shared_widgets.cpp; sourceTree = SOURCE_ROOT; };
 		AE48F3551421900900051D61 /* Statistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Statistics.h; path = ../Source_Files/Misc/Statistics.h; sourceTree = "<group>"; };
-		AE505D0B141D45E600915344 /* Marathon 2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Marathon 2.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		AE505D0B141D45E600915344 /* Classic Marathon 2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Classic Marathon 2.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		AE505D12141D46A900915344 /* Info-MAS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-MAS.plist"; path = "AppStore/Marathon 2/Info-MAS.plist"; sourceTree = "<group>"; };
 		AE505D20141D47BF00915344 /* Marathon 2.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "Marathon 2.icns"; path = "AppStore/Marathon 2/Marathon 2.icns"; sourceTree = "<group>"; };
 		AE51545D0D46E84A00506B58 /* lua_map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_map.cpp; sourceTree = "<group>"; };
@@ -2042,7 +2042,7 @@
 		AEAE13200FC9C38400EDA5A6 /* lua_serialize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_serialize.h; sourceTree = "<group>"; };
 		AEAE132C0FC9C3C800EDA5A6 /* BStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BStream.cpp; path = ../Source_Files/CSeries/BStream.cpp; sourceTree = "<group>"; };
 		AEAE132D0FC9C3C800EDA5A6 /* BStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BStream.h; path = ../Source_Files/CSeries/BStream.h; sourceTree = "<group>"; };
-		AEB4A2AD14296CAE00537AE7 /* Marathon Infinity.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Marathon Infinity.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		AEB4A2AD14296CAE00537AE7 /* Classic Marathon Infinity.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Classic Marathon Infinity.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		AEB4A2B214296DC000537AE7 /* Marathon Infinity.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "Marathon Infinity.icns"; path = "AppStore/Marathon Infinity/Marathon Infinity.icns"; sourceTree = "<group>"; };
 		AEB4A2B714296DCF00537AE7 /* Info-MAS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-MAS.plist"; path = "AppStore/Marathon Infinity/Info-MAS.plist"; sourceTree = "<group>"; };
 		AEC02F900B6D8B310095E8C9 /* SW_Texture_Extras.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SW_Texture_Extras.cpp; sourceTree = "<group>"; };
@@ -2061,7 +2061,7 @@
 		AEF5025509A8258C004B0179 /* OGL_LoadScreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OGL_LoadScreen.h; sourceTree = "<group>"; };
 		AEF5025E09A825E2004B0179 /* OGL_LoadScreen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OGL_LoadScreen.cpp; sourceTree = "<group>"; };
 		AEF8C4F210AEFEB500ED84AD /* OGL_Headers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OGL_Headers.h; sourceTree = "<group>"; };
-		AEFD87C313EB84CF00C1E687 /* Marathon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Marathon.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		AEFD87C313EB84CF00C1E687 /* Classic Marathon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Classic Marathon.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C13C71E61B3FB4C500F1188D /* DefaultStringSets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultStringSets.h; path = ../Source_Files/Misc/DefaultStringSets.h; sourceTree = "<group>"; };
 		EF2EF5C804819BD700A8000D /* network_star_hub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = network_star_hub.cpp; path = ../Source_Files/Network/network_star_hub.cpp; sourceTree = "<group>"; };
 		EF2EF5C904819BD700A8000D /* network_star_spoke.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = network_star_spoke.cpp; path = ../Source_Files/Network/network_star_spoke.cpp; sourceTree = "<group>"; };
@@ -2407,9 +2407,9 @@
 			isa = PBXGroup;
 			children = (
 				AEC3C89609AD68AE003258E4 /* Aleph One.app */,
-				AEFD87C313EB84CF00C1E687 /* Marathon.app */,
-				AE505D0B141D45E600915344 /* Marathon 2.app */,
-				AEB4A2AD14296CAE00537AE7 /* Marathon Infinity.app */,
+				AEFD87C313EB84CF00C1E687 /* Classic Marathon.app */,
+				AE505D0B141D45E600915344 /* Classic Marathon 2.app */,
+				AEB4A2AD14296CAE00537AE7 /* Classic Marathon Infinity.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -4135,7 +4135,7 @@
 			);
 			name = "Marathon 2";
 			productName = "SDL Application";
-			productReference = AE505D0B141D45E600915344 /* Marathon 2.app */;
+			productReference = AE505D0B141D45E600915344 /* Classic Marathon 2.app */;
 			productType = "com.apple.product-type.application";
 		};
 		AEB4A0DA14296CAE00537AE7 /* Marathon Infinity */ = {
@@ -4155,7 +4155,7 @@
 			);
 			name = "Marathon Infinity";
 			productName = "SDL Application";
-			productReference = AEB4A2AD14296CAE00537AE7 /* Marathon Infinity.app */;
+			productReference = AEB4A2AD14296CAE00537AE7 /* Classic Marathon Infinity.app */;
 			productType = "com.apple.product-type.application";
 		};
 		AEC3C6FE09AD68AC003258E4 /* Aleph One */ = {
@@ -4195,7 +4195,7 @@
 			);
 			name = Marathon;
 			productName = "SDL Application";
-			productReference = AEFD87C313EB84CF00C1E687 /* Marathon.app */;
+			productReference = AEFD87C313EB84CF00C1E687 /* Classic Marathon.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -5695,7 +5695,7 @@
 					"@executable_path/../Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.bungie.source.Marathon2;
-				PRODUCT_NAME = "Marathon 2";
+				PRODUCT_NAME = "Classic Marathon 2";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
 			};
@@ -5722,7 +5722,7 @@
 					"@executable_path/../Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.bungie.source.Marathon2;
-				PRODUCT_NAME = "Marathon 2";
+				PRODUCT_NAME = "Classic Marathon 2";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
 			};
@@ -5749,7 +5749,7 @@
 					"@executable_path/../Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.bungie.source.MarathonInfinity;
-				PRODUCT_NAME = "Marathon Infinity";
+				PRODUCT_NAME = "Classic Marathon Infinity";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
 			};
@@ -5776,7 +5776,7 @@
 					"@executable_path/../Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.bungie.source.MarathonInfinity;
-				PRODUCT_NAME = "Marathon Infinity";
+				PRODUCT_NAME = "Classic Marathon Infinity";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
 			};
@@ -5803,7 +5803,7 @@
 					"@executable_path/../Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.bungie.source.Marathon;
-				PRODUCT_NAME = Marathon;
+				PRODUCT_NAME = "Classic Marathon";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
 			};
@@ -5830,7 +5830,7 @@
 					"@executable_path/../Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.bungie.source.Marathon;
-				PRODUCT_NAME = Marathon;
+				PRODUCT_NAME = "Classic Marathon";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/PBProjects/AppStore/Marathon 2/Info.plist b/PBProjects/AppStore/Marathon 2/Info.plist
@@ -270,7 +270,7 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>Marathon 2</string>
+	<string>Classic Marathon 2</string>
 	<key>CFBundleIconFile</key>
 	<string>Marathon 2.icns</string>
 	<key>CFBundleIdentifier</key>

diff --git a/PBProjects/AppStore/Marathon Infinity/Info.plist b/PBProjects/AppStore/Marathon Infinity/Info.plist
@@ -270,7 +270,7 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>Marathon Infinity</string>
+	<string>Classic Marathon Infinity</string>
 	<key>CFBundleIconFile</key>
 	<string>Marathon Infinity.icns</string>
 	<key>CFBundleIdentifier</key>

diff --git a/PBProjects/AppStore/Marathon/Info.plist b/PBProjects/AppStore/Marathon/Info.plist
@@ -270,7 +270,7 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>Marathon</string>
+	<string>Classic Marathon</string>
 	<key>CFBundleIconFile</key>
 	<string>Marathon.icns</string>
 	<key>CFBundleIdentifier</key>

diff --git a/VisualStudio/AlephOne/AlephOne.vcxproj b/VisualStudio/AlephOne/AlephOne.vcxproj
@@ -135,19 +135,19 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Marathon Infinity|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>Marathon Infinity</TargetName>
+    <TargetName>Classic Marathon Infinity</TargetName>
     <OutDir>$(SolutionDir)$(Platform)\Release\</OutDir>
     <IntDir>$(Platform)\Release\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Marathon|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>Marathon</TargetName>
+    <TargetName>Classic Marathon</TargetName>
     <OutDir>$(SolutionDir)$(Platform)\Release\</OutDir>
     <IntDir>$(Platform)\Release\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Marathon 2|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>Marathon 2</TargetName>
+    <TargetName>Classic Marathon 2</TargetName>
     <OutDir>$(SolutionDir)$(Platform)\Release\</OutDir>
     <IntDir>$(Platform)\Release\</IntDir>
   </PropertyGroup>

diff --git a/VisualStudio/autobuild-windows.ps1 b/VisualStudio/autobuild-windows.ps1
@@ -43,7 +43,8 @@ function GetCommonFiles() {
 
 function Package {
 	Param (
-        [string]$build
+        [string]$build,
+		[string]$package_name
     )
 
 	#path to the executable
@@ -56,9 +57,6 @@ function Package {
 	$package_version_day = '{0:d2}' -f $package_version.Revision
 	$package_version_string = "${package_version_year}${package_version_month}${package_version_day}"
 
-	#get the name of the executable without the extension and without spaces
-	$package_name = (Get-Item $exe_path).BaseName
-	$package_name = $package_name.replace(' ','')
 
 	$package_fullname = "${package_name}-${package_version_string}"
 
@@ -148,13 +146,15 @@ if(!(Test-Path -Path $msbuild_path)) {
 $array_exclude_copy = @('Makefile','Makefile.*','*.svn','*.git')
 $array_build = @()
 $array_exe_name = @()
-if($a1) {$array_build += "Release"; $array_exe_name += "Aleph One.exe"}
-if($m1) {$array_build += "Marathon"; $array_exe_name += "Marathon.exe"}
-if($m2) {$array_build += "Marathon 2"; $array_exe_name += "Marathon 2.exe"}
-if($m3) {$array_build += "Marathon Infinity"; $array_exe_name += "Marathon Infinity.exe"}
+$array_package_name = @()
+if($a1) {$array_build += "Release"; $array_exe_name += "Aleph One.exe"; $array_package_name += "AlephOne"}
+if($m1) {$array_build += "Marathon"; $array_exe_name += "Classic Marathon.exe"; $array_package_name += "Marathon"}
+if($m2) {$array_build += "Marathon 2"; $array_exe_name += "Classic Marathon 2.exe"; $array_package_name += "Marathon2"}
+if($m3) {$array_build += "Marathon Infinity"; $array_exe_name += "Classic Marathon Infinity.exe"; $array_package_name += "MarathonInfinity"}
 
 for (($i = 0); $i -lt $array_build.Count; $i++) {
 	$build = $array_build[$i]
+	$package_name = $array_package_name[$i]
 	Write-Host "Building ${build} ${platform}" -ForegroundColor green
 	[string]$exe_path = Join-Path -Path $exe_path_only -ChildPath $array_exe_name[$i]
 	[bool]$success = &MsBuild -configuration $build
@@ -164,7 +164,7 @@ for (($i = 0); $i -lt $array_build.Count; $i++) {
 	else {
 		Write-Host "${build} build succeeded" -ForegroundColor green
 		Write-Host "Starting packaging ${build}" -ForegroundColor green
-		Package -build $build
+		Package -build $build -package_name $package_name
 		Write-Host "Packaging for ${build} done" -ForegroundColor green
 	}
 }
diff --git a/flatpak/marathon-infinity.desktop b/flatpak/marathon-infinity.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Name=Marathon Infinity
+Name=Classic Marathon Infinity
 Exec=run.sh
 Icon=org.bungie.source.MarathonInfinity
 Categories=Game
diff --git a/flatpak/marathon.desktop b/flatpak/marathon.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Name=Marathon
+Name=Classic Marathon
 Exec=run.sh
 Icon=org.bungie.source.Marathon
 Categories=Game
diff --git a/flatpak/marathon2.desktop b/flatpak/marathon2.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Name=Marathon 2: Durandal
+Name=Classic Marathon 2
 Exec=run.sh
 Icon=org.bungie.source.Marathon2
 Categories=Game