Merge pull request #65 from naveedkhan8067/configUpdate

Updated config process

VariantsInfo.json

@@ -0,0 +1,19 @@
+{
+  "hello-world": [
+    {
+      "variant": "LINUX",
+      "configFile": "LinuxConfig.js",
+      "configPath": "components/hello-world/configs"
+    },
+    {
+      "variant": "MAC",
+      "configFile": "MacConfig.js",
+      "configPath": "components/hello-world/configs"
+    },
+    {
+      "variant": "WINDOWS",
+      "configFile": "WindowsConfig.js",
+      "configPath": "components/hello-world/configs"
+    }
+  ]
+}

prepareExecutePreprocessor.py

@@ -1,6 +1,7 @@
 import os;
 import sys;
-import shutil
+import json;
+import shutil;
 
 def main(): 
   component = os.environ['COMPONENT']
@@ -9,18 +10,17 @@ def main():
   variant = os.environ['VARIANT_TYPE']
   print("Selected variant: " + str(variant))
 
-  configFile = "" 
-  if (variant == "LINUX"):
-    configFile = "Linux_Config.js"
-  elif (variant == "MAC"):
-    configFile = "Mac_Config.js"
-  else:
-    configFile = "Windows_Config.js"
+  configFile, configPath = getConfigInfo(component, variant)
 
   print("-> Current working directory: " + str(os.getcwd()))
-  componetPath = os.path.join(os.getcwd(), "components", component)
-  src = os.path.join(componetPath, "configs", configFile)
-  dst = os.path.join(componetPath, "VariantConfig.js")
+  componentPath = os.path.join(os.getcwd(), "components", component)
+  src = os.path.normpath(os.path.join(os.getcwd(), configPath, configFile))
+  dst = os.path.join(componentPath, "VariantConfig.js")
+
+  #verify the existence of variant config file
+  if(not os.path.exists(src)):
+    print("Config file not found: " + src)
+    sys.exit(1)
 
   #clean destination file if already exist
   if(os.path.exists(dst)):
@@ -30,24 +30,24 @@ def main():
   print("-> Variant config is successfully prepared")
 
   print("-> Executing C-Preprocessor")
-  processPaths = getPathsToProcess(component, componetPath)
+  processPaths = getPathsToProcess(component, componentPath)
 
   for file in processPaths:
     os.system("c-preprocessor " + str(file) + " " + str(file))
 
   print("-> Cleanup successfully performed")
   os.remove(dst)
 
-def getPathsToProcess(component, componetPath):
+def getPathsToProcess(component, componentPath):
   pathsList = []
   excludesDirs = ["node_modules", "configs", "lib"]
   excludeFiles = ["README.md", "VariantConfig.js"]
 
   #Get list of paths
-  for root, dirs, files in os.walk(componetPath):
+  for root, dirs, files in os.walk(componentPath):
     dirs[:] = [d for d in dirs if d not in excludesDirs]
     for fileName in files:
-      if fileName not in excludeFiles: pathsList.append( os.path.join( root[len(componetPath):], fileName ))
+      if fileName not in excludeFiles: pathsList.append( os.path.join( root[len(componentPath):], fileName ))
 
   #prepare paths in the required format
   for index in range(len(pathsList)):
@@ -56,6 +56,23 @@ def getPathsToProcess(component, componetPath):
     pathsList[index] = os.path.join("components", component, pathsList[index]).replace("\\","/")
 
   return pathsList
+
+def getConfigInfo(component, variant):
+  configFile = ""
+  configPath = ""
+  data = json.load(open("VariantsInfo.json"))
+
+  for component in data[component]:
+    if component["variant"] == variant:
+      configFile = component["configFile"]
+      configPath = component["configPath"]
+      break
+
+  if not (configFile) or not (configPath):
+      print("Variant information not found in VariantsInfo.json.")
+      sys.exit(1)      
+
+  return configFile, configPath
 
 # call main
 if __name__=="__main__":