Change to actual extra_script.py

extra_script.py

@@ -10,7 +10,7 @@ from datetime import datetime
 import re
 import pprint
 from platformio.project.config import ProjectConfig
-
+from platformio.project.exception import InvalidProjectConfError
 
 Import("env")
 #print(env.Dump())
@@ -104,7 +104,18 @@ def writeFileIfChanged(fileName,data):
     return True    
 
 def mergeConfig(base,other):
-    for cname in other:
+    try:
+        customconfig = env.GetProjectOption("custom_config")
+    except InvalidProjectConfError:
+        customconfig = None
+    for bdir in other:
+        if customconfig and os.path.exists(os.path.join(bdir,customconfig)):
+            cname=os.path.join(bdir,customconfig)
+            print("merge custom config {}".format(cname))
+            with open(cname,'rb') as ah:
+                base += json.load(ah)
+            continue   
+        cname=os.path.join(bdir,"config.json")
         if os.path.exists(cname):
             print("merge config %s"%cname)
             with open(cname,'rb') as ah:
@@ -150,25 +161,13 @@ def expandConfig(config):
                     rt.append(replaceTexts(c,replace))
     return rt
 
-def createUserItemList(dirs,itemName,files):
-    rt=[]
-    for d in dirs:
-        iname=os.path.join(d,itemName)
-        if os.path.exists(iname):
-            rt.append(iname)
-    for f in files:
-        if not os.path.exists(f):
-            raise Exception("user item %s not found"%f)
-        rt.append(f)
-    return rt
-
-def generateMergedConfig(inFile,outFile,addFiles=[]):
+def generateMergedConfig(inFile,outFile,addDirs=[]):
     if not os.path.exists(inFile):
         raise Exception("unable to read cfg file %s"%inFile)
     data=""
     with open(inFile,'rb') as ch:    
         config=json.load(ch)
-        config=mergeConfig(config,addFiles)
+        config=mergeConfig(config,addDirs)
         config=expandConfig(config)
         data=json.dumps(config,indent=2)
         writeFileIfChanged(outFile,data)
@@ -388,7 +387,12 @@ def getLibs():
 
 
 
-def joinFiles(target,flist):
+def joinFiles(target,pattern,dirlist):
+    flist=[]
+    for dir in dirlist:
+            fn=os.path.join(dir,pattern)
+            if os.path.exists(fn):
+                flist.append(fn)
     current=False
     if os.path.exists(target):
         current=True
@@ -459,28 +463,7 @@ def handleDeps(env):
         )
     env.AddBuildMiddleware(injectIncludes)
 
-def getOption(env,name,toArray=True):
-    try:
-        opt=env.GetProjectOption(name)
-        if toArray:
-            if opt is None:
-                return []
-            if isinstance(opt,list):
-                return opt
-            return opt.split("\n" if "\n" in opt else ",")
-        return opt
-    except:
-        pass
-    if toArray:
-        return []
 
-def getFileList(files):
-    base=basePath()
-    rt=[]
-    for f in files:
-        if f is not None and f != "":
-            rt.append(os.path.join(base,f))
-    return rt
 def prebuild(env):
     global userTaskDirs
     print("#prebuild running")
@@ -490,18 +473,14 @@ def prebuild(env):
     if ldf_mode == 'off':
         print("##ldf off - own dependency handling")
         handleDeps(env)
-    extraConfigs=getOption(env,'custom_config',toArray=True)
-    extraJs=getOption(env,'custom_js',toArray=True)
-    extraCss=getOption(env,'custom_css',toArray=True)
-
     userTaskDirs=getUserTaskDirs()
     mergedConfig=os.path.join(outPath(),os.path.basename(CFG_FILE))
-    generateMergedConfig(os.path.join(basePath(),CFG_FILE),mergedConfig,createUserItemList(userTaskDirs,"config.json", getFileList(extraConfigs)))
+    generateMergedConfig(os.path.join(basePath(),CFG_FILE),mergedConfig,userTaskDirs)
     compressFile(mergedConfig,mergedConfig+".gz")
     generateCfg(mergedConfig,os.path.join(outPath(),CFG_INCLUDE),False)
     generateCfg(mergedConfig,os.path.join(outPath(),CFG_INCLUDE_IMPL),True)
-    joinFiles(os.path.join(outPath(),INDEXJS+".gz"),createUserItemList(["web"]+userTaskDirs,INDEXJS,getFileList(extraJs)))
-    joinFiles(os.path.join(outPath(),INDEXCSS+".gz"),createUserItemList(["web"]+userTaskDirs,INDEXCSS,getFileList(extraCss)))
+    joinFiles(os.path.join(outPath(),INDEXJS+".gz"),INDEXJS,["web"]+userTaskDirs)
+    joinFiles(os.path.join(outPath(),INDEXCSS+".gz"),INDEXCSS,["web"]+userTaskDirs)
     embedded=getEmbeddedFiles(env)
     filedefs=[]
     for ef in embedded: