Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
FORMUS3IC_LAS3
/
embb
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d517d62a
authored
Jun 29, 2015
by
Christian Kern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge examples script on jenkins has spaces in path, old script failed to do rsync. Corrected.
parent
198e8868
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
7 deletions
+13
-7
scripts/merge_examples.sh
+13
-7
No files found.
scripts/merge_examples.sh
View file @
d517d62a
...
@@ -110,7 +110,7 @@ EXAMPLES_DIR="$MYTMPDIR_BUILD/doc/examples_raw"
...
@@ -110,7 +110,7 @@ EXAMPLES_DIR="$MYTMPDIR_BUILD/doc/examples_raw"
INTEGRATE_SNIPPETS_SCRIPT
=
"insert_snippets.py"
INTEGRATE_SNIPPETS_SCRIPT
=
"insert_snippets.py"
EXAMPLES_TARGET_DIR
=
"
$PROJECT_DIR_FULLPATH
/doc/examples"
EXAMPLES_TARGET_DIR
=
"
$PROJECT_DIR_FULLPATH
/doc/examples"
if
[
-f
$EXAMPLES_DIR
/
$INTEGRATE_SNIPPETS_SCRIPT
]
;
then
if
[
-f
"
$EXAMPLES_DIR
/
$INTEGRATE_SNIPPETS_SCRIPT
"
]
;
then
cd
"
$EXAMPLES_DIR
"
cd
"
$EXAMPLES_DIR
"
...
@@ -124,12 +124,12 @@ if [ -f $EXAMPLES_DIR/$INTEGRATE_SNIPPETS_SCRIPT ]; then
...
@@ -124,12 +124,12 @@ if [ -f $EXAMPLES_DIR/$INTEGRATE_SNIPPETS_SCRIPT ]; then
exit
1
exit
1
fi
fi
if
[
!
-d
$EXAMPLES_TARGET_DIR
]
;
then
if
[
!
-d
"
$EXAMPLES_TARGET_DIR
"
]
;
then
echo
"---> Examples target dir does not exist. Creating..."
echo
"---> Examples target dir does not exist. Creating..."
redirect_cmd mkdir
$EXAMPLES_TARGET_DIR
redirect_cmd mkdir
"
$EXAMPLES_TARGET_DIR
"
fi
fi
if
[
-d
$EXAMPLES_TARGET_DIR
]
;
then
if
[
-d
"
$EXAMPLES_TARGET_DIR
"
]
;
then
echo
"---> Copy integrated examples back"
echo
"---> Copy integrated examples back"
#The examples have been integrated. Copy the integrated source files back.
#The examples have been integrated. Copy the integrated source files back.
redirect_cmd rsync
--delete
--archive
--recursive
"
$EXAMPLES_DIR
/"
"
$EXAMPLES_TARGET_DIR
/"
\
redirect_cmd rsync
--delete
--archive
--recursive
"
$EXAMPLES_DIR
/"
"
$EXAMPLES_TARGET_DIR
/"
\
...
@@ -137,12 +137,18 @@ if [ -f $EXAMPLES_DIR/$INTEGRATE_SNIPPETS_SCRIPT ]; then
...
@@ -137,12 +137,18 @@ if [ -f $EXAMPLES_DIR/$INTEGRATE_SNIPPETS_SCRIPT ]; then
--exclude
=
*
fragmented.h
\
--exclude
=
*
fragmented.h
\
--exclude
=
*
snippet.cc
\
--exclude
=
*
snippet.cc
\
--exclude
=
*
fragmented.cc
\
--exclude
=
*
fragmented.cc
\
--exclude
=
*
$INTEGRATE_SNIPPETS_SCRIPT
--exclude
=
"*
$INTEGRATE_SNIPPETS_SCRIPT
"
echo
redirect_cmd rsync
--delete
--archive
--recursive
"
$EXAMPLES_DIR
/"
"
$EXAMPLES_TARGET_DIR
/"
\
--exclude
=
*
snippet.h
\
--exclude
=
*
fragmented.h
\
--exclude
=
*
snippet.cc
\
--exclude
=
*
fragmented.cc
\
--exclude
=
"*
$INTEGRATE_SNIPPETS_SCRIPT
"
# for commiting, we must be in the project dir
# for commiting, we must be in the project dir
cd
"
$PROJECT_DIR_FULLPATH
"
cd
"
$PROJECT_DIR_FULLPATH
"
redirect_cmd git add
-u
$EXAMPLES_TARGET_DIR
redirect_cmd git add
-u
"
$EXAMPLES_TARGET_DIR
"
redirect_cmd git add
$EXAMPLES_TARGET_DIR
redirect_cmd git add
"
$EXAMPLES_TARGET_DIR
"
redirect_cmd git commit
-m
'Integrating examples_raw to examples using merge_examples.sh script.'
redirect_cmd git commit
-m
'Integrating examples_raw to examples using merge_examples.sh script.'
fi
fi
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment