Renamed ZetaGlest to Glest

mk/macos/.gitignore

@@ -1,6 +1,6 @@
-/megaglest
-/megaglest.6
-/megaglest_*
+/glest
+/glest.6
+/glest_*
 /[Mm]ega[Gg]lest*.dmg
 
 core

mk/macos/CMakeLists.txt

@@ -36,8 +36,8 @@ include (InstallRequiredSystemLibraries)
 
 # Use bundle generator (OSX has 3 other options if you feel adventurous)
 SET(CPACK_GENERATOR "Bundle")
-SET(CPACK_BUNDLE_NAME "ZetaGlest")
-SET(CPACK_PACKAGE_FILE_NAME "ZetaGlest-game-macos-${ZETAGLEST_VERSION}")
-SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/ZetaGlest.icns")
-SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/ZetaGlest.icns")
-SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/ZetaGlest.sh")
+SET(CPACK_BUNDLE_NAME "Glest")
+SET(CPACK_PACKAGE_FILE_NAME "Glest-game-macos-${GLEST_VERSION}")
+SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/Glest.icns")
+SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/Glest.icns")
+SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/Glest.sh")

mk/macos/build.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Use this script to build MegaGlest using cmake
+# Use this script to build Glest using cmake
 # ----------------------------------------------------------------------------
 # 2011 Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
 # 2015 Rewritten by filux <heross(@@)o2.pl>
@@ -7,7 +7,7 @@
 # ----------------------------------------------------------------------------
 # Default to English language output so we can understand your bug reports
 #
-# Modified by Andy Alt for ZetaGlest <https://zetaglest.github.io/>
+# Modified by Andy Alt for Glest <https://glest.github.io/>
 
 export LANG=C
 
@@ -77,17 +77,17 @@ cd ${SCRIPTDIR}
 if [ "$BUILD_BUNDLE" -eq "1" ] && [ -d "p7zip" ]; then rm -rf "p7zip"; fi
 if [ -e ".p7zip.zip" ] && [ "$(find ./ -name ".p7zip.zip" -mtime +90)" ]; then rm ".p7zip.zip"; rm -rf "p7zip"; fi
 if [ ! -e ".p7zip.zip" ]; then
-	curl -L -o .p7zip.zip https://github.com/MegaGlest/megaglest-source/releases/download/3.3.0/p7zip.zip 2>/dev/null
+	curl -L -o .p7zip.zip https://github.com/Glest/glest-source/releases/download/3.3.0/p7zip.zip 2>/dev/null
 	# ^sha256: 20ac3b0377054f8196c10e569bd6ec7c6ed06d519fa39e781ee6d27d7887588b
 	if [ -e ".p7zip.zip" ]; then touch -m ".p7zip.zip"; fi
 fi
 if [ ! -d "p7zip" ]; then unzip .p7zip.zip >/dev/null; fi
 
 if [ "$BUILD_BUNDLE" -eq "1" ]; then
-	if [ -e "zetaglest" ] && [ "$(./zetaglest --version >/dev/null; echo "$?")" -eq "0" ]; then
+	if [ -e "glest" ] && [ "$(./glest --version >/dev/null; echo "$?")" -eq "0" ]; then
 		if [ -d "lib" ]; then rm -rf "lib"; fi
 		mkdir -p "lib"
-		list_of_libs="$(otool -L zetaglest | grep -v '/System/Library/Frameworks/' | grep -v '/usr/lib/' | awk '{print $1}' | sed '/:$/d')"
+		list_of_libs="$(otool -L glest | grep -v '/System/Library/Frameworks/' | grep -v '/usr/lib/' | awk '{print $1}' | sed '/:$/d')"
 		for (( i=1; i<=50; i++ )); do
 		    for dyn_lib in $list_of_libs; do
 			if [ "$(echo "$list_of_checked_libs" | grep "$dyn_lib")" = "" ]; then
@@ -113,7 +113,7 @@ $list_of_libs2" | sed '/:$/d' | sed '/^$/d' | sort -u )"
 			fi
 		fi
 	else
-		echo 'Error: Please run first at least once build-mg.sh script to be ready for prepare directory with dynamic libraries.'
+		echo 'Error: Please run first at least once build.sh script to be ready for prepare directory with dynamic libraries.'
 		# strange method but required for cpack/.dmg
 		exit 1
 	fi
@@ -201,15 +201,15 @@ if [ "$MAKE_ONLY" -eq "0" ]; then
 		EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX=''"
 		if [ "$GCC_FORCED" -ne "1" ] || [ "$USE_XCODE" -eq "1" ]; then :
 			#^ Remove this condition when it V will start working on gcc
-			#EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_ZETAGLEST_TESTS=ON"
+			#EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_GLEST_TESTS=ON"
 			#^ Uncomment when it will start working on clang
 		else
-			rm -f ../zetaglest_tests
+			rm -f ../glest_tests
 		fi
-		rm -f ../ZetaGlest*.dmg
+		rm -f ../Glest*.dmg
 	else
 		EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCPACK_GENERATOR=Bundle -DWANT_SINGLE_INSTALL_DIRECTORY=ON"
-		rm -f ../zetaglest_editor ../zetaglest_g3dviewer ../zetaglest_tests
+		rm -f ../glest_editor ../glest_g3dviewer ../glest_tests
 	fi
 	echo "Calling cmake with EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS}"
 	if [ "$USE_XCODE" -eq "1" ]; then
@@ -234,8 +234,8 @@ else
 		if [ "$?" -ne "0" ]; then echo 'ERROR: MAKE failed.' >&2; exit 2; fi
 	fi
 
-	if [ -d "../Debug" ]; then mv -f ../Debug/zetaglest* "$SCRIPTDIR"; rm -rf ../Debug
-	elif [ -d "../Release" ]; then mv -f ../Release/zetaglest* "$SCRIPTDIR"; rm -rf ../Release; fi
+	if [ -d "../Debug" ]; then mv -f ../Debug/glest* "$SCRIPTDIR"; rm -rf ../Debug
+	elif [ -d "../Release" ]; then mv -f ../Release/glest* "$SCRIPTDIR"; rm -rf ../Release; fi
 
 	cd ..
 	if [ "$BUILD_BUNDLE" -ne "1" ]; then
@@ -244,23 +244,23 @@ else
 		echo ''
 		echo '- - - - - - - - - - - - - - - - - - - -'
 		echo 'Mini test:'
-		echo '>>> zetaglest --version'
-		./zetaglest --version | head -3
-		#echo '>>> zetaglest_editor --help'
-		#./zetaglest_editor --help | head -3
-		#echo '>>> zetaglest_g3dviewer --help'
-		#./zetaglest_g3dviewer --help | head -3
+		echo '>>> glest --version'
+		./glest --version | head -3
+		#echo '>>> glest_editor --help'
+		#./glest_editor --help | head -3
+		#echo '>>> glest_g3dviewer --help'
+		#./glest_g3dviewer --help | head -3
 		echo 'Dependencies:'
-		otool -L zetaglest
+		otool -L glest
 		echo '- - - - - - - - - - - - - - - - - - - -'
 		echo ''
-		echo 'To launch ZetaGlest from the current directory, use:'
-		echo '  ./zetaglest'
+		echo 'To launch Glest from the current directory, use:'
+		echo '  ./glest'
 		echo ''
 	else
-		ls -lhA zetaglest
+		ls -lhA glest
 		echo ''
-		./zetaglest --version
+		./glest --version
 		echo ''
 	fi
 fi

mk/macos/bundle_resources/Glest.sh

@@ -10,9 +10,9 @@ if [ -d "$SCRIPTDIR/lib" ]; then
     binary_dir_path="$SCRIPTDIR"
 else
     export DYLD_LIBRARY_PATH="$SCRIPTDIR/../Frameworks"
-    binary_dir_path="$SCRIPTDIR/../Resources/zetaglest-game"
+    binary_dir_path="$SCRIPTDIR/../Resources/glest-game"
 fi
 export PATH="$binary_dir_path:$PATH"
 
-exec "$binary_dir_path/zetaglest" "$@"
+exec "$binary_dir_path/glest" "$@"
 exit "$?"

mk/macos/bundle_resources/Info.plist.in

@@ -5,17 +5,17 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>ZetaGlest</string>
+	<string>Glest</string>
 	<key>CFBundleGetInfoString</key>
-	<string>v${ZETAGLEST_VERSION}, © 2018 The ZetaGlest Team.</string>
+	<string>v${GLEST_VERSION}, © 2018 The Glest Team.</string>
 	<key>CFBundleIconFile</key>
-	<string>ZetaGlest</string>
+	<string>Glest</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.zetaglest.v${ZETAGLEST_VERSION}</string>
+	<string>org.glest.v${GLEST_VERSION}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>ZetaGlest</string>
+	<string>Glest</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>