From kde-commits  Thu Sep 24 14:37:04 2015
From: Patrick Spendrin <ps_ml () gmx ! de>
Date: Thu, 24 Sep 2015 14:37:04 +0000
To: kde-commits
Subject: [emerge] bin/Packager: make it possible to transfer multiple files in the future
Message-Id: <E1Zf7dw-0002kw-OG () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=144310543514950

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/MSIFragment=
Packager.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 =3D False ):
         if not initialized: PackagerBase.__init__( self )
         utils.debug( "MSIFragmentPackager __init__", 2 )
-        self.outfile =3D os.path.join( self.packageDestinationDir(), "%s.w=
xs" % self.package )
-        self.objfile =3D self.outfile.replace( "wxs", "wix" ) + "obj"
+        self.outDestination =3D self.packageDestinationDir()
+        self.objectFiles =3D []
 =

 =

     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 =3D open( self.outfile, 'w' )
+        outfile =3D os.path.join( self.outDestination, "%s.wxs" % self.pac=
kage )
+        out =3D open( outfile, 'w' )
         wxs.writexml( out, "", "    ", "\n", encoding =3D "utf-8" )
         out.close()
+        objfile =3D outfile.replace(".wxs", ".wixobj")
 =

-        utils.system( "candle -o %s -d%sImageDir=3D%s %s" % ( self.objfile=
, self.package, self.imageDir(), self.outfile ) )
+        utils.system( "candle -o %s -d%sImageDir=3D%s %s" % ( objfile, sel=
f.package, self.imageDir(), outfile ) )
+        self.objectFiles.append( objfile )
 =

 =

     def createPackage( self ):