Merge branch 'master' into rocko

.gitignore

 attic/*
 .directory
-fpga-elphel
 linux-elphel
 meta
 poky
@@ -8,3 +7,8 @@ rootfs-elphel
 tools
 bootable-images
 projects.json
+/scripts/.project
+/scripts/.pydevproject
+/scripts/.settings
+/fpga-elphel
+!/fpga-elphel/eclipse_workspace_setup

fpga-elphel/eclipse_workspace_setup/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.elphel.vdt.veditor.prefs

+ClearProblemsOnToolStart.Enable=true
+Color.Default=00,00,00
+Color.DisabledCode=230,230,230
+Debug.Closure=false
+Debug.Disabled=false
+Debug.Launching=false
+Debug.Other=false
+Debug.Parsing=false
+Debug.Preprocessor=false
+Debug.ToolsSequence=false
+DisabledCode.Enable=true
+Parser.MinReparse=945
+Parser.OnType=false
+Style.indentSize=4
+eclipse.preferences.version=1

scripts/run_bitbake.sh

 #!/bin/bash
+#ls -all
 args="$@"
+arg0=$0 
+#echo "arg0=" $arg0
+#echo "args=" $args
+
 while (( "$#" )); do
   shift
 done
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+#DIR0="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR=$(dirname $(dirname $(dirname $(realpath $(dirname $(dirname $arg0))/sysroots))))
+
+echo "DIR=" $DIR
 echo "Launching bitbake $args"
-cd $DIR/../../poky
+#cd $DIR0/../../poky
+cd $DIR
 . ./oe-init-build-env
 bitbake $args  | sed -u 's@| @@'
 exit 0

setup_eclipse.py

@@ -34,9 +34,16 @@ import sys
 import subprocess
 import datetime
 import xml.etree.ElementTree
+#import shutil
+from distutils.dir_util import copy_tree
+#import distutils
+
 def main():
     workspace = '../workspace-elphel393'
+    workspace_fpga = '../workspace-elphel393_fpga'
     project_paths = "./setup_eclipse_paths.xml"
+    project_paths_fpga = "./setup_eclipse_fpga_paths.xml"
+    fpga_to_workspace = "fpga-elphel/eclipse_workspace_setup"
     continue_setup = False # True # disable later
     argv = sys.argv
     print (argv)
@@ -46,7 +53,7 @@ def main():
 should have CDT and EGit plugins installed.
 USAGE:
    %s eclipse-home [[path-to-workspace] project-paths]
-   First (mandatory) argument of this program (eclipse-home) is the full path to Eclipse instalaltion
+   First (mandatory) argument of this program (eclipse-home) is the full path to Eclipse installation
    (directory that has eclipse executable and eclipse.ini files).
    Second (optional) argument (path-to-workspace) is the path to workspace. If not specified,
    then ../workspace_elphel393 will be used.
@@ -55,7 +62,7 @@ USAGE:
 
 The program will not overwrite or modify any existing workspace.        
 """%(argv[0],))
-        return
+        return 0
     eclipse_home = argv[1]
         
     if (len(argv) > 3):
@@ -69,7 +76,10 @@ The program will not overwrite or modify any existing workspace.
 
     if (len(argv) > 2):
         workspace = argv[2]
-        
+    fpga= "fpga" in workspace
+    if fpga:
+        print ("Processing FPGA projects")
+        project_paths = project_paths_fpga
     workspace = os.path.abspath(workspace)
     need_import = True    
     if os.path.exists(workspace):
@@ -100,6 +110,18 @@ The program will not overwrite or modify any existing workspace.
     if return_code > 0:
         print ("Can not continuie on error")
         return 1
+    if fpga:
+#        project_paths = project_paths_fpga
+        print ("Copying VDT settings (",fpga_to_workspace,") to workspace (",workspace,")")
+#        shutil.copytree(fpga_to_workspace+"/.metadata", workspace+"/.metadata")
+        
+#        distutils.dir_util.copy_tree(fpga_to_workspace,workspace)
+        copy_tree(fpga_to_workspace,workspace)
+        
+        
+        '''
+      cp -r elphel393/fpga-elphel/eclipse_workspace_setup/.metadata ./workspace-elphel393-fpga-03
+'''    
     #creating workspace/.metadata/.plugins/org.eclipse.core_runtime/.settings/org.eclipse.egit.core.prefs
     egit_prefs_path = os.path.join(workspace,".metadata",".plugins","org.eclipse.core.runtime",".settings","org.eclipse.egit.core.prefs")
     egit_prefs="GitRepositoriesView.GitDirectories="
@@ -171,4 +193,7 @@ The program will not overwrite or modify any existing workspace.
             f.write(ba)
          
 if __name__ == "__main__":
-    sys.exit(main())    
\ No newline at end of file
+    sys.exit(main())
+"""
+eyesis@eyesis-SH87R:~/nc393/elphel393$ ./setup_eclipse.py /home/eyesis/eclipse/jee-oxygen/eclipse/ ../workspace-elphel393-fpga setup_eclipse_fpga_paths.xml 
+"""    
\ No newline at end of file

setup_eclipse_fpga_paths.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project_paths>
+    <path>fpga-elphel/x393</path>
+    <path>fpga-elphel/x393_sata</path>
+    <path>fpga-elphel/x359</path>
+</project_paths>