Write package setup and add msi for x64 and x86
This commit is contained in:
parent
a647b78021
commit
7fbe0b271a
|
@ -1,5 +1,5 @@
|
|||
package : fws-outlook-ddaddin
|
||||
version : 1.0.12-0
|
||||
version : 1.0.12-3
|
||||
architecture : all
|
||||
section : base
|
||||
priority : optional
|
||||
|
@ -7,7 +7,7 @@ maintainer : Daniel Berteaud <daniel@firewall-services.com>
|
|||
description : Drag and Drop from Outlook to Web Page, SAP, Java, etc.
|
||||
depends :
|
||||
conflicts :
|
||||
maturity : DEV
|
||||
maturity : PROD
|
||||
locale :
|
||||
target_os : windows
|
||||
min_os_version :
|
||||
|
@ -29,4 +29,4 @@ package_uuid :
|
|||
signer :
|
||||
signer_fingerprint:
|
||||
signature_date :
|
||||
signed_attributes :
|
||||
signed_attributes :
|
Binary file not shown.
Binary file not shown.
22
setup.py
22
setup.py
|
@ -1,17 +1,29 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from setuphelpers import *
|
||||
import json
|
||||
from cryptography.fernet import Fernet
|
||||
import os
|
||||
from jinja2 import Environment, FileSystemLoader
|
||||
|
||||
uninstallkey = []
|
||||
variables = {
|
||||
# 'ddaddin_license': '[2][FWS #-1][2019-04-17 12:41:43][-1][21][123456789]'
|
||||
}
|
||||
|
||||
# Read local variables file if available
|
||||
if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(makepath(programfiles32,'wapt','private','variables.txt')):
|
||||
print('Reading local encrypted variables file')
|
||||
from cryptography.fernet import Fernet
|
||||
import yaml
|
||||
f = Fernet(open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read())
|
||||
variables.update(json.loads(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
|
||||
variables.update(yaml.safe_load(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
|
||||
|
||||
def install():
|
||||
version = control['version'].split('-',1)[0]
|
||||
print('Installing Outlook DDAddin plugin %s' % version)
|
||||
if not 'ddaddin_license' in variables:
|
||||
error('DDAddin license not set in variables, can\'t install')
|
||||
|
||||
props = {
|
||||
'DDADDIN_LICENSE': '"' + variables['ddaddin_license'] + '"'
|
||||
}
|
||||
install_msi_if_needed('ddaddin32.msi',min_version=version,properties=props)
|
||||
# On x64, install both versions
|
||||
if iswin64():
|
||||
install_msi_if_needed('ddaddin64.msi',min_version=version,properties=props)
|
Loading…
Reference in New Issue