[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] installer/common/scripts wininstaller.py, 1.5.156.1, 1.5.156.2
From:       jgordon () helixcommunity ! org
Date:       2013-10-23 7:26:58
[Download RAW message or body]

Update of /cvsroot/server/installer/common/scripts
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv20003

Modified Files:
      Tag: SERVER_NUCLEUS
	wininstaller.py 
Log Message:
-o output file option doesn't seem to work with signing.
working directory is probably getting changed or something.


Index: wininstaller.py
===================================================================
RCS file: /cvsroot/server/installer/common/scripts/wininstaller.py,v
retrieving revision 1.5.156.1
retrieving revision 1.5.156.2
diff -u -d -r1.5.156.1 -r1.5.156.2
--- wininstaller.py	22 Oct 2013 22:16:06 -0000	1.5.156.1
+++ wininstaller.py	23 Oct 2013 07:26:56 -0000	1.5.156.2
@@ -80,15 +80,18 @@
     def SignFiles(self, pattern, in_dir = '.', out_dir = None, 
                     recurse = False, sign_type = "helix", args = []):
         if (project.BuildOption("drmsign")):
-            if (not out_dir):
-                out_dir = project.output_dir
+            #if (not out_dir):
+            #    out_dir = project.output_dir
                 
             # two spaces after 'python', not a typo. workaround for a bug in windows forfiles
             # otherwise it will not send the first arg (script path) to python
             sign_cmd = 'python  "' + \
                         os.path.join(os.environ["BUILD_ROOT"], "bin", "sign.py") + \
-                        '" -t ' + sign_type + ' -o "' + out_dir + '\\\\@file" ' + \
-                        ' '.join(args) + ' "@path"'
+                        '" -t ' + sign_type 
+            if (out_dir):
+                sign_cmd += ' -o "' + out_dir + '\\\\@file" '
+                
+            sign_cmd += ' '.join(args) + ' "@path"'
             
             loop_cmd = '\tforfiles /p "' + in_dir + '" /m "' + pattern + '" '
             if (recurse):
@@ -102,10 +105,10 @@
             if (not in_dir or in_dir == ""):
                 in_dir = project.output_dir
                 
-            if (not out_dir or out_dir == ""):
-                out_dir = project.output_dir
-            else:
-                out_dir = os.path.join(project.output_dir, self.NativePath(out_dir))
+            #if (not out_dir or out_dir == ""):
+            #    out_dir = project.output_dir
+            #else:
+            #    out_dir = os.path.join(project.output_dir, self.NativePath(out_dir))
                 
             self.SignFiles(pattern, in_dir, out_dir, recurse, sign_type, args)
             
@@ -117,10 +120,10 @@
             else:
                 in_dir = os.path.join(self.tempdir, self.NativePath(in_dir))
                 
-            if (not out_dir or out_dir == ""):
-                out_dir = in_dir
-            else:
-                out_dir = os.path.join(self.tempdir, self.NativePath(out_dir))
+            #if (not out_dir or out_dir == ""):
+            #    out_dir = in_dir
+            #else:
+            #    out_dir = os.path.join(self.tempdir, self.NativePath(out_dir))
                   
             self.SignFiles(pattern, in_dir, out_dir, recurse, sign_type, args)
             


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]