Differential D19740 Diff 54878 extragear/kexi/kexi/kexi.py

Changeset View

Standalone View

View Options

extragear/kexi/kexi/kexi.py

1import info 1​import info
2from CraftOS.osutils import OsUtils 2​from CraftOS.osutils import OsUtils
3 3​from CraftStandardDirs import CraftStandardDirs
4​import datetime
5​import os
6​import subprocess
4 7​
5class subinfo(info.infoclass): 8​class subinfo(info.infoclass):
6 def setTargets(self): 9​ def setTargets(self):
7 self.versionInfo.setDefaultValues() 10​ self.versionInfo.setDefaultValues()
11​ self.versionStrings = {}
12​ self.versionSemantic = {}
13​
14​ ver = '3.1'
15​ #self.svnTargets[ver] = f"git://anongit.kde.org/kexi|{ver}"
16​ self.versionStrings[ver] = '3.1.0 Preview' # TODO update on release
17​ self.versionSemantic[ver] = '3.1.0' # TODO update on release
18​
19​ ver = '3.2' # TODO update on release
20​ #self.svnTargets[ver] = f"git://anongit.kde.org/kexi|{ver}"
21​ self.versionStrings[ver] = '3.2.0 Preview' # TODO update on release
22​ self.versionSemantic[ver] = '3.2.0' # TODO update on release
23​
24​ ver = 'master'
25​ #self.svnTargets[ver] = f"git://anongit.kde.org/kexi|master"
26​ self.versionStrings[ver] = '3.3 Alpha' # TODO update on release
27​ self.versionSemantic[ver] = '3.2.90' # TODO update on release
8 28​
9 self.description = "A visual database applications builder" 29​ self.description = "A visual database applications builder"
10 self.displayName = "KEXI" 30​ self.displayName = "KEXI"
31​ self.website = "http://kexi-project.org"
11 self.options.configure.args = " -DBUILD_EXAMPLES=ON" 32​ self.options.configure.args = " -DBUILD_EXAMPLES=ON"
12 33​
34​ def registerOptions(self):
35​ self.options.dynamic.registerOption("buildForDesktop", True)
vonrethUnsubmitted
Done

can you provide a more speaking option name :D

vonreth: can you provide a more speaking option name :D
staniekAuthorUnsubmitted
Done

"buildForDesktop" ?

staniek: "buildForDesktop" ?
36​
13 def setDependencies(self): 37​ def setDependencies(self):
14 self.runtimeDependencies["virtual/base"] = None 38​ self.runtimeDependencies["virtual/base"] = None
15 self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None 39​ self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None
16 self.runtimeDependencies["libs/glib"] = None # mdb 40​ self.runtimeDependencies["libs/glib"] = None # mdb
17 self.runtimeDependencies["libs/sqlite"] = None # migration 41​ self.runtimeDependencies["libs/sqlite"] = None # migration
18 self.runtimeDependencies["binary/mysql"] = None # migration 42​ self.runtimeDependencies["binary/mysql"] = None # migration
19 #TODO self.runtimeDependencies["binary/postgresql"] = None # migration 43​ #TODO self.runtimeDependencies["binary/postgresql"] = None # migration
20 self.runtimeDependencies["libs/qt5/qtbase"] = None 44​ self.runtimeDependencies["libs/qt5/qtbase"] = None
21 self.runtimeDependencies["libs/qt5/qtwebkit"] = None 45​ self.runtimeDependencies["libs/qt5/qtwebkit"] = None
22 self.runtimeDependencies["kdesupport/kdewin"] = None 46​ self.runtimeDependencies["kdesupport/kdewin"] = None
23 self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None 47​ self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None
24 self.runtimeDependencies["kde/frameworks/tier1/kcodecs"] = None 48​ self.runtimeDependencies["kde/frameworks/tier1/kcodecs"] = None
25 self.runtimeDependencies["kde/frameworks/tier1/kcoreaddons"] = None 49​ self.runtimeDependencies["kde/frameworks/tier1/kcoreaddons"] = None
26 self.runtimeDependencies["kde/frameworks/tier1/kguiaddons"] = None 50​ self.runtimeDependencies["kde/frameworks/tier1/kguiaddons"] = None
27 self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None 51​ self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None
28 self.runtimeDependencies["kde/frameworks/tier1/kwidgetsaddons"] = None 52​ self.runtimeDependencies["kde/frameworks/tier1/kwidgetsaddons"] = None
29 self.runtimeDependencies["kde/frameworks/tier3/kconfigwidgets"] = None 53​ self.runtimeDependencies["kde/frameworks/tier3/kconfigwidgets"] = None
30 self.runtimeDependencies["kde/frameworks/tier3/kiconthemes"] = None 54​ self.runtimeDependencies["kde/frameworks/tier3/kiconthemes"] = None
31 self.runtimeDependencies["kde/frameworks/tier3/ktextwidgets"] = None 55​ self.runtimeDependencies["kde/frameworks/tier3/ktextwidgets"] = None
32 self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = None 56​ self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = None
33 self.runtimeDependencies["extragear/kexi/kdb"] = None 57​ self.runtimeDependencies["extragear/kexi/kdb"] = None
34 self.runtimeDependencies["extragear/kexi/kproperty"] = None 58​ self.runtimeDependencies["extragear/kexi/kproperty"] = None
35 self.runtimeDependencies["extragear/kexi/kreport"] = None 59​ self.runtimeDependencies["extragear/kexi/kreport"] = None
36 # Desktop only: 60​
37 self.runtimeDependencies["kde/frameworks/tier2/kcompletion"] = None 61​ if self.options.dynamic.buildForDesktop:
38 self.runtimeDependencies["kde/frameworks/tier3/kio"] = None 62​ # Desktop only:
39 self.runtimeDependencies["kde/frameworks/tier3/ktexteditor"] = None 63​ self.runtimeDependencies["kde/frameworks/tier2/kcompletion"] = None
40 self.runtimeDependencies["kde/frameworks/tier3/ktextwidgets"] = None 64​ self.runtimeDependencies["kde/frameworks/tier3/kio"] = None
41 if OsUtils.isLinux(): 65​ self.runtimeDependencies["kde/frameworks/tier3/ktexteditor"] = None
42 self.runtimeDependencies["kde/frameworks/tier2/kcrash"] = None 66​ self.runtimeDependencies["kde/frameworks/tier3/ktextwidgets"] = None
67​ self.runtimeDependencies["kde/plasma/breeze"] = None
68​ if OsUtils.isLinux():
69​ self.runtimeDependencies["kde/frameworks/tier2/kcrash"] = None
43 70​
44 71​
45from Package.CMakePackageBase import * 72​from Package.CMakePackageBase import *
46 73​
47 74​
48class Package(CMakePackageBase): 75​class Package(CMakePackageBase):
49 def __init__(self): 76​ def __init__(self):
50 CMakePackageBase.__init__(self) 77​ CMakePackageBase.__init__(self)
51 78​
79​ def preArchive(self):
80​ for file in ["COPYING.DOC", "COPYING.LIB", "COPYING", "AUTHORS", "README.md", "README.PACKAGERS.md"]:
81​ utils.copyFile(os.path.join(self.sourceDir(), file),
82​ os.path.join(self.installDir(), file), False)
83​ return super().preArchive()
84​
52 def createPackage(self): 85​ def createPackage(self):
53 # TODO 86​ self.defines["version_semantic"] = self.subinfo.versionSemantic[self.subinfo.buildTarget]
54 #self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) 87​ ver = self.subinfo.versionStrings[self.subinfo.buildTarget]
55 self.defines["executable"] = "bin\\kexi.exe" 88​ isAlpha = ver.endswith("Alpha")
56 #self.defines["icon"] = os.path.join(self.packageDir(), "kexi.ico") 89​ isPreview = "Preview" in ver
90​ if isAlpha or isPreview: # add git hash and date for Alphas/Previews
vonrethUnsubmitted
Not Done

Is there a need for this special versioning? We had problems with this before, I'd recommend to just rename the file before distributing it.
On builds from git we put the git revision in the file name anyhow.

vonreth: Is there a need for this special versioning? We had problems with this before, I'd recommend to…
91​ oldwd = os.getcwd()
92​ os.chdir(self.sourceDir())
93​ gitHash = subprocess.check_output(
94​ ["git", "rev-parse", "--short", self.subinfo.buildTarget],
95​ universal_newlines=True).strip()
96​ oldwd = os.getcwd()
97​ os.chdir(self.sourceDir())
98​ if isAlpha:
99​ date = subprocess.check_output(
100​ ["git", "show", "--no-patch", "--format=%ci", self.subinfo.buildTarget],
101​ universal_newlines=True).strip().split(" ")[0]
102​ elif isPreview:
103​ date = str(datetime.date.today())
104​ os.chdir(oldwd)
105​ ver = f"{ver} {date} ({gitHash})"
106​ self.defines["version"] = ver
107​ #default: self.defines["company"] = "KDE"
vonrethUnsubmitted
Done

just use displayname in subinfo

vonreth: just use displayname in subinfo
108​ self.defines["assoc_executable"] = f"bin/kexi-{self.subinfo.buildTarget}.exe"
109​ self.defines["assoc_extension"] = ".kexi"
vonrethUnsubmitted
Done

just set self.webpage in subinfo

vonreth: just set self.webpage in subinfo
110​ self.defines["assoc_description"] = "KEXI project file"
vonrethUnsubmitted
Done

don't define executable but use shortcuts directly

vonreth: don't define executable but use shortcuts directly
staniekAuthorUnsubmitted
Done

Trying this:

self.defines["assoc_executable"] = f"bin/kexi-{self.subinfo.buildTarget}.exe"
self.defines["assoc_extension"] = ".kexi"
self.defines["assoc_description"] = "KEXI project file"
self.defines["shortcuts"] = [
    {"name" : f"{self.defines['productname']} {self.defines['version']}",
     "target" : self.defines["assoc_executable"],
     "description" : self.subinfo.description}
]
staniek: Trying this: self.defines["assoc_executable"] = f"bin/kexi-{self.subinfo.buildTarget}.
111​ self.defines["shortcuts"] = [
112​ {"name" : f"{self.subinfo.displayName} {self.defines['version']}",
113​ "target" : self.defines["assoc_executable"],
114​ "description" : self.subinfo.description}
115​ ]
116​ self.defines["icon"] = os.path.join(self.buildDir(), "src", "_source_var.ico")
117​ self.defines["icon_png"] = os.path.join(self.sourceDir(), "kexi", "icons", "src", "data", "128-apps-kexi.png")
118​ self.defines["license"] = os.path.join(self.sourceDir(), "COPYING.LIB")
119​ # user-friendly filename
120​ arch = '32' if CraftCore.compiler.isX86() else '64'
121​ filename = f"{self.subinfo.displayName}_{self.defines['version']}_Win{arch}.exe".replace(' ', '_')
122​ self.defines["setupname"] = os.path.join(self.packageDestinationDir(), filename)
123​
124​ self.whitelist_file.append(os.path.join(self.packageDir(), "whitelist.txt"))
125​ self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt'))
126​
127​ self.ignoredPackages.append("libs/hunspell")
128​ self.ignoredPackages.append("data/hunspell-dictionaries")
129​ self.ignoredPackages.append("libs/d3dcompiler")
130​ self.ignoredPackages.append("libs/qt5/qttools")
131​ self.ignoredPackages.append("libs/qt5/qtscript")
132​ self.ignoredPackages.append("libs/qt5/qtlocation")
133​ self.ignoredPackages.append("libs/qt5/qtsensors")
134​ self.ignoredPackages.append("libs/qt5/qtquickcontrols2")
135​ # no, needed by Qt5WebKit: self.ignoredPackages.append("libs/qt5/qtmultimedia")
136​ # no, needed by Qt5WebKit: self.ignoredPackages.append("libs/qt5/qtwebchannel")
137​ # no, needed by Qt5WebKit: self.ignoredPackages.append("qt-libs/phonon")
138​
139​ # no, needed by something: self.ignoredPackages.append("kde/frameworks/tier1/sonnet")
140​ self.ignoredPackages.append("kde/frameworks/tier2/kpackage")
141​ self.ignoredPackages.append("kde/frameworks/tier3/kemoticons")
142​ self.ignoredPackages.append("kde/frameworks/tier3/kdeclarative")
143​ self.ignoredPackages.append("kde/frameworks/tier3/kdesignerplugin")
144​ self.ignoredPackages.append("kde/frameworks/tier3/knewstuff")
145​ self.ignoredPackages.append("kde/frameworks/tier3/kwallet") # pulled in by kio
146​ self.ignoredPackages.append("kde/frameworks/tier3/plasma-framework")
147​
57 # TODO: find a way to extend the default script 148​ # TODO: find a way to extend the default script
58 #self.scriptname = os.path.join(self.packageDir(), "NullsoftInstaller.nsi") 149​ self.scriptname = os.path.join(self.packageDir(), "NullsoftInstaller.nsi")
59 #self.ignoredPackages.append("binary/mysql") 150​ utils.copyFile(os.path.join(self.packageDir(), "FileAssociation.nsh"),
151​ self.workDir(), False) # needed in workdir
152​ utils.copyFile(os.path.join(CraftStandardDirs.craftBin(), "Packager", "Nsis", "process.nsh"),
vonrethUnsubmitted
Not Done

No need to copy those files, should be handled by nsis_include_internal
and nsis_include

vonreth: No need to copy those files, should be handled by nsis_include_internal and nsis_include
153​ self.workDir(), False) # needed in workdir
60 154​
61 return TypePackager.createPackage(self) 155​ return TypePackager.createPackage(self)
vonrethUnsubmitted
Done

Can you copy them in the preArchive stepp?

def preArchive(self):
    for file in ["COPYING.DOC", "COPYING.LIB", "COPYING", "AUTHORS", "README.md", "README.PACKAGERS.md"]:
        utils.copyFile(os.path.join(self.sourceDir(), file),
                       os.path.join(self.installDir(), file), False)
    return True`
vonreth: Can you copy them in the preArchive stepp? ``` def preArchive(self): for file in…