StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor(Windows): Define installer macros right after creating them

Browse Source 
Breaks an inter-dependency between "MODERN UI" section needing CreateShortcut
and "PREPARE UNINST LOG" section needing LANG_ENGLISH, allowing "MODERN UI"
section to be done first.
This commit is contained in:
Anthony Bilinski 2022-03-02 20:26:13 -08:00
parent ee0334acc5
commit 5526d131a7
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
2 changed files with 32 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
windows/qtox.nsi
View File

@ -30,12 +30,14 @@ VIAddVersionKey "FileDescription" "${DESCRIPTION}"
VIAddVersionKey "FileVersion" "${VERSION}" VIAddVersionKey "FileVersion" "${VERSION}"
############## ##############
#UNINSTALL LOG #DEFINE MACROS
############## ##############
;AddItem macro ;AddItem macro
!macro AddItem Path !macro AddItem Path
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
!define AddItem "!insertmacro AddItem"
;File macro ;File macro
!macro File FileName !macro File FileName
@ -43,12 +45,14 @@ VIAddVersionKey "FileVersion" "${VERSION}"
FileWrite $UninstLog "$OUTDIR\${FileName}$\r$\n" FileWrite $UninstLog "$OUTDIR\${FileName}$\r$\n"
File "${FileName}" File "${FileName}"
!macroend !macroend
!define File "!insertmacro File"
;CreateShortcut macro ;CreateShortcut macro
!macro CreateShortcut FilePath FilePointer Pamameters Icon IconIndex !macro CreateShortcut FilePath FilePointer Pamameters Icon IconIndex
FileWrite $UninstLog "${FilePath}$\r$\n" FileWrite $UninstLog "${FilePath}$\r$\n"
CreateShortcut "${FilePath}" "${FilePointer}" "${Pamameters}" "${Icon}" "${IconIndex}" CreateShortcut "${FilePath}" "${FilePointer}" "${Pamameters}" "${Icon}" "${IconIndex}"
!macroend !macroend
!define CreateShortcut "!insertmacro CreateShortcut"
;Copy files macro ;Copy files macro
!macro CopyFiles SourcePath DestPath !macro CopyFiles SourcePath DestPath
@ -56,6 +60,7 @@ VIAddVersionKey "FileVersion" "${VERSION}"
FileWrite $UninstLog "${DestPath}$\r$\n" FileWrite $UninstLog "${DestPath}$\r$\n"
CopyFiles "${SourcePath}" "${DestPath}" CopyFiles "${SourcePath}" "${DestPath}"
!macroend !macroend
!define CopyFiles "!insertmacro CopyFiles"
;Rename macro ;Rename macro
!macro Rename SourcePath DestPath !macro Rename SourcePath DestPath
@ -63,24 +68,28 @@ VIAddVersionKey "FileVersion" "${VERSION}"
FileWrite $UninstLog "${DestPath}$\r$\n" FileWrite $UninstLog "${DestPath}$\r$\n"
Rename "${SourcePath}" "${DestPath}" Rename "${SourcePath}" "${DestPath}"
!macroend !macroend
!define Rename "!insertmacro Rename"
;CreateDirectory macro ;CreateDirectory macro
!macro CreateDirectory Path !macro CreateDirectory Path
CreateDirectory "${Path}" CreateDirectory "${Path}"
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
!define CreateDirectory "!insertmacro CreateDirectory"
;SetOutPath macro ;SetOutPath macro
!macro SetOutPath Path !macro SetOutPath Path
SetOutPath "${Path}" SetOutPath "${Path}"
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
!define SetOutPath "!insertmacro SetOutPath"
;WriteUninstaller macro ;WriteUninstaller macro
!macro WriteUninstaller Path !macro WriteUninstaller Path
WriteUninstaller "${Path}" WriteUninstaller "${Path}"
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
!define WriteUninstaller "!insertmacro WriteUninstaller"
;WriteIniStr macro ;WriteIniStr macro
!macro WriteIniStr IniFile SectionName EntryName NewValue !macro WriteIniStr IniFile SectionName EntryName NewValue
@ -94,12 +103,14 @@ VIAddVersionKey "FileVersion" "${VERSION}"
FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n" FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n"
WriteRegStr "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}" WriteRegStr "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}"
!macroend !macroend
!define WriteRegStr "!insertmacro WriteRegStr"
;WriteRegDWORD macro ;WriteRegDWORD macro
!macro WriteRegDWORD RegRoot UnInstallPath Key Value !macro WriteRegDWORD RegRoot UnInstallPath Key Value
FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n" FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n"
WriteRegDWORD "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}" WriteRegDWORD "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}"
!macroend !macroend
!define WriteRegDWORD "!insertmacro WriteRegDWORD"
;BackupFile macro ;BackupFile macro
!macro BackupFile FILE_DIR FILE BACKUP_TO !macro BackupFile FILE_DIR FILE BACKUP_TO
@ -108,12 +119,14 @@ VIAddVersionKey "FileVersion" "${VERSION}"
IfFileExists "${FILE_DIR}\${FILE}" 0 +2 IfFileExists "${FILE_DIR}\${FILE}" 0 +2
Rename "${FILE_DIR}\${FILE}" "${BACKUP_TO}\${FILE}" Rename "${FILE_DIR}\${FILE}" "${BACKUP_TO}\${FILE}"
!macroend !macroend
!define BackupFile "!insertmacro BackupFile"
;RestoreFile macro ;RestoreFile macro
!macro RestoreFile BUP_DIR FILE RESTORE_TO !macro RestoreFile BUP_DIR FILE RESTORE_TO
IfFileExists "${BUP_DIR}\${FILE}" 0 +2 IfFileExists "${BUP_DIR}\${FILE}" 0 +2
Rename "${BUP_DIR}\${FILE}" "${RESTORE_TO}\${FILE}" Rename "${BUP_DIR}\${FILE}" "${RESTORE_TO}\${FILE}"
!macroend !macroend
!define RestoreFile "!insertmacro RestoreFile"
;BackupFiles macro ;BackupFiles macro
!macro BackupFiles FILE_DIR FILE BACKUP_TO !macro BackupFiles FILE_DIR FILE BACKUP_TO
@ -127,12 +140,14 @@ VIAddVersionKey "FileVersion" "${VERSION}"
SetOutPath "${FILE_DIR}" SetOutPath "${FILE_DIR}"
File "${FILE}" #After the Original file is backed up write the new file. File "${FILE}" #After the Original file is backed up write the new file.
!macroend !macroend
!define BackupFiles "!insertmacro BackupFiles"
;RestoreFiles macro ;RestoreFiles macro
!macro RestoreFiles BUP_FILE RESTORE_FILE !macro RestoreFiles BUP_FILE RESTORE_FILE
IfFileExists "${BUP_FILE}" 0 +2 IfFileExists "${BUP_FILE}" 0 +2
CopyFiles "${BUP_FILE}" "${RESTORE_FILE}" CopyFiles "${BUP_FILE}" "${RESTORE_FILE}"
!macroend !macroend
!define RestoreFiles "!insertmacro RestoreFiles"
################### ###################
#PREPARE UNINST LOG #PREPARE UNINST LOG
@ -144,48 +159,6 @@ VIAddVersionKey "FileVersion" "${VERSION}"
;Uninstall log file missing. ;Uninstall log file missing.
LangString UninstLogMissing ${LANG_ENGLISH} "${UninstLog} not found!$\r$\nUninstallation cannot proceed!" LangString UninstLogMissing ${LANG_ENGLISH} "${UninstLog} not found!$\r$\nUninstallation cannot proceed!"
;AddItem macro
!define AddItem "!insertmacro AddItem"
;BackupFile macro
!define BackupFile "!insertmacro BackupFile"
;BackupFiles macro
!define BackupFiles "!insertmacro BackupFiles"
;Copy files macro
!define CopyFiles "!insertmacro CopyFiles"
;CreateDirectory macro
!define CreateDirectory "!insertmacro CreateDirectory"
;CreateShortcut macro
!define CreateShortcut "!insertmacro CreateShortcut"
;File macro
!define File "!insertmacro File"
;Rename macro
!define Rename "!insertmacro Rename"
;RestoreFile macro
!define RestoreFile "!insertmacro RestoreFile"
;RestoreFiles macro
!define RestoreFiles "!insertmacro RestoreFiles"
;SetOutPath macro
!define SetOutPath "!insertmacro SetOutPath"
;WriteRegDWORD macro
!define WriteRegDWORD "!insertmacro WriteRegDWORD"
;WriteRegStr macro
!define WriteRegStr "!insertmacro WriteRegStr"
;WriteUninstaller macro
!define WriteUninstaller "!insertmacro WriteUninstaller"
Section -openlogfile Section -openlogfile
CreateDirectory "$INSTDIR" CreateDirectory "$INSTDIR"
IfFileExists "$INSTDIR\${UninstLog}" +3 IfFileExists "$INSTDIR\${UninstLog}" +3

59
windows/qtox64.nsi
View File

@ -30,12 +30,14 @@ VIAddVersionKey "FileDescription" "${DESCRIPTION}"
VIAddVersionKey "FileVersion" "${VERSION}" VIAddVersionKey "FileVersion" "${VERSION}"
############## ##############
#UNINSTALL LOG #DEFINE MACROS
############## ##############
;AddItem macro ;AddItem macro
!macro AddItem Path !macro AddItem Path
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
!define AddItem "!insertmacro AddItem"
;File macro ;File macro
!macro File FileName !macro File FileName
@ -43,12 +45,14 @@ VIAddVersionKey "FileVersion" "${VERSION}"
FileWrite $UninstLog "$OUTDIR\${FileName}$\r$\n" FileWrite $UninstLog "$OUTDIR\${FileName}$\r$\n"
File "${FileName}" File "${FileName}"
!macroend !macroend
!define File "!insertmacro File"
;CreateShortcut macro ;CreateShortcut macro
!macro CreateShortcut FilePath FilePointer Pamameters Icon IconIndex !macro CreateShortcut FilePath FilePointer Pamameters Icon IconIndex
FileWrite $UninstLog "${FilePath}$\r$\n" FileWrite $UninstLog "${FilePath}$\r$\n"
CreateShortcut "${FilePath}" "${FilePointer}" "${Pamameters}" "${Icon}" "${IconIndex}" CreateShortcut "${FilePath}" "${FilePointer}" "${Pamameters}" "${Icon}" "${IconIndex}"
!macroend !macroend
!define CreateShortcut "!insertmacro CreateShortcut"
;Copy files macro ;Copy files macro
!macro CopyFiles SourcePath DestPath !macro CopyFiles SourcePath DestPath
@ -56,6 +60,7 @@ VIAddVersionKey "FileVersion" "${VERSION}"
FileWrite $UninstLog "${DestPath}$\r$\n" FileWrite $UninstLog "${DestPath}$\r$\n"
CopyFiles "${SourcePath}" "${DestPath}" CopyFiles "${SourcePath}" "${DestPath}"
!macroend !macroend
!define CopyFiles "!insertmacro CopyFiles"
;Rename macro ;Rename macro
!macro Rename SourcePath DestPath !macro Rename SourcePath DestPath
@ -63,24 +68,28 @@ VIAddVersionKey "FileVersion" "${VERSION}"
FileWrite $UninstLog "${DestPath}$\r$\n" FileWrite $UninstLog "${DestPath}$\r$\n"
Rename "${SourcePath}" "${DestPath}" Rename "${SourcePath}" "${DestPath}"
!macroend !macroend
!define Rename "!insertmacro Rename"
;CreateDirectory macro ;CreateDirectory macro
!macro CreateDirectory Path !macro CreateDirectory Path
CreateDirectory "${Path}" CreateDirectory "${Path}"
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
!define CreateDirectory "!insertmacro CreateDirectory"
;SetOutPath macro ;SetOutPath macro
!macro SetOutPath Path !macro SetOutPath Path
SetOutPath "${Path}" SetOutPath "${Path}"
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
!define SetOutPath "!insertmacro SetOutPath"
;WriteUninstaller macro ;WriteUninstaller macro
!macro WriteUninstaller Path !macro WriteUninstaller Path
WriteUninstaller "${Path}" WriteUninstaller "${Path}"
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
!define WriteUninstaller "!insertmacro WriteUninstaller"
;WriteIniStr macro ;WriteIniStr macro
!macro WriteIniStr IniFile SectionName EntryName NewValue !macro WriteIniStr IniFile SectionName EntryName NewValue
@ -94,12 +103,14 @@ VIAddVersionKey "FileVersion" "${VERSION}"
FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n" FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n"
WriteRegStr "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}" WriteRegStr "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}"
!macroend !macroend
!define WriteRegStr "!insertmacro WriteRegStr"
;WriteRegDWORD macro ;WriteRegDWORD macro
!macro WriteRegDWORD RegRoot UnInstallPath Key Value !macro WriteRegDWORD RegRoot UnInstallPath Key Value
FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n" FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n"
WriteRegDWORD "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}" WriteRegDWORD "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}"
!macroend !macroend
!define WriteRegDWORD "!insertmacro WriteRegDWORD"
;BackupFile macro ;BackupFile macro
!macro BackupFile FILE_DIR FILE BACKUP_TO !macro BackupFile FILE_DIR FILE BACKUP_TO
@ -108,12 +119,14 @@ VIAddVersionKey "FileVersion" "${VERSION}"
IfFileExists "${FILE_DIR}\${FILE}" 0 +2 IfFileExists "${FILE_DIR}\${FILE}" 0 +2
Rename "${FILE_DIR}\${FILE}" "${BACKUP_TO}\${FILE}" Rename "${FILE_DIR}\${FILE}" "${BACKUP_TO}\${FILE}"
!macroend !macroend
!define BackupFile "!insertmacro BackupFile"
;RestoreFile macro ;RestoreFile macro
!macro RestoreFile BUP_DIR FILE RESTORE_TO !macro RestoreFile BUP_DIR FILE RESTORE_TO
IfFileExists "${BUP_DIR}\${FILE}" 0 +2 IfFileExists "${BUP_DIR}\${FILE}" 0 +2
Rename "${BUP_DIR}\${FILE}" "${RESTORE_TO}\${FILE}" Rename "${BUP_DIR}\${FILE}" "${RESTORE_TO}\${FILE}"
!macroend !macroend
!define RestoreFile "!insertmacro RestoreFile"
;BackupFiles macro ;BackupFiles macro
!macro BackupFiles FILE_DIR FILE BACKUP_TO !macro BackupFiles FILE_DIR FILE BACKUP_TO
@ -127,12 +140,14 @@ VIAddVersionKey "FileVersion" "${VERSION}"
SetOutPath "${FILE_DIR}" SetOutPath "${FILE_DIR}"
File "${FILE}" #After the Original file is backed up write the new file. File "${FILE}" #After the Original file is backed up write the new file.
!macroend !macroend
!define BackupFiles "!insertmacro BackupFiles"
;RestoreFiles macro ;RestoreFiles macro
!macro RestoreFiles BUP_FILE RESTORE_FILE !macro RestoreFiles BUP_FILE RESTORE_FILE
IfFileExists "${BUP_FILE}" 0 +2 IfFileExists "${BUP_FILE}" 0 +2
CopyFiles "${BUP_FILE}" "${RESTORE_FILE}" CopyFiles "${BUP_FILE}" "${RESTORE_FILE}"
!macroend !macroend
!define RestoreFiles "!insertmacro RestoreFiles"
################### ###################
#PREPARE UNINST LOG #PREPARE UNINST LOG
@ -144,48 +159,6 @@ VIAddVersionKey "FileVersion" "${VERSION}"
;Uninstall log file missing. ;Uninstall log file missing.
LangString UninstLogMissing ${LANG_ENGLISH} "${UninstLog} not found!$\r$\nUninstallation cannot proceed!" LangString UninstLogMissing ${LANG_ENGLISH} "${UninstLog} not found!$\r$\nUninstallation cannot proceed!"
;AddItem macro
!define AddItem "!insertmacro AddItem"
;BackupFile macro
!define BackupFile "!insertmacro BackupFile"
;BackupFiles macro
!define BackupFiles "!insertmacro BackupFiles"
;Copy files macro
!define CopyFiles "!insertmacro CopyFiles"
;CreateDirectory macro
!define CreateDirectory "!insertmacro CreateDirectory"
;CreateShortcut macro
!define CreateShortcut "!insertmacro CreateShortcut"
;File macro
!define File "!insertmacro File"
;Rename macro
!define Rename "!insertmacro Rename"
;RestoreFile macro
!define RestoreFile "!insertmacro RestoreFile"
;RestoreFiles macro
!define RestoreFiles "!insertmacro RestoreFiles"
;SetOutPath macro
!define SetOutPath "!insertmacro SetOutPath"
;WriteRegDWORD macro
!define WriteRegDWORD "!insertmacro WriteRegDWORD"
;WriteRegStr macro
!define WriteRegStr "!insertmacro WriteRegStr"
;WriteUninstaller macro
!define WriteUninstaller "!insertmacro WriteUninstaller"
Section -openlogfile Section -openlogfile
CreateDirectory "$INSTDIR" CreateDirectory "$INSTDIR"
IfFileExists "$INSTDIR\${UninstLog}" +3 IfFileExists "$INSTDIR\${UninstLog}" +3