Read package name and version from conf file.

This commit is contained in:
Gonzalo Exequiel Pedone 2021-02-22 16:34:29 -03:00
parent 1eb560543b
commit ef53a9508e
No known key found for this signature in database
GPG key ID: B8B09E63E9B85BAF
5 changed files with 21 additions and 21 deletions

View file

@ -40,19 +40,19 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
self.setRootDir(rootDir)
self.installDir = os.path.join(self.buildDir, 'ports/deploy/temp_priv')
self.pkgsDir = os.path.join(self.buildDir, 'ports/deploy/packages_auto', self.targetSystem)
self.detectQt(os.path.join(self.buildDir, 'Manager'))
self.detectQtIFW()
self.detectQtIFWVersion()
self.programName = 'AkVirtualCamera'
self.adminRights = True
self.packageConfig = os.path.join(self.rootDir, 'ports/deploy/package_info.conf')
self.rootInstallDir = os.path.join(self.installDir, 'Applications')
self.appBundleDir = os.path.join(self.rootInstallDir, self.programName + '.plugin')
self.execPrefixDir = os.path.join(self.appBundleDir, 'Contents')
self.binaryInstallDir = os.path.join(self.execPrefixDir, 'MacOS')
self.mainBinary = os.path.join(self.binaryInstallDir, self.programName)
self.programVersion = self.detectVersion(os.path.join(self.rootDir, 'commons.pri'))
self.detectMake()
self.binarySolver = DTBinaryMach.MachBinaryTools()
self.binarySolver.readExcludes(os.name, sys.platform)
self.packageConfig = os.path.join(self.rootDir, 'ports/deploy/package_info.conf')
self.dependencies = []
self.installerConfig = os.path.join(self.installDir, 'installer/config')
self.installerPackages = os.path.join(self.installDir, 'installer/packages')
@ -62,7 +62,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
self.changeLog = os.path.join(self.rootDir, 'ChangeLog')
self.outPackage = os.path.join(self.pkgsDir,
'{}-{}.dmg'.format(self.programName,
self.programVersion))
self.programVersion()))
def prepare(self):
self.detectTargetArch()

View file

@ -40,12 +40,13 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
self.setRootDir(rootDir)
self.installDir = os.path.join(self.buildDir, 'ports/deploy/temp_priv')
self.pkgsDir = os.path.join(self.buildDir, 'ports/deploy/packages_auto', sys.platform)
self.detectQt(os.path.join(self.buildDir, 'Manager'))
self.detectQtIFW()
self.detectQtIFWVersion()
self.rootInstallDir = os.path.join(self.installDir, self.qmakeQuery(var='QT_INSTALL_PREFIX')[1:])
self.packageConfig = os.path.join(self.rootDir, 'ports/deploy/package_info.conf')
self.binaryInstallDir = os.path.join(self.rootInstallDir, 'bin')
self.mainBinary = os.path.join(self.binaryInstallDir, 'webcamoid')
self.programName = os.path.basename(self.mainBinary)
self.programVersion = self.detectVersion(os.path.join(self.rootDir, 'commons.pri'))
self.detectMake()
xspec = self.qmakeQuery(var='QMAKE_XSPEC')
@ -56,7 +57,6 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
self.binarySolver = DTBinaryElf.ElfBinaryTools()
self.binarySolver.readExcludes(os.name, sys.platform)
self.packageConfig = os.path.join(self.rootDir, 'ports/deploy/package_info.conf')
self.dependencies = []
self.installerConfig = os.path.join(self.installDir, 'installer/config')
self.installerPackages = os.path.join(self.installDir, 'installer/packages')
@ -71,7 +71,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
self.changeLog = os.path.join(self.rootDir, 'ChangeLog')
self.outPackage = os.path.join(self.pkgsDir,
'{}-installer-{}-{}.run'.format(self.programName,
self.programVersion,
self.programVersion(),
platform.machine()))
def detectAppImage(self):
@ -102,8 +102,6 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
self.dependencies.append(dep)
def prepare(self):
print('Executing make install')
self.makeInstall(self.buildDir, self.installDir)
self.detectTargetArch()
self.appImage = self.detectAppImage()
print('Copying Qml modules\n')
@ -332,7 +330,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
packagePath = \
os.path.join(self.pkgsDir,
'{}-portable-{}-{}.tar.xz'.format(self.programName,
self.programVersion,
self.programVersion(),
platform.machine()))
if not os.path.exists(self.pkgsDir):
@ -364,7 +362,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
appDir = \
os.path.join(self.installDir,
'{}-{}-{}.AppDir'.format(self.programName,
self.programVersion,
self.programVersion(),
platform.machine()))
usrDir = os.path.join(appDir, 'usr')
@ -407,7 +405,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
packagePath = \
os.path.join(self.pkgsDir,
'{}-{}-{}.AppImage'.format(self.programName,
self.programVersion,
self.programVersion(),
platform.machine()))
if not os.path.exists(self.pkgsDir):

View file

@ -39,18 +39,18 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
self.targetSystem = 'posix_windows'
self.installDir = os.path.join(self.buildDir, 'ports/deploy/temp_priv')
self.pkgsDir = os.path.join(self.buildDir, 'ports/deploy/packages_auto/windows')
self.detectQt(os.path.join(self.buildDir, 'Manager'))
self.detectQtIFW()
self.detectQtIFWVersion()
self.programName = 'AkVirtualCamera'
self.adminRights = True
self.packageConfig = os.path.join(self.rootDir, 'ports/deploy/package_info.conf')
self.rootInstallDir = os.path.join(self.installDir, self.programName + '.plugin')
self.binaryInstallDir = os.path.join(self.rootInstallDir, 'bin')
self.mainBinary = os.path.join(self.binaryInstallDir, self.programName + '.exe')
self.programName = os.path.splitext(os.path.basename(self.mainBinary))[0]
self.programVersion = self.detectVersion(os.path.join(self.rootDir, 'commons.pri'))
self.detectMake()
self.binarySolver = DTBinaryPecoff.PecoffBinaryTools()
self.binarySolver.readExcludes(os.name, sys.platform)
self.packageConfig = os.path.join(self.rootDir, 'ports/deploy/package_info.conf')
self.dependencies = []
self.installerConfig = os.path.join(self.installDir, 'installer/config')
self.installerPackages = os.path.join(self.installDir, 'installer/packages')
@ -94,7 +94,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
arch = 'win32' if self.targetArch == '32bit' else 'win64'
self.outPackage = os.path.join(self.pkgsDir,
'{}-{}-{}.exe'.format(self.programName,
self.programVersion,
self.programVersion(),
arch))
print('Stripping symbols')

View file

@ -39,18 +39,18 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
self.setRootDir(rootDir)
self.installDir = os.path.join(self.buildDir, 'ports/deploy/temp_priv')
self.pkgsDir = os.path.join(self.buildDir, 'ports/deploy/packages_auto/windows')
self.detectQt(os.path.join(self.buildDir, 'Manager'))
self.detectQtIFW()
self.detectQtIFWVersion()
self.adminRights = True
self.programName = 'AkVirtualCamera'
self.packageConfig = os.path.join(self.rootDir, 'ports/deploy/package_info.conf')
self.rootInstallDir = os.path.join(self.installDir, self.programName + '.plugin')
self.binaryInstallDir = os.path.join(self.rootInstallDir, 'bin')
self.mainBinary = os.path.join(self.binaryInstallDir, self.programName + '.exe')
self.programName = os.path.splitext(os.path.basename(self.mainBinary))[0]
self.programVersion = self.detectVersion(os.path.join(self.rootDir, 'commons.pri'))
self.detectMake()
self.binarySolver = DTBinaryPecoff.PecoffBinaryTools()
self.binarySolver.readExcludes(os.name, sys.platform)
self.packageConfig = os.path.join(self.rootDir, 'ports/deploy/package_info.conf')
self.dependencies = []
self.installerConfig = os.path.join(self.installDir, 'installer/config')
self.installerPackages = os.path.join(self.installDir, 'installer/packages')
@ -73,7 +73,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
arch = 'win32' if self.targetArch == '32bit' else 'win64'
self.outPackage = os.path.join(self.pkgsDir,
'{}-{}-{}.exe'.format(self.programName,
self.programVersion,
self.programVersion(),
arch))
print('Stripping symbols')

View file

@ -1,5 +1,7 @@
[Package]
appName = AkVirtualCamera
packageName = akvirtualcamera
version = 9.0.0
description = AkVirtualCamera, virtual camera for Mac and Windows
url = https://github.com/webcamoid/akvirtualcamera
licenseDescription = GNU General Public License v3.0