Commit 5f6a0a0f authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

1. fixed fpga project cloned before linux-xlnx - changed order + ordered... 

1. fixed fpga project cloned before linux-xlnx - changed order + ordered dictionary 2. fixed copying Eclipse project files
parent 1b46274c

projects.json

+5 −5
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 
        "git://git.yoctoproject.org/poky.git",

        "master","3d2c0f5902cacf9d8544bf263b51ef0dd1a7218c"

    ],

    "linux-elphel" :[

        "https://github.com/Elphel/linux-elphel.git",

        "master","",

        "#master","cc50d7fa07140e680b09a8add617e62b4ba35aa0"

    ],

    "fpga-elphel"  : {

        "x393"     :[

            "https://github.com/Elphel/x393.git",
@@ -42,11 +47,6 @@ 
            "master",""

        ]

    },

    "linux-elphel" :[

        "https://github.com/Elphel/linux-elphel.git",

        "master","",

        "#master","cc50d7fa07140e680b09a8add617e62b4ba35aa0"

    ],

    "rootfs-elphel": {

        "elphel-apps-imgsrv":[

            "https://github.com/Elphel/elphel-apps-imgsrv.git",

setup.py

+10 −5
Original line number Diff line number Diff line
@@ -15,9 +15,10 @@ import os 
import sys



import json

from collections import OrderedDict



with open('projects.json') as data_file:

    Projects = json.load(data_file)

    Projects = json.load(data_file, object_pairs_hook=OrderedDict)



#http://stackoverflow.com/questions/287871/print-in-terminal-with-colors-using-python

class bcolors:
@@ -70,10 +71,14 @@ def copy_eclipse_settings(name): 
    if (not os.path.isfile(name+"/.project")) and (os.path.isdir(name+"/"+EPS)):

        print("  Copying up files for Eclipse project")

        print(bcolors.WARNING+"  Copying "+name+"/"+EPS+" to "+name+"/"+bcolors.ENDC)

        shout("rsync -v -a "+name+"/"+EPS+" "+name+"/")

    else:

        shout("rsync -av "+name+"/"+EPS+"/ "+name+"/")

    

    if not os.path.isdir(name+"/"+EPS):

      print("Not copying up files for Eclipse project: not an Eclipse project")

    elif os.path.isfile(name+"/.project"):

      print("Not copying up files for Eclipse project: .project is already there")

    



def read_local_conf(conf_file,pattern):

    ret = []

    if os.path.isfile(conf_file):