use meson to gate windows specific build things

Author: yournamem

.gitignore

@@ -10,4 +10,5 @@ generate_stylesheets.sh
 .flatpak/
 .potrans
 .editorconfig
-oldpng/
+oldpng/
+deploy/

JortsInstaller.nsi

@@ -0,0 +1,131 @@
+!include "MUI2.nsh"
+
+Name Jorts
+
+Outfile "JortsInstaller.exe"
+InstallDir "$LOCALAPPDATA\Programs\Jorts"
+#RequestExecutionLevel admin  ; Request administrative privileges
+
+# Set the title of the installer window
+Caption "Jorts Installer"
+
+# Set the title and text on the welcome page
+!define MUI_WELCOMEPAGE_TITLE "Welcome to Jorts setup"
+!define MUI_WELCOMEPAGE_TEXT "This bitch will guide you through the installation of Jorts."
+!define MUI_ABORTWARNING
+!define MUI_ABORTWARNING_TEXT "Are you sure you want to cancel Jorts setup?"
+!define MUI_INSTFILESPAGE_TEXT "Please wait while Jorts is being installed."
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+!insertmacro MUI_LANGUAGE "English"
+
+!macro GetCleanDir INPUTDIR
+  ; ATTENTION: USE ON YOUR OWN RISK!
+  ; Please report bugs here: http://stefan.bertels.org/
+  !define Index_GetCleanDir 'GetCleanDir_Line${__LINE__}'
+  Push $R0
+  Push $R1
+  StrCpy $R0 "${INPUTDIR}"
+  StrCmp $R0 "" ${Index_GetCleanDir}-finish
+  StrCpy $R1 "$R0" "" -1
+  StrCmp "$R1" "\" ${Index_GetCleanDir}-finish
+  StrCpy $R0 "$R0\"
+${Index_GetCleanDir}-finish:
+  Pop $R1
+  Exch $R0
+  !undef Index_GetCleanDir
+!macroend
+
+; ################################################################
+; similar to "RMDIR /r DIRECTORY", but does not remove DIRECTORY itself
+; example: !insertmacro RemoveFilesAndSubDirs "$INSTDIR"
+!macro RemoveFilesAndSubDirs DIRECTORY
+  ; ATTENTION: USE ON YOUR OWN RISK!
+  ; Please report bugs here: http://stefan.bertels.org/
+  !define Index_RemoveFilesAndSubDirs 'RemoveFilesAndSubDirs_${__LINE__}'
+
+  Push $R0
+  Push $R1
+  Push $R2
+
+  !insertmacro GetCleanDir "${DIRECTORY}"
+  Pop $R2
+  FindFirst $R0 $R1 "$R2*.*"
+${Index_RemoveFilesAndSubDirs}-loop:
+  StrCmp $R1 "" ${Index_RemoveFilesAndSubDirs}-done
+  StrCmp $R1 "." ${Index_RemoveFilesAndSubDirs}-next
+  StrCmp $R1 ".." ${Index_RemoveFilesAndSubDirs}-next
+  IfFileExists "$R2$R1\*.*" ${Index_RemoveFilesAndSubDirs}-directory
+  ; file
+  Delete "$R2$R1"
+  goto ${Index_RemoveFilesAndSubDirs}-next
+${Index_RemoveFilesAndSubDirs}-directory:
+  ; directory
+  RMDir /r "$R2$R1"
+${Index_RemoveFilesAndSubDirs}-next:
+  FindNext $R0 $R1
+  Goto ${Index_RemoveFilesAndSubDirs}-loop
+${Index_RemoveFilesAndSubDirs}-done:
+  FindClose $R0
+
+  Pop $R2
+  Pop $R1
+  Pop $R0
+  !undef Index_RemoveFilesAndSubDirs
+!macroend
+
+Section "Install"
+    SetOutPath "$INSTDIR"
+    File /r "windows\deploy\*"
+    CreateDirectory $SMPROGRAMS\Jorts
+
+    ; Start menu
+    CreateShortCut "$SMPROGRAMS\Jorts\Jorts.lnk" "$INSTDIR\bin\jorts.exe" "" "$INSTDIR\windows\jorts.ico" 0
+    
+    ; Autostart
+    ; CreateShortCut "$SMPROGRAMS\Startup\Jorts.lnk" "$INSTDIR\bin\jorts.exe" "" "$INSTDIR\windows\jorts.ico" 0
+    
+    ; Preferences
+    CreateShortCut "$SMPROGRAMS\Jorts\Preferences of Jorts.lnk" "$INSTDIR\bin\jorts.exe" "--preferences" "$INSTDIR\windows\jorts.ico" 0
+
+
+    
+    WriteRegStr HKCU "Software\Jorts" "" $INSTDIR
+    WriteUninstaller "$INSTDIR\Uninstall.exe"
+    
+    ; Add to Add/Remove programs list
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "DisplayName" "Jorts"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "UninstallString" "$INSTDIR\Uninstall.exe"
+SectionEnd
+
+Section "Uninstall"
+
+    ; Remove Start Menu shortcut
+    Delete "$SMPROGRAMS\Jorts\Jorts.lnk"
+    Delete "$SMPROGRAMS\Startup\Jorts.lnk"
+
+    ; Remove uninstaller
+    Delete "$INSTDIR\Uninstall.exe"
+    
+    ; Remove files and folders
+    !insertmacro RemoveFilesAndSubDirs "$INSTDIR"
+
+    ; Remove directories used
+    RMDir $SMPROGRAMS\Jorts
+    RMDir "$INSTDIR"
+
+    ; Remove registry keys
+    DeleteRegKey HKCU "Software\Jorts"
+    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts"
+
+SectionEnd
+

data/meson.build

@@ -16,6 +16,10 @@ i18n.merge_file(
     install_dir: get_option('datadir') / 'applications'
 )
 
+
+# metainfo confuses windows
+if not windows
+
 #Translate and install our .metainfo file
 i18n.merge_file(
     input: 'jorts.metainfo.xml.in',
@@ -25,6 +29,7 @@ i18n.merge_file(
     install_dir: get_option('datadir') / 'metainfo'
 )
 
+endif
 
 #======== ICONS ========
 

meson.build

@@ -20,8 +20,12 @@ else
     vala_flags = ['--define', 'DEFAULT']
 endif
 
-add_project_arguments(vala_flags, language: 'vala')
+windows = get_option('windows')
+if windows
+    vala_flags += ['--define', 'WINDOWS']
+endif
 
+add_project_arguments(vala_flags, language: 'vala')
 
 #================================
 # Import the stylesheet
@@ -49,10 +53,11 @@ dependencies = [
         dependency('json-glib-1.0'),
         dependency('gee-0.8'),
         dependency('gtk4'),
-        dependency('libportal')
     ]
 
-
+if not windows
+    dependencies += dependency('libportal')
+endif
 
 #================================
 

meson_options.txt

@@ -3,4 +3,9 @@ option('variant',
     choices : ['default', 'pride', 'halloween'],
     value : ['default'],
     description : 'The name of the seasonal icon and style to use. Only the first value is chosen.'
+)
+option('windows',
+    type : 'boolean',
+    value : true,
+    description : 'Whether we build for windows'
 )

src/Views/PreferencesView.vala

@@ -84,6 +84,7 @@
                 /****************************************************/
                 /*               Autostart Request                  */
                 /****************************************************/
+#if !WINDOWS
 
                                     Xdp.Portal portal = new Xdp.Portal ();
                 GenericArray<weak string> cmd = new GenericArray<weak string> ();
@@ -148,7 +149,7 @@
                 autostart_box.append (autostart_label);
                 autostart_box.append (both_buttons);
                 settingsbox.append (autostart_box);
-
+#endif
             /*************************************************/
             // Bar at the bottom
             var actionbar = new Gtk.CenterBox () {

src/meson.build

@@ -5,7 +5,6 @@ sources = files (
 
     'Utils' / 'ZoomConvert.vala',
     'Utils' / 'Random.vala',
-    'Utils' / 'Libportal.vala',
 
     'Services' / 'Constants.vala',
     'Services' / 'Storage.vala',
@@ -31,6 +30,10 @@ sources = files (
     'Application.vala',
 )
 
+if not windows
+    sources += files('Utils' / 'Libportal.vala')
+endif
+
 #================================
 # Let's define our executable
 executable(
@@ -39,5 +42,6 @@ executable(
     config_file,
     sources,
     dependencies: dependencies,
+   win_subsystem: 'windows',
     install : true
 )

windows/deploy.sh

@@ -4,15 +4,15 @@
 # Run app from base directory, not ./windows
 # Write path UNIX-style ("/"). Script will invert the slash where relevant.
 app_name="Jorts"
-build_dir="../builddir"
+build_dir="builddir"
 theme_name="io.elementary.stylesheet.blueberry"
-font_path="font"
+font_path="windows/fonts"
 
-deploy_dir="deploy"
-exe_name="jorts.exe"
-icon_file="jorts.ico"
-icon_file_install="install.ico"
-icon_file_uninstall="uninstall.ico"
+deploy_dir="windows/deploy"
+exe_name="io.github.ellie_commons.jorts.exe"
+icon_file="windows/jorts.ico"
+icon_file_install="windows/install.ico"
+icon_file_uninstall="windows/uninstall.ico"
 
 #PRE MESON
 #Skip refresh package
@@ -44,12 +44,13 @@ done
 # Copy other required things for Gtk to work nicely
 echo "Copying other necessary files..."
 cp /mingw64/bin/gdbus.exe ${deploy_dir}/bin/gdbus.exe
-cp -r /mingw64/etc/gtk-3.0 ${deploy_dir}/etc/gtk-3.0
-cp -r /mingw64/etc/gtk-4.0 ${deploy_dir}/etc/gtk-4.0
+#cp -r /mingw64/etc/gtk-3.0 ${deploy_dir}/etc/gtk-3.0
+#cp -r /mingw64/etc/gtk-4.0 ${deploy_dir}/etc/gtk-4.0
 cp -r /mingw64/etc/fonts ${deploy_dir}/etc/fonts
 
 # Redacted Script
-cp -r ${font_path} ${deploy_dir}/etc/fonts/${font_path}
+mkdir ${deploy_dir}/etc/fonts/redactedscript
+cp -r ${font_path} ${deploy_dir}/etc/fonts/redactedscript/
 
 mkdir -p ${deploy_dir}/lib/gdk-pixbuf-2.0/2.10.0
 cp -r /mingw64/lib/gdk-pixbuf-2.0/2.10.0 ${deploy_dir}/lib/gdk-pixbuf-2.0
@@ -173,8 +174,6 @@ Section "Install"
     
     ; Preferences
     CreateShortCut "\$SMPROGRAMS\\${app_name}\\Preferences of ${app_name}.lnk" "\$INSTDIR\bin\\${exe_name}" "--preferences" "\$INSTDIR\\${icon_file/\//\\}" 0
-
-
     
     WriteRegStr HKCU "Software\\${app_name}" "" \$INSTDIR
     WriteUninstaller "\$INSTDIR\Uninstall.exe"

windows/fonts/RedactedScript-Regular.ttf

@@ -1,7 +1,14 @@
 #!/bin/bash
 
+# cd /c/Documents and Settings/TC/Desktop/jorts
 
-pacman -S mingw-w64-ucrt-x86_64-{gtk4,vala,granite7,ninja,meson,nsis}
+pacman -S mingw-w64-ucrt-x86_64-{gtk4,vala,granite7,ninja,meson,nsis,gcc}
 pacman -S mingw-w64-libgee mingw-w64-gsettings-desktop-schemas
+pacman -S mingw-w64-x86_64-desktop-file-utils
+ pacman -S mingw-w64-x86_64-gtk-elementary-theme mingw-w64-x86_64-elementary-icon-theme
+
+# No its not redundant
+pacman -S meson gcc ninja
+pacman -S pacman -S –mmingw-w64-ucrt-x86_64-vala mingw-w64-x86_64-vala
 
 wget https://github.com/christiannaths/redacted-font/raw/63e542017bab347ba9be54d7d99b99d4754c3d97/RedactedScript/fonts/ttf/RedactedScript-Regular.ttf -O font/RedactedScript-Regular.ttf