From ef53a9508e3b0435b3839e277c0c8683fc8588fe Mon Sep 17 00:00:00 2001 From: Gonzalo Exequiel Pedone Date: Mon, 22 Feb 2021 16:34:29 -0300 Subject: [PATCH] Read package name and version from conf file. --- ports/deploy/deploy_mac.py | 8 ++++---- ports/deploy/deploy_posix.py | 16 +++++++--------- ports/deploy/deploy_posix_windows.py | 8 ++++---- ports/deploy/deploy_windows.py | 8 ++++---- ports/deploy/package_info.conf | 2 ++ 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ports/deploy/deploy_mac.py b/ports/deploy/deploy_mac.py index 8833ced..d58655d 100644 --- a/ports/deploy/deploy_mac.py +++ b/ports/deploy/deploy_mac.py @@ -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() diff --git a/ports/deploy/deploy_posix.py b/ports/deploy/deploy_posix.py index 9a6ebaa..cfbec41 100644 --- a/ports/deploy/deploy_posix.py +++ b/ports/deploy/deploy_posix.py @@ -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): diff --git a/ports/deploy/deploy_posix_windows.py b/ports/deploy/deploy_posix_windows.py index 5caa668..0e784f3 100644 --- a/ports/deploy/deploy_posix_windows.py +++ b/ports/deploy/deploy_posix_windows.py @@ -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') diff --git a/ports/deploy/deploy_windows.py b/ports/deploy/deploy_windows.py index e675507..9d0d31a 100644 --- a/ports/deploy/deploy_windows.py +++ b/ports/deploy/deploy_windows.py @@ -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') diff --git a/ports/deploy/package_info.conf b/ports/deploy/package_info.conf index a4b8530..1782bbb 100644 --- a/ports/deploy/package_info.conf +++ b/ports/deploy/package_info.conf @@ -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