Skip to content

Commit 70e3a0e

Browse files
committed
Ajusto instalador nsis para no incluir vcredist si incluyo DLL
1 parent 0986b99 commit 70e3a0e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

nsis.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,12 @@ def __init__(self,
220220
self.comserver_files_dll = [self.chop(p) for p in comserver_files if p.lower().endswith(".dll")]
221221

222222
def chop(self, pathname):
223+
global install_vcredist
223224
#print pathname, self.dist_dir
224225
#assert pathname.startswith(self.dist_dir)
226+
if 'Microsoft.VC90.CRT.manifest' in pathname:
227+
# clean redistributable instructions (DLL files already included)
228+
install_vcredist = ""
225229
return pathname[len(self.dist_dir):]
226230

227231
def create(self, pathname="base.nsi"):
@@ -240,7 +244,7 @@ def create(self, pathname="base.nsi"):
240244
'copyright': self.copyright,
241245
'install_dir': self.name,
242246
'reg_key': self.name,
243-
'out_file': "instalador-%s-%s.exe" % (self.name, self.version),
247+
'out_file': "%s-%s.exe" % (self.name, self.version),
244248
'install_vcredist': install_vcredist if sys.version_info > (2, 7) else "",
245249
'register_com_servers_exe': ''.join([register_com_server_exe % comserver for comserver in self.comserver_files_exe]),
246250
'register_com_servers_dll': ''.join([register_com_server_dll % comserver for comserver in self.comserver_files_dll]),
@@ -261,4 +265,4 @@ def __init__(self, module, **kw):
261265
self.description = module.__doc__
262266
self.company_name = "Sistemas Agiles"
263267
self.copyright = module.__copyright__
264-
self.name = "Interfaz PyAfipWs - %s" % os.path.basename(module.__file__).replace(".pyc", ".py")
268+
self.name = "Interfaz PyAfipWs - %s" % os.path.basename(module.__file__).replace(".pyc", ".py")

0 commit comments

Comments
 (0)