windows installer:

- also install settings to correct location, don't override old ones
- refactor the directoyr finding in installer builds

Author: Totto16

meson.build

@@ -14,6 +14,9 @@ project(
     version: '0.5.5',
 )
 
+oopetris_author = 'Coder2k'
+oopetris_name = 'OOPetris'
+
 subdir('tools/options')
 
 subdir('tools/dependencies')
@@ -90,6 +93,8 @@ else
                 command: [
                     makensis,
                     '-DVERSION=' + meson.project_version(),
+                    '-DNAME=' + oopetris_name,
+                    '-DAUTHOR=' + oopetris_author,
                     '-DPROJECT_SOURCE_DIR=' + meson.project_source_root(),
                     '-DPROJECT_BUILD_DIR=' + meson.project_build_root(),
                     nsis_script,

platforms/windows/meson.build

@@ -8,10 +8,12 @@ patch_version = version_arr[2].to_int()
 rc_conf = configuration_data(
   {
     'OOPETRIS_VERSION': meson.project_version(),
+    'OOPETRIS_NAME': oopetris_name,
+    'OOPETRIS_AUTHOR': oopetris_author,
     'OOPETRIS_MAJOR_VERSION': major_version,
     'OOPETRIS_MINOR_VERSION': minor_version,
     'OOPETRIS_PATCH_VERSION': patch_version,
-    'PROJECT_SOURCE_DIR': meson.project_source_root().replace('\\','/'),
+    'PROJECT_SOURCE_DIR': meson.project_source_root().replace('\\', '/'),
   },
 )
 

platforms/windows/oopetris.rc.in

@@ -9,9 +9,9 @@ VS_VERSION_INFO VERSIONINFO
     BEGIN
       BLOCK "040904B0"
       BEGIN
-	VALUE "FileDescription", "OOpetris"
+	VALUE "FileDescription", "@OOPETRIS_NAME@"
 	VALUE "FileVersion", "@[email protected]"
-	VALUE "ProductName", "OOpetris"
+	VALUE "ProductName", "@OOPETRIS_NAME@"
 	VALUE "ProductVersion", "@OOPETRIS_VERSION@"
       END
     END

src/helper/constants.hpp

@@ -7,13 +7,13 @@ namespace constants {
 #define STRINGIFY(a) STRINGIFY_HELPER_(a) //NOLINT(cppcoreguidelines-macro-usage)
 #define STRINGIFY_HELPER_(a) #a           //NOLINT(cppcoreguidelines-macro-usage)
 
-#if !defined(OOPETRIS_VERSION)
-#define OOPETRIS_VERSION "Unknown"
+#if !defined(OOPETRIS_NAME) || !defined(OOPETRIS_AUTHOR) || !defined(OOPETRIS_VERSION)
+#error "not all needed OOPETRIS_* macros defined"
 #endif
 
 
-    constexpr auto program_name = StaticString{ "oopetris" };
-    constexpr auto author = StaticString{ "coder2k" };
+    constexpr auto program_name = StaticString{ STRINGIFY(OOPETRIS_NAME) };
+    constexpr auto author = StaticString{ STRINGIFY(OOPETRIS_AUTHOR) };
     constexpr auto version = StaticString{ STRINGIFY(OOPETRIS_VERSION) };
     constexpr auto music_change_level = 30;
     constexpr auto recordings_directory = "recordings";

src/helper/graphic_utils.cpp

@@ -37,7 +37,7 @@ std::vector<std::string> utils::supported_features() {
     }
     return std::filesystem::path{ std::string{ pref_path } };
 #elif defined(__CONSOLE__)
-    // this is in the sdcard of the switch, since internal storage is read-only for applications!
+    // this is in the sdcard of the switch / 3ds , since internal storage is read-only for applications!
     return std::filesystem::path{ "." };
 #elif defined(BUILD_INSTALLER)
 #if defined(FLATPAK_BUILD)
@@ -48,13 +48,14 @@ std::vector<std::string> utils::supported_features() {
     }
 
     return std::filesystem::path{ data_home };
-#else
-    // this call also creates the dir (at least tries to) it returns
+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
     char* pref_path = SDL_GetPrefPath(constants::author, constants::program_name);
     if (!pref_path) {
         throw std::runtime_error{ "Failed in getting the Pref Path: " + std::string{ SDL_GetError() } };
     }
-    return std::filesystem::path{ std::string{ pref_path } };
+    return std::filesystem::path{ pref_path };
+#else
+#error "unrecognized installer build"
 #endif
 #else
     // this is only used in local build for debugging, when compiling in release mode the path is real path where the app can store many things without interfering with other things (eg. AppData\Roaming\... on Windows or  .local/share/... on Linux )
@@ -72,24 +73,18 @@ std::vector<std::string> utils::supported_features() {
     // this is in the internal storage of the nintendo switch, it ios mounted by libnx (runtime switch support library) and filled at compile time with assets (its called ROMFS there)
     return std::filesystem::path{ "romfs:/assets" };
 #elif defined(BUILD_INSTALLER)
-
-#if defined(FLATPAK_BUILD)
     // if you build in BUILD_INSTALLER mode, you have to assure that the data is there e.g. music  + fonts!
-    const char* resource_path = "/app/share/oopetris/";
+#if defined(FLATPAK_BUILD)
+    return std::filesystem::path{ "/app/share/oopetris/assets/" };
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
     char* resource_path = SDL_GetBasePath();
     if (!resource_path) {
         throw std::runtime_error{ "Failed in getting the Base Path: " + std::string{ SDL_GetError() } };
     }
-
+    return std::filesystem::path{ resource_path } / "assets";
 #else
-    char* resource_path = SDL_GetPrefPath(constants::author, constants::program_name);
-    if (!resource_path) {
-        throw std::runtime_error{ "Failed in getting the Pref Path: " + std::string{ SDL_GetError() } };
-    }
-
+#error "unrecognized installer build"
 #endif
-    return std::filesystem::path{ std::string{ resource_path } } / "assets";
 #else
     return std::filesystem::path{ "assets" };
 #endif

tools/installer/setup.nsi

@@ -17,10 +17,16 @@
 !error "PROJECT_BUILD_DIR not specified"
 !endif
 
+!ifndef NAME
+!error "NAME not specified"
+!endif
+
+!ifndef AUTHOR
+!error "AUTHOR not specified"
+!endif
 
 ;--------------------------------
 ; Custom defines
-!define NAME "OOPetris"
 !define APPFILE "oopetris.exe"
 !define APP_UNINSTALLER_FILE "Uninstall.exe"
 !define SLUG "${NAME} v${VERSION}"
@@ -87,6 +93,11 @@ Section "Core App" CoreApp
     SetOutPath "$INSTDIR"
     File /a "${PROJECT_SOURCE_DIR}\subprojects\discord_game_sdk-3.2.1\lib\x86_64\discord_game_sdk.dll"
 
+    ; install default settings (DO NOT Override)
+    SetOutPath "$APPDATA\${AUTHOR}\${NAME}"
+    SetOverwrite off
+    File  "${PROJECT_SOURCE_DIR}\settings.json"
+    SetOverwrite on
 
     WriteRegStr HKCU "Software\${NAME}" "InstallDir" $INSTDIR
     WriteUninstaller "$INSTDIR\${APP_UNINSTALLER_FILE}"
@@ -172,6 +183,8 @@ Section "Uninstall"
   RMDir /r "$INSTDIR"
   ${RMDirUP} "$INSTDIR"
 
+  ; note settings are NOT removed!
+
   ; delete start menu entry
   Delete '$SMPROGRAMS\${NAME}\${NAME}.lnk' 
   Delete '$SMPROGRAMS\${NAME}\Uninstall ${NAME}.lnk'
@@ -191,4 +204,4 @@ Section "Uninstall"
 
   ; delete the whole reg key
   DeleteRegKey HKCU "Software\${NAME}"
-SectionEnd
+SectionEnd

tools/options/meson.build

@@ -1,8 +1,11 @@
-
 core_lib = {
     'src_files': [],
     'inc_dirs': [],
-    'compile_args': ['-DOOPETRIS_VERSION=' + meson.project_version()],
+    'compile_args': [
+        '-DOOPETRIS_VERSION=' + meson.project_version(),
+        '-DOOPETRIS_NAME=' + oopetris_name,
+        '-DOOPETRIS_AUTHOR=' + oopetris_author,
+    ],
     'deps': [],
 }
 
@@ -23,7 +26,6 @@ graphics_lib = {
 global_deps = []
 graphic_application_deps = []
 
-
 cpp = meson.get_compiler('cpp')
 
 build_with_libcpp = false
@@ -64,10 +66,8 @@ if (
     get_option('buildtype') == 'debug'
     or get_option('buildtype') == 'debugoptimized'
 )
-#TODO: replace with ! NDEBUG in cpp files and remove this
+    #TODO: replace with ! NDEBUG in cpp files and remove this
     core_lib += {
         'compile_args': [core_lib.get('compile_args'), '-DDEBUG_BUILD'],
     }
 endif
-
-