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

List:       kde-commits
Subject:    [emerge] bin/Packager: make it possible to transfer multiple files in the future
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2015-09-24 14:37:04
Message-ID: E1Zf7dw-0002kw-OG () scm ! kde ! org
[Download RAW message or body]

Git commit eb6131940e4bad7a41e0af077147d73b8213da93 by Patrick Spendrin.
Committed on 24/09/2015 at 14:35.
Pushed by sengels into branch 'master'.

make it possible to transfer multiple files in the future

M  +7    -4    bin/Packager/MSIFragmentPackager.py

http://commits.kde.org/emerge/eb6131940e4bad7a41e0af077147d73b8213da93

diff --git a/bin/Packager/MSIFragmentPackager.py \
b/bin/Packager/MSIFragmentPackager.py index 9873e63..8fb0ed2 100644
--- a/bin/Packager/MSIFragmentPackager.py
+++ b/bin/Packager/MSIFragmentPackager.py
@@ -31,8 +31,8 @@ class MSIFragmentPackager( PackagerBase ):
     def __init__( self, initialized = False ):
         if not initialized: PackagerBase.__init__( self )
         utils.debug( "MSIFragmentPackager __init__", 2 )
-        self.outfile = os.path.join( self.packageDestinationDir(), "%s.wxs" % \
                self.package )
-        self.objfile = self.outfile.replace( "wxs", "wix" ) + "obj"
+        self.outDestination = self.packageDestinationDir()
+        self.objectFiles = []
 
 
     def generateFragment( self ):
@@ -70,11 +70,14 @@ class MSIFragmentPackager( PackagerBase ):
                 currentFile.setAttribute( "Source", os.path.join( \
"$(var.%sImageDir)" % self.package, relDir, _f ) )  currentComponent.appendChild( \
currentFile )  
-        out = open( self.outfile, 'w' )
+        outfile = os.path.join( self.outDestination, "%s.wxs" % self.package )
+        out = open( outfile, 'w' )
         wxs.writexml( out, "", "    ", "\n", encoding = "utf-8" )
         out.close()
+        objfile = outfile.replace(".wxs", ".wixobj")
 
-        utils.system( "candle -o %s -d%sImageDir=%s %s" % ( self.objfile, \
self.package, self.imageDir(), self.outfile ) ) +        utils.system( "candle -o %s \
-d%sImageDir=%s %s" % ( objfile, self.package, self.imageDir(), outfile ) ) +        \
self.objectFiles.append( objfile )  
 
     def createPackage( self ):


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