@@ -63,6 +63,18 @@ else

 PHOTON_RPMCHECK_FLAGS :=

 endif

+ifeq ($(BUILDDEPS),true)

+PUBLISH_BUILD_DEPENDENCIES := -bd True

+else

+PUBLISH_BUILD_DEPENDENCIES :=

+endif

+

+ifdef WEIGHTS

+PACKAGE_WEIGHTS_PATH = -pw $(WEIGHTS)

+else

+PACKAGE_WEIGHTS_PATH =

+endif

+

 TOOLS_BIN := $(SRCROOT)/tools/bin

 CONTAIN := $(TOOLS_BIN)/contain

 VIXDISKUTIL := $(TOOLS_BIN)/vixdiskutil

@@ -111,6 +123,8 @@ packages-micro: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOUR

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

                 $(PHOTON_RPMCHECK_FLAGS) \

+		$(PUBLISH_BUILD_DEPENDENCIES) \

+		$(PACKAGE_WEIGHTS_PATH) \

                 -t ${THREADS}

 live-iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)

@@ -145,6 +159,8 @@ packages-minimal: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SO

                 -n $(PHOTON_BUILD_NUMBER) \

                 -v $(PHOTON_RELEASE_VERSION) \

                 $(PHOTON_RPMCHECK_FLAGS) \

+		$(PUBLISH_BUILD_DEPENDENCIES) \

+		$(PACKAGE_WEIGHTS_PATH) \

                 -t ${THREADS}

 iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES)

@@ -228,6 +244,8 @@ packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_R

                 -w $(PHOTON_STAGE)/pkg_info.json \

                 -g $(PHOTON_DATA_DIR)/pkg_build_options.json \

                 $(PHOTON_RPMCHECK_FLAGS) \

+		$(PUBLISH_BUILD_DEPENDENCIES) \

+		$(PACKAGE_WEIGHTS_PATH) \

                 -t ${THREADS}

 updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

@@ -247,6 +265,8 @@ updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_P

                 -v $(PHOTON_RELEASE_VERSION) \

                 -k $(PHOTON_INPUT_RPMS_DIR) \

                 $(PHOTON_RPMCHECK_FLAGS) \

+		$(PUBLISH_BUILD_DEPENDENCIES) \

+		$(PACKAGE_WEIGHTS_PATH) \

                 -t ${THREADS}

 tool-chain-stage1: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

@@ -1,7 +1,9 @@

+import json

 import ThreadPool

 from constants import constants

 from Logger import Logger

-import threading 

+import threading

+from Queue import PriorityQueue

 class Scheduler(object):

@@ -10,8 +12,13 @@ class Scheduler(object):

     listOfPackagesToBuild=[]

     listOfPackagesCurrentlyBuilding=[]

     sortedList=[]

-    listOfPackagesNextToBuild=[]

+    listOfPackagesNextToBuild=PriorityQueue()

     listOfFailedPackages=[]

+    alldependencyGraph = {}

+    dependencyGraph = {}

+    priorityMap = {}

+    pkgWeights={}

+    isPriorityScheduler=1

     logger=None

     event=None

     stopScheduling=False

@@ -23,7 +30,109 @@ class Scheduler(object):

     @staticmethod

     def setLog(logName,logPath):

         Scheduler.logger = Logger.getLogger(logName, logPath)    

-        

+

+    @staticmethod

+    def getBuildRequiredPackages(package):

+        listRequiredRPMPackages = []

+        listRequiredRPMPackages.extend(constants.specData.getBuildRequiresForPackage(package))

+

+        listRequiredPackages = []

+

+        for pkg in listRequiredRPMPackages:

+            basePkg = constants.specData.getSpecName(pkg)

+            if basePkg not in listRequiredPackages:

+                listRequiredPackages.append(basePkg)

+

+        return listRequiredPackages

+

+

+    @staticmethod

+    def getDependencies(package, parentPackage, k):

+

+        for node in Scheduler.alldependencyGraph[package].keys():

+                Scheduler.getDependencies(node, package, k)

+

+        if parentPackage == None:

+            return

+        else:

+            for node in Scheduler.alldependencyGraph[package].keys():

+                try:

+                    Scheduler.alldependencyGraph[parentPackage][node] = max(

+                        Scheduler.alldependencyGraph[parentPackage][node],

+                        Scheduler.alldependencyGraph[package][node] * k)

+                except KeyError:

+                    Scheduler.alldependencyGraph[parentPackage][node] = \

+                        Scheduler.alldependencyGraph[package][node] * k

+

+    @staticmethod

+    def makeGraph():

+        k = 3

+        for package in Scheduler.sortedList:

+            for child_pkg in Scheduler.dependencyGraph[package].keys():

+                Scheduler.getDependencies(child_pkg, package, k)

+                for node in Scheduler.alldependencyGraph[child_pkg].keys():

+                    try:

+                        Scheduler.dependencyGraph[package][node] = max(

+                            Scheduler.dependencyGraph[package][node],

+                            Scheduler.alldependencyGraph[child_pkg][node] * k)

+                    except KeyError:

+                        Scheduler.dependencyGraph[package][node] = \

+                            Scheduler.alldependencyGraph[child_pkg][node] * k

+	if constants.publishBuildDependencies:

+	    dependencyLists = {}

+	    for package in Scheduler.dependencyGraph.keys():

+		dependencyLists[package] = []

+		for dependency in Scheduler.dependencyGraph[package].keys():

+			dependencyLists[package].append(dependency)

+	    graphfile = open(str(constants.logPath) + "/BuildDependencies.json", 'w')

+	    graphfile.write(json.dumps(dependencyLists, sort_keys=True, indent=4))

+	    graphfile.close()

+

+    @staticmethod

+    def parseWeights():

+	Scheduler.pkgWeights.clear()

+	weightFile = open(constants.packageWeightsPath, 'r')

+	Scheduler.pkgWeights = json.load(weightFile)

+	weightFile.close()

+

+    @staticmethod

+    def getWeight(package):

+        try:

+            return float(Scheduler.pkgWeights[package])

+        except KeyError:

+            return 0

+

+

+

+    @staticmethod

+    def setPriorities():

+	if constants.packageWeightsPath == None:

+            Scheduler.logger.info("Priority Scheduler disabled")

+            Scheduler.isPriorityScheduler = 0

+	else:

+	    Scheduler.parseWeights()

+

+        for package in Scheduler.sortedList:

+            Scheduler.dependencyGraph[package] = {}

+            Scheduler.alldependencyGraph[package] = {}

+            for child_package in Scheduler.getBuildRequiredPackages(package):

+                Scheduler.dependencyGraph[package][child_package] = 1

+            for child_package in Scheduler.getRequiredPackages(package):

+                Scheduler.alldependencyGraph[package][child_package] = 1

+        Scheduler.makeGraph()

+        for package in Scheduler.sortedList:

+            try:

+                Scheduler.priorityMap[package] = Scheduler.getWeight(package)

+            except KeyError:

+                Scheduler.priorityMap[package] = 0

+            for child_pkg in Scheduler.dependencyGraph[package].keys():

+                Scheduler.priorityMap[child_pkg] = Scheduler.priorityMap[child_pkg] \

+                                                 + (Scheduler.dependencyGraph[package][child_pkg]

+                                                    * (Scheduler.getWeight(package)))

+        Scheduler.logger.info("set Priorities: Priority of all packages")

+        Scheduler.logger.info(Scheduler.priorityMap)

+

+

     @staticmethod

     def setParams(sortedList,listOfAlreadyBuiltPackages):

         Scheduler.sortedList=sortedList

@@ -34,6 +143,7 @@ class Scheduler(object):

         Scheduler.listOfPackagesCurrentlyBuilding=[]

         Scheduler.listOfPackagesNextToBuild=[]

         Scheduler.listOfFailedPackages=[]

+        Scheduler.setPriorities()

     @staticmethod

     def getRequiredPackages(package):

@@ -52,7 +162,7 @@ class Scheduler(object):

     @staticmethod

     def __getListNextPackagesReadyToBuild():

-        listOfPackagesNextToBuild=[]

+        listOfPackagesNextToBuild=PriorityQueue()

         Scheduler.logger.info("Checking for next possible packages to build")

         for pkg in Scheduler.listOfPackagesToBuild:

             if pkg in Scheduler.listOfPackagesCurrentlyBuilding:

@@ -67,37 +177,49 @@ class Scheduler(object):

                     Scheduler.logger.info(reqPkg+" is not available. So we cannot build "+ pkg +" at this moment.")

                     break

             if canBuild:

-                listOfPackagesNextToBuild.append(pkg)

+                listOfPackagesNextToBuild.put((-Scheduler.priorityMap[pkg], pkg))

                 Scheduler.logger.info("Adding "+ pkg +" to the schedule list")

         return listOfPackagesNextToBuild

-    

+

     @staticmethod

     def getNextPackageToBuild():

         Scheduler.logger.info("Waiting to acquire scheduler lock")

         Scheduler.lock.acquire()

-        

+

         if Scheduler.stopScheduling:

             Scheduler.logger.info("Released scheduler lock")

             Scheduler.lock.release()

             return None

-        

+

         if len(Scheduler.listOfPackagesToBuild) == 0:

             if Scheduler.event is not None:

                 Scheduler.event.set()

-            

-        if len(Scheduler.listOfPackagesNextToBuild) == 0:

-            listOfPackagesNextToBuild=Scheduler.__getListNextPackagesReadyToBuild()

-            Scheduler.listOfPackagesNextToBuild=listOfPackagesNextToBuild

-            

-        if len(Scheduler.listOfPackagesNextToBuild) == 0:

+

+        try:

+            if Scheduler.listOfPackagesNextToBuild.qsize() == 0:

+                listOfPackagesNextToBuild = Scheduler.__getListNextPackagesReadyToBuild()

+                Scheduler.listOfPackagesNextToBuild = listOfPackagesNextToBuild

+        except:

+            if len(Scheduler.listOfPackagesNextToBuild) == 0:

+                listOfPackagesNextToBuild = Scheduler.__getListNextPackagesReadyToBuild()

+                Scheduler.listOfPackagesNextToBuild = listOfPackagesNextToBuild

+

+        if Scheduler.listOfPackagesNextToBuild.qsize() == 0:

             Scheduler.logger.info("Released scheduler lock")

             Scheduler.lock.release()

             return None

-        

-        package=Scheduler.listOfPackagesNextToBuild.pop(0)

-        

-        if len(Scheduler.listOfPackagesNextToBuild) > 0:

-            ThreadPool.ThreadPool.activateWorkerThreads(len(Scheduler.listOfPackagesNextToBuild))

+

+        packageTup=Scheduler.listOfPackagesNextToBuild.get()

+

+        if packageTup[0] == 0 and Scheduler.isPriorityScheduler == 1:

+            listOfPackagesNextToBuild = Scheduler.__getListNextPackagesReadyToBuild()

+            Scheduler.listOfPackagesNextToBuild = listOfPackagesNextToBuild

+            packageTup = Scheduler.listOfPackagesNextToBuild.get()

+

+        package = packageTup[1]

+        Scheduler.logger.info("PackagesNextToBuild " + str(packageTup))

+        if Scheduler.listOfPackagesNextToBuild.qsize() > 0:

+            ThreadPool.ThreadPool.activateWorkerThreads(Scheduler.listOfPackagesNextToBuild.qsize())

         Scheduler.logger.info("Released scheduler lock")

         Scheduler.lock.release()

         Scheduler.listOfPackagesCurrentlyBuilding.append(package)

@@ -130,5 +252,4 @@ class Scheduler(object):

         if len(Scheduler.listOfFailedPackages) != 0:

             return True

         return False

-        

-        

\ No newline at end of file

+

@@ -38,7 +38,8 @@ def main():

     parser.add_argument("-w",  "--pkginfo-file",  dest="pkgInfoFile",  default="../../stage/pkg_info.json")

     parser.add_argument("-g",  "--pkg-build-option-file",  dest="pkgBuildOptionFile",  default="../../common/data/pkg_build_options.json")

     parser.add_argument("-q",  "--rpmcheck-stop-on-error", dest="rpmCheckStopOnError",  default=False, action ="store_true")

-

+    parser.add_argument("-bd", "--publish-build-dependencies", dest="publishBuildDependencies", default=False)

+    parser.add_argument("-pw", "--package-weights-path", dest="packageWeightsPath", default=None)

     parser.add_argument("-y",  "--generate-pkg-yaml-files",  dest="generatePkgYamlFiles",  default=False, action ="store_true")

     parser.add_argument("-j",  "--pkg-yaml-dir-path",  dest="pkgYamlDirPath",  default="../../stage/")

     parser.add_argument("-f",  "--pkg-blacklist-file",  dest="pkgBlacklistFile",  default=None)

@@ -49,7 +50,6 @@ def main():

         cmdUtils.runCommandInShell("mkdir -p "+options.logPath)

     logger=Logger.getLogger(options.logPath+"/Main")

-

     errorFlag=False

     package = None

     pkgInfoJsonFile = options.pkgInfoFile

@@ -84,6 +84,10 @@ def main():

         logger.error("Given input RPMS Path is not a directory:"+options.inputRPMSPath)

         errorFlag = True

+    if options.packageWeightsPath is not None and not os.path.isfile(options.packageWeightsPath):

+        logger.error("Given input Weights file is not a file:"+options.packageWeightsPath)

+        errorFlag = True

+

     if options.generatePkgYamlFiles:

         if options.pkgBlacklistFile is not None and options.pkgBlacklistFile != "" and not os.path.isfile(options.pkgBlacklistFile):

             logger.error("Given package blacklist file is not valid:"+options.pkgBlacklistFile)

@@ -152,7 +156,6 @@ def main():

         # print stacktrace

         traceback.print_exc()

         sys.exit(1)

-

     sys.exit(0)

 def buildPackagesList(csvFilename):

@@ -20,7 +20,8 @@ class constants(object):

     rpmCheck=False

     sourceRpmPath=""

     noDepsPackageList=["texinfo","bzip2","gettext","nspr","xz","bison","go"]

-

+    publishBuildDependencies=False

+    packageWeightsPath=None

     # These packages will be built in first order as build-core-toolchain stage

     listCoreToolChainPackages=[

         "filesystem",

@@ -328,6 +329,8 @@ class constants(object):

         constants.testForceRPMS=[]

         constants.rpmCheck = options.rpmCheck

         constants.rpmCheckStopOnError = options.rpmCheckStopOnError

+	constants.publishBuildDependencies=options.publishBuildDependencies

+	constants.packageWeightsPath=options.packageWeightsPath

         if constants.rpmCheck:

             constants.testLogger=Logger.getLogger("MakeCheckTest",constants.logPath)