Commit ec1141f4 authored by Andrey Filippov's avatar Andrey Filippov

merged with master, updated braches

parent acb353ab
...@@ -66,7 +66,7 @@ APPS_ARRAY=( ...@@ -66,7 +66,7 @@ APPS_ARRAY=(
#imgsrv #imgsrv
"https://github.com/Elphel/elphel-apps-imgsrv.git" "https://github.com/Elphel/elphel-apps-imgsrv.git"
"elphel-apps-imgsrv" "elphel-apps-imgsrv"
"master" "framepars"
"" ""
#php extension #php extension
"https://github.com/Elphel/elphel-apps-php-extension.git" "https://github.com/Elphel/elphel-apps-php-extension.git"
...@@ -76,6 +76,11 @@ APPS_ARRAY=( ...@@ -76,6 +76,11 @@ APPS_ARRAY=(
#camogm #camogm
"https://github.com/Elphel/elphel-apps-camogm.git" "https://github.com/Elphel/elphel-apps-camogm.git"
"elphel-apps-camogm" "elphel-apps-camogm"
"framepars"
""
#udev rules
"https://github.com/Elphel/elphel-udev-rules.git"
"elphel-udev-rules"
"master" "master"
"" ""
#add new app below #add new app below
...@@ -113,7 +118,17 @@ cloneandcheckout () { ...@@ -113,7 +118,17 @@ cloneandcheckout () {
fi fi
} }
# copy Eclipse projects settings if they are present in a special directory AND not in project directory
ECLIPSE_PROJECT_SETUP="eclipse_project_setup"
copy_eclipse_settings () {
if [ ! -f "$1/.project" ] && [ -d "$1/$ECLIPSE_PROJECT_SETUP" ]; then
echo " Copying up files for Eclipse project"
echo " Copying $1/$ECLIPSE_PROJECT_SETUP $1"
rsync -v -a $1/$ECLIPSE_PROJECT_SETUP/ $1/
else
echo " NOT Copying up files for Eclipse project"
fi
}
echo "Step 1: Clone kernel project echo "Step 1: Clone kernel project
" "
...@@ -173,6 +188,7 @@ cd $E393_ROOTFSDIR ...@@ -173,6 +188,7 @@ cd $E393_ROOTFSDIR
#Clone user space applications #Clone user space applications
for elem in $(seq 0 4 $((${#APPS_ARRAY[@]} - 1))); do for elem in $(seq 0 4 $((${#APPS_ARRAY[@]} - 1))); do
cloneandcheckout "${APPS_ARRAY[$elem]}" "${APPS_ARRAY[$elem+1]}" "${APPS_ARRAY[$elem+2]}" "${APPS_ARRAY[$elem+3]}" cloneandcheckout "${APPS_ARRAY[$elem]}" "${APPS_ARRAY[$elem+1]}" "${APPS_ARRAY[$elem+2]}" "${APPS_ARRAY[$elem+3]}"
copy_eclipse_settings "${APPS_ARRAY[$elem+1]}"
done done
cd .. cd ..
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment