Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
taste-setup
Commits
94b6f4a9
Commit
94b6f4a9
authored
Oct 21, 2017
by
Maxime Perrotin
Browse files
Merge branch 'master' of
https://gitrepos.estec.esa.int/taste/taste-setup
parents
bcad3e8d
98b3ed8e
Changes
8
Hide whitespace changes
Inline
Side-by-side
Docker-run.sh
View file @
94b6f4a9
...
...
@@ -26,10 +26,12 @@ XAUTH=/tmp/.docker.xauth
touch
${
XAUTH
}
xauth nlist :0 |
sed
-e
's/^..../ffff/'
| xauth
-f
${
XAUTH
}
nmerge -
HOME
=
/root
export
TASTE_IN_DOCKER
=
1
docker run
\
--privileged
\
-e
DISPLAY
\
-e
HOME
\
-e
TASTE_IN_DOCKER
\
-e
XAUTHORITY
=
${
XAUTH
}
\
-v
${
XSOCK
}
:
${
XSOCK
}
\
-v
${
XAUTH
}
:
${
XAUTH
}
\
...
...
Dockerfile
View file @
94b6f4a9
#
# Process with:
# Process
this Dockerfile
with:
#
# docker build -t taste .
#
# And the run
with
X11 redirection, with...
# And the
n
run
a fresh TASTE container with proper
X11 redirection, with...
#
# ./Docker-run.sh
#
...
...
@@ -26,38 +26,46 @@ RUN bash -c 'cd /root ; git clone https://gitrepos.estec.esa.int/taste/taste-set
# but the execution has to be broken down into steps, so that Docker
# can resume the build from whichever step failed in the last attempt.
RUN
bash
-c
'cd /root/tool-src ; git submodule init ; git submodule update'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/01_sudo.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/03_debian.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/04_pythonlibs.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/05_antlr.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/06_stlink.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/10_dmt.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/15_asn1scc.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/20_msc.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/30_qemu.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/40_ocarina.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/45_pohi.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/50_opengeode.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/53_pymsc.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/54_speedometer.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/55_asn1valueEditor.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/56_msc-editor.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/60_buildsupport.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/01_sudo.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/03_debian.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/04_pythonlibs.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/05_antlr.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/06_stlink.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/10_dmt.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/15_asn1scc.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/20_msc.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/30_qemu.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/39_tasteconfig.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/40_ocarina.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/45_pohi.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/50_opengeode.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/53_pymsc.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/54_speedometer.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/55_asn1valueEditor.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/56_msc-editor.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/60_buildsupport.sh'
# Those that need postgres can set it up themselves (avoid creating huge Docker image)
# RUN bash -c 'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/65_postgres.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/70_taste-model-checker.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/80_build-scripts.sh'
# RUN bash -c 'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/65_postgres.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/70_taste-model-checker.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/80_build-scripts.sh'
# Those that need RTEMS can set it up themselves (avoid creating huge Docker image)
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/85_rtems.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/90_misc.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/91_env.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/95_components_library.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/85_rtems.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/90_misc.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/91_env.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/95_components_library.sh'
RUN
bash
-c
'cd /bin ; sudo rm sh ; sudo ln -s bash sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/98_bash.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/99_paths.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/96_ZestSC1.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/97_upython.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/98_bash.sh'
RUN
bash
-c
'cd /root/tool-src ; PATH=/root/tool-inst/bin:$PATH HOME=/root DISABLE_TASTE_BANNER=1 install/99_paths.sh'
RUN
bash
-c
'echo ". ~/.bashrc.taste" >> /root/.bashrc'
# Deal with insane bugs in QT when redirecting X11 from a container
RUN
bash
-c
'echo "export QT_X11_NO_MITSHM=1" >> /root/.bashrc'
# And make sure the message queues of the container are large enough for TASTE GUIs
RUN
bash
-c
'echo "echo 100 > /proc/sys/fs/mqueue/msg_max" >> /root/.bashrc'
#
#
#
Now run the Docker image setting up
X11 redirection, with...
#
At this point, you can start a fresh TASTE container with proper
X11 redirection, with...
#
# ./Docker-run.sh
#
Update-TASTE.sh
View file @
94b6f4a9
...
...
@@ -5,6 +5,12 @@ git submodule update || exit 1
DIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
export
DISABLE_TASTE_BANNER
=
1
for
INSTALL_SCRIPT
in
install
/[0-9]
*
sh
;
do
if
[
!
-z
"
${
TASTE_IN_DOCKER
}
"
]
;
then
if
[
"
${
INSTALL_SCRIPT
}
"
==
"install/65_postgres.sh"
]
;
then
echo
Skipping over postgres installation
in
Docker container.
continue
fi
fi
${
INSTALL_SCRIPT
}
||
{
echo
Failed
in
execution of
"
${
INSTALL_SCRIPT
}
"
;
exit
1
;
}
done
echo
"Please close this terminal and open a new one (to"
...
...
install/16_cleanup-old-mscc.sh
0 → 100755
View file @
94b6f4a9
#!/bin/bash
DIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
.
${
DIR
}
/common.sh
cd
$DIR
/../
||
exit
1
[
-d
mscc
]
&&
rm
-rf
mscc
[
-d
mscedit2
]
&&
rm
-rf
mscedit2
exit
0
install/39_tasteconfig.sh
0 → 100755
View file @
94b6f4a9
#!/bin/bash
DIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
.
"
${
DIR
}
"
/common.sh
cd
"
${
DIR
}
"
/../misc
||
exit
1
# taste-config
mkdir
-p
"
${
PREFIX
}
"
/bin
sed
-e
"s:INSTALL_PREFIX:
${
PREFIX
}
:g"
taste-config.pl
>
taste-config.pl.tmp
install
-m
755 taste-config.pl.tmp
"
${
PREFIX
}
"
/bin/taste-config
rm
-f
taste-config.pl.tmp
misc/helper-scripts/taste-progress-dialog.py
View file @
94b6f4a9
...
...
@@ -169,6 +169,8 @@ def run_gui():
thread
.
wait
()
def
main
():
if
os
.
getenv
(
"DISABLE_PROGRESS_BAR"
)
is
not
None
:
sys
.
exit
(
0
)
signal
.
signal
(
signal
.
SIGINT
,
signal
.
SIG_DFL
)
run_gui
()
...
...
orchestrator
@
43d64206
Compare
c7305e65
...
43d64206
Subproject commit
c7305e65a0a2c6a66c16c863c2eea94c3464cbb3
Subproject commit
43d642069210199a8a67eefefd18e557f1931406
testSuites
@
f8c98de5
Compare
7c90f363
...
f8c98de5
Subproject commit
7c90f363e71ba58597f296e2cdd12fb1638aa580
Subproject commit
f8c98de517260bc3c38d3802c1e57ff3a2c1f504
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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