Replace logo and clean up packaging

src/CMakeLists.txt

@@ -67,7 +67,6 @@ if(APPLE)
                  MACOSX_BUNDLE
                  ${SMDATA_ALL_FILES_SRC}
                  ${SMDATA_ALL_FILES_HPP})
-  set_target_properties("${SM_EXE_NAME}" PROPERTIES MACOSX_BUNDLE TRUE)
 else()
   if(MSVC)
     foreach(sm_src_file ${SMDATA_ALL_FILES_SRC})
@@ -198,21 +197,7 @@ elseif(APPLE)
       RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO
       "${SM_ROOT_DIR}"
       MACOSX_BUNDLE_INFO_PLIST
-      "${SM_XCODE_DIR}/Info.plist.in"
-      XCODE_ATTRIBUTE_INFOPLIST_PREPROCESS
-      "YES"
-      XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=Release]
-      "RELEASE"
-      XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=Debug]
-      "DEBUG"
-      XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=MinSizeRel]
-      "MINSIZEREL"
-      XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=RelWithDebInfo]
-      "RELWITHDEBINFO"
-      XCODE_ATTRIBUTE_GCC_PREFIX_HEADER
-      "${CMAKE_CURRENT_SOURCE_DIR}/archutils/Darwin/StepMania.pch"
-      XCODE_ATTRIBUTE_GCC_ENABLE_CPP_EXCEPTIONS
-      "NO")
+      "${SM_XCODE_DIR}/Info.plist.in")
 
   set(APPLE_BUNDLE_RESOURCES
     "${SM_ROOT_DIR}/Announcers"
@@ -252,7 +237,7 @@ elseif(APPLE)
                      COMMAND ${CMAKE_COMMAND} -E make_directory
                              "$<TARGET_FILE_DIR:ITGmania>/../Resources"
                      COMMAND ${CMAKE_COMMAND} -E copy
-                             "${SM_XCODE_DIR}/smicon.icns"
+                             "${SM_XCODE_DIR}/logo.icns"
                              "$<TARGET_FILE_DIR:ITGmania>/../Resources/"
                      COMMAND ${CMAKE_COMMAND} -E copy
                              "${SM_XCODE_DIR}/Hardware.plist"

src/CommandLineActions.cpp

@@ -24,44 +24,8 @@
 #include <conio.h>
 #endif
 
-/** @brief The directory where languages should be installed. */
-const RString INSTALLER_LANGUAGES_DIR = "Themes/_Installer/Languages/";
-
 vector<CommandLineActions::CommandLineArgs> CommandLineActions::ToProcess;
 
-static void Nsis()
-{
-	RageFile out;
-	if(!out.Open("nsis_strings_temp.inc", RageFile::WRITE))
-		RageException::Throw("Error opening file for write.");
-
-	vector<RString> vs;
-	GetDirListing(INSTALLER_LANGUAGES_DIR + "*.ini", vs, false, false);
-	for (RString const &s : vs)
-	{
-		RString sThrowAway, sLangCode;
-		splitpath(s, sThrowAway, sLangCode, sThrowAway);
-		const LanguageInfo *pLI = GetLanguageInfo(sLangCode);
-
-		RString sLangNameUpper = pLI->szEnglishName;
-		sLangNameUpper.MakeUpper();
-
-		IniFile ini;
-		if(!ini.ReadFile(INSTALLER_LANGUAGES_DIR + s))
-			RageException::Throw("Error opening file for read.");
-		FOREACH_CONST_Child(&ini, child)
-		{
-			FOREACH_CONST_Attr(child, attr)
-			{
-				RString sName = attr->first;
-				RString sValue = attr->second->GetValue<RString>();
-				sValue.Replace("\\n", "$\\n");
-				RString sLine = ssprintf("LangString %s ${LANG_%s} \"%s\"", sName.c_str(), sLangNameUpper.c_str(), sValue.c_str());
-				out.PutLine(sLine);
-			}
-		}
-	}
-}
 static void LuaInformation()
 {
 	XNode *pNode = LuaHelpers::GetLuaInformation();
@@ -107,11 +71,6 @@ void CommandLineActions::Handle(LoadingWindow* pLW)
 	ToProcess.push_back(args);
 
 	bool bExitAfter = false;
-	if( GetCommandlineArgument("ExportNsisStrings") )
-	{
-		Nsis();
-		bExitAfter = true;
-	}
 	if( GetCommandlineArgument("ExportLuaInformation") )
 	{
 		LuaInformation();

src/ProductInfo.h

@@ -1,5 +1,3 @@
-/** @brief ProductInfo - Branding strings. Don't forget to also change ProductInfo.inc! */
-
 #ifndef PRODUCT_INFO_H
 #define PRODUCT_INFO_H
 
@@ -20,8 +18,8 @@
 #define PRODUCT_STRINGIFY(x) #x
 #define PRODUCT_XSTRINGIFY(x) PRODUCT_STRINGIFY(x)
 
-#define PRODUCT_FAMILY		PRODUCT_XSTRINGIFY(PRODUCT_FAMILY_BARE)
-#define PRODUCT_ID			PRODUCT_XSTRINGIFY(PRODUCT_ID_BARE)
+#define PRODUCT_FAMILY	PRODUCT_XSTRINGIFY(PRODUCT_FAMILY_BARE)
+#define PRODUCT_ID	PRODUCT_XSTRINGIFY(PRODUCT_ID_BARE)
 
 #define VIDEO_TROUBLESHOOTING_URL "http://old.stepmania.com/stepmaniawiki.php?title=Video_Driver_Troubleshooting"
 /** @brief The URL to report bugs on the program. */

src/ProductInfo.inc

@@ -1,28 +0,0 @@
-; Included by the NSIS installer script
-; Don't forget to also change ProductInfo.h!
-
-; a friendly string to refer to the product
-!define PRODUCT_FAMILY "ITGmania"
-!define PRODUCT_ID "ITGmania"
-; TODO: This needs to be updated with the git rev hash
-!define PRODUCT_VER "0.5.1"
-!define PRODUCT_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}"
-!define PRODUCT_BITMAP "sm5"
-
-!define PRODUCT_URL "https://www.itgmania.com/"
-!define UPDATES_URL "https://www.itgmania.com/"
-
-;!define INSTALL_EXTERNAL_PCKS
-;!define INSTALL_INTERNAL_PCKS
-!define INSTALL_PROGRAM_LIBRARIES
-!define INSTALL_EXECUTABLES
-!define INSTALL_NON_PCK_FILES
-!define ASSOCIATE_SMZIP
-!define ASSOCIATE_SMURL
-;!define SHOW_AUTORUN
-!define MAKE_OPEN_PROGRAM_FOLDER_SHORTCUT
-!define MAKE_OPEN_SETTINGS_FOLDER_SHORTCUT
-;!define DIRECTX_81_REDIST_PRESENT
-;!define MAKE_UPDATES_SHORTCUT
-!define CRC_CHECK
-!define COMPRESS

src/archutils/Win32/WindowsResources.rc

@@ -173,7 +173,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON                ICON                    "StepMania.ICO"
+IDI_ICON                ICON                    "logo.ico"
 IDI_ICON1               ICON                    "smzip.ico"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -198,7 +198,7 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "ITGmania Team \n http://www.itgmania.com/"
+            VALUE "CompanyName", "ITGmania Team \n https://www.itgmania.com/"
             VALUE "FileDescription", "ITGmania"
             VALUE "FileVersion", "0, 5, 1, 0"
             VALUE "InternalName", "ITGmania"

src/smpackage-net2008.vcproj

@@ -350,7 +350,7 @@
 				>
 			</File>
 			<File
-				RelativePath="res\StepMania.ICO"
+				RelativePath="res\logo.ico"
 				>
 			</File>
 		</Filter>