Changeset View
Changeset View
Standalone View
Standalone View
extragear/kdeconnect-kde/kdeconnect-kde.py
| Show All 19 Lines | 12 | def setDependencies(self): | |||
|---|---|---|---|---|---|
| 20 | self.runtimeDependencies["kde/frameworks/tier3/knotifications"] = None | 20 | self.runtimeDependencies["kde/frameworks/tier3/knotifications"] = None | ||
| 21 | self.runtimeDependencies["kde/frameworks/tier3/kcmutils"] = None | 21 | self.runtimeDependencies["kde/frameworks/tier3/kcmutils"] = None | ||
| 22 | self.runtimeDependencies["kde/frameworks/tier1/breeze-icons"] = None | 22 | self.runtimeDependencies["kde/frameworks/tier1/breeze-icons"] = None | ||
| 23 | self.runtimeDependencies["libs/qt5/qtmultimedia"] = None | 23 | self.runtimeDependencies["libs/qt5/qtmultimedia"] = None | ||
| 24 | 24 | | |||
| 25 | class Package(CMakePackageBase): | 25 | class Package(CMakePackageBase): | ||
| 26 | def __init__(self): | 26 | def __init__(self): | ||
| 27 | CMakePackageBase.__init__(self) | 27 | CMakePackageBase.__init__(self) | ||
| 28 | self.blacklist_file = [ | | |||
| 29 | PackagerLists.runtimeBlacklist, | | |||
| 30 | os.path.join(os.path.dirname(__file__), "blacklist.txt") | | |||
| 31 | ] | | |||
| 32 | 28 | | |||
| 33 | def createPackage(self): | 29 | def createPackage(self): | ||
| 30 | self.blacklist_file.append(os.path.join(self.packageDir(), "blacklist.txt")) | ||||
| 31 | | ||||
| 32 | self.defines["caption"] = self.binaryArchiveName(fileType=None).capitalize() | ||||
| 34 | self.defines["executable"] = "bin\\kdeconnect-indicator.exe" | 33 | self.defines["executable"] = "bin\\kdeconnect-indicator.exe" | ||
vonreth: no need to set, default is display name | |||||
I think you should not set the execuatable, firstly he key is deprecated use shortcuts instead and you handle the installation of shortcuts in "sections" vonreth: I think you should not set the execuatable, firstly he key is deprecated use shortcuts instead… | |||||
| 35 | self.defines["icon"] = os.path.join(os.path.dirname(__file__), "icon.ico") | 34 | self.defines["icon"] = os.path.join(os.path.dirname(__file__), "icon.ico") | ||
vonreth: just leave it to the default | |||||
| 36 | self.defines["appname"] = "kdeconnect-indicator" | 35 | self.defines["appname"] = "kdeconnect-indicator" | ||
| 37 | 36 | | |||
| 37 | self.defines["nsis_include"] = f"!include {self.packageDir()}\\SnoreNotify.nsh" | ||||
| 38 | self.defines["sections"] = r""" | ||||
| 39 | !define MyApp_AppUserModelId org.kde.kdeconnect.daemon | ||||
| 40 | !define SnoreToastExe "$INSTDIR\bin\SnoreToast.exe" | ||||
| 41 | | ||||
| 42 | Section "@{productname}" | ||||
| 43 | SectionIn 1 | ||||
| 44 | !insertmacro MUI_STARTMENU_WRITE_BEGIN Application | ||||
| 45 | !insertmacro SnoreShortcut "$SMPROGRAMS\@{productname}.lnk" "$INSTDIR\bin\@{appname}.exe" "${MyApp_AppUserModelId}" | ||||
| 46 | CreateShortCut "$SMPROGRAMS\Startup\@{productname}.lnk" "$INSTDIR\bin\@{appname}.exe" | ||||
| 47 | CreateShortCut "$DESKTOP\@{productname}.lnk" "$INSTDIR\bin\@{appname}.exe" | ||||
| 48 | !insertmacro MUI_STARTMENU_WRITE_END | ||||
| 49 | SectionEnd | ||||
| 50 | """ | ||||
| 51 | self.defines["un_sections"]=r""" | ||||
| 52 | Section "Un.Remove Shortcuts" | ||||
| 53 | Delete "$SMPROGRAMS\@{productname}.lnk" | ||||
| 54 | Delete "$SMPROGRAMS\Startup\@{productname}.lnk" | ||||
| 55 | Delete "$DESKTOP\@{productname}.lnk" | ||||
| 56 | SectionEnd | ||||
| 57 | """ | ||||
| 38 | self.ignoredPackages.append("binary/mysql") | 58 | self.ignoredPackages.append("binary/mysql") | ||
| 39 | 59 | | |||
| 40 | return TypePackager.createPackage(self) | 60 | return TypePackager.createPackage(self) | ||
| 41 | 61 | | |||
This one is wrong, see the condition above, I guess we need to update the snorensis script to use the correct context instead vonreth: This one is wrong, see the condition above, I guess we need to update the snorensis script to… | |||||
Wrong, snoretoast needs to allow absolute paths to install, so that the shortcut is installed correctly for all users vonreth: Wrong, snoretoast needs to allow absolute paths to install, so that the shortcut is installed… | |||||
| 42 | def preArchive(self): | 62 | def preArchive(self): | ||
| 43 | archiveDir = self.archiveDir() | 63 | archiveDir = self.archiveDir() | ||
| 44 | 64 | | |||
| 45 | # move everything to the location where Qt expects it | 65 | # move everything to the location where Qt expects it | ||
| 46 | pluginPath = os.path.join(archiveDir, "plugins") | 66 | pluginPath = os.path.join(archiveDir, "plugins") | ||
| 47 | binPath = os.path.join(archiveDir, "bin") | 67 | binPath = os.path.join(archiveDir, "bin") | ||
| 48 | libPath = os.path.join(archiveDir, "lib") | 68 | libPath = os.path.join(archiveDir, "lib") | ||
| 49 | 69 | | |||
| Show All 18 Lines | |||||
no need to set, default is display name