DSC packaging changes

installer/InstallBuilder/aixlpp.py

@@ -174,10 +174,14 @@ class AIXLPPFile:
 
 
     def BuildPackage(self):
-        lppbasefilename = self.variables["SHORT_NAME"] + '-' + \
-                          self.fullversion_dashed + \
-                          '.aix.' + str(self.variables["PFMAJOR"]) + '.' + \
-                          self.variables['PFARCH'] + '.lpp'
+        if 'OUTPUTFILE' in self.variables:
+            lppbasefilename = self.variables['OUTPUTFILE'] + '.lpp'
+        else:
+            lppbasefilename = self.variables["SHORT_NAME"] + '-' + \
+                self.fullversion_dashed + \
+                '.aix.' + str(self.variables["PFMAJOR"]) + '.' + \
+                self.variables['PFARCH'] + '.lpp'
+
         lppfilename = os.path.join(self.targetDir, lppbasefilename)
 
         if "SKIP_BUILDING_PACKAGE" in self.variables:

installer/InstallBuilder/hpuxpackage.py

@@ -165,9 +165,12 @@ RestoreConfigurationFile() {
         else:
             arch = self.variables["PFARCH"]
 
-        depotbasefilename = self.variables["SHORT_NAME"] + '-' + \
-                                     self.fullversion_dashed + \
-                                     '.hpux.' + osversion + '.' + arch + '.depot'
+        if 'OUTPUTFILE' in self.variables:
+            depotbasefilename = self.variables['OUTPUTFILE'] + '.depot'
+        else:
+            depotbasefilename = self.variables["SHORT_NAME"] + '-' + \
+                self.fullversion_dashed + \
+                '.hpux.' + osversion + '.' + arch + '.depot'
         depotfilename = os.path.join(self.targetDir, depotbasefilename)
 
         if "SKIP_BUILDING_PACKAGE" in self.variables:

installer/InstallBuilder/linuxdpkg.py

@@ -140,9 +140,12 @@ class LinuxDebFile:
                 conffile.write(f.stagedLocation + '\n')
 
     def BuildPackage(self):
-        pkgName = self.variables["SHORT_NAME"] + '-' + \
-            self.fullversion_dashed + '.universald.' + \
-            str(self.variables["PFMAJOR"])  + '.' + self.variables["PFARCH"] + '.deb'
+        if 'OUTPUTFILE' in self.variables:
+            pkgName = self.variables['OUTPUTFILE'] + '.deb'
+        else:
+            pkgName = self.variables["SHORT_NAME"] + '-' + \
+                self.fullversion_dashed + '.universald.' + \
+                str(self.variables["PFMAJOR"])  + '.' + self.variables["PFARCH"] + '.deb'
 
         if "SKIP_BUILDING_PACKAGE" in self.variables:
             return

installer/InstallBuilder/linuxrpm.py

@@ -135,7 +135,9 @@ class LinuxRPMFile:
 
 
     def StageAndProperlyNameRPM(self):
-        if self.variables['PFDISTRO'] == 'SUSE':
+        if 'OUTPUTFILE' in self.variables:
+            rpmNewFileName = self.variables['OUTPUTFILE'] + '.rpm'
+        elif self.variables['PFDISTRO'] == 'SUSE':
             rpmNewFileName = self.variables['SHORT_NAME'] + '-' + \
                 self.fullversion_dashed + '.sles.' + \
                 str(self.variables['PFMAJOR']) + '.' + self.variables['PFARCH'] + '.rpm'

installer/InstallBuilder/sunospkg.py

@@ -114,10 +114,13 @@ class SunOSPKGFile:
             print("Error: pkgmk failed")
             exit(1)
 
-        basepkgfilename = self.variables['SHORT_NAME'] + '-' + \
-            self.fullversion_dashed + \
-            '.solaris.' + str(self.variables['PFMINOR']) + '.' + \
-            self.variables['PFARCH'] + '.pkg'
+        if 'OUTPUTFILE' in self.variables:
+            basepkgfilename = self.variables['OUTPUTFILE'] + '.pkg'
+        else:
+            basepkgfilename = self.variables['SHORT_NAME'] + '-' + \
+                self.fullversion_dashed + \
+                '.solaris.' + str(self.variables['PFMINOR']) + '.' + \
+                self.variables['PFARCH'] + '.pkg'
 
         pkgfilename = os.path.join(self.targetDir, basepkgfilename)