Commit f02068b9 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

Sync with upstream

parent 12705aba
Subproject commit a16bdca401eee8a718f377a8f67095046edf78eb
Subproject commit 93284d6fb371edfded0c332adde4db7b57b764cd
......@@ -7,15 +7,14 @@ if [ "${ARCH}" == "x86_64" ] ; then
fi
sudo apt-get update
if [ "${ARCH}" == "x86_64" ] ; then
sudo apt-get install -y --force-yes libc6:i386 libgcc1:i386 libxft2:i386 libxss1:i386 libcairo2:i386 libc6-dev-i386
sudo apt-get install --no-install-recommends -y --force-yes libc6:i386 libgcc1:i386 libxft2:i386 libxss1:i386 libcairo2:i386 libc6-dev-i386
fi
sudo apt-get install lsb-release
sudo apt-get install --no-install-recommends -y --force-yes lsb-release
if [ -z "$VERSION" ] ; then
VERSION="$(lsb_release -d)"
if [ -f /.dockerenv ] ; then
VERSION=DockerizedDebian
else
VERSION="$(lsb_release -d)"
VERSION=${VERSION}-Dockerized
fi
echo "Version detected: ${VERSION}"
else
......@@ -24,13 +23,25 @@ fi
case "$VERSION" in
*Ubuntu*14.04* )
sudo apt-get install -y --force-yes wget autoconf automake curl exuberant-ctags gcc git gnat gtkwave kate lcov libacl1 libacl1-dev libarchive-dev libattr1 libattr1-dev libbonoboui2-0 libdbd-sqlite3-perl libdbi-perl libfile-copy-recursive-perl libglib2.0-0 libgnome2-0 libgnome2-perl libgnome2-vfs-perl libgnomeui-0 libgnomevfs2-0 libgnomevfs2-common libgtk2-gladexml-perl libgtk2-perl libgraphviz-dev libmono-system-data-linq4.0-cil libmono-system-numerics4.0-cil libmono-system-runtime-serialization-formatters-soap4.0-cil libmono-system-runtime4.0-cil libmono-system-web4.0-cil libmono-system-xml4.0-cil libmono-system4.0-cil libsqlite3-dev libtool libxml-libxml-perl libxml-libxml-simple-perl libxml-parser-perl libxml2-dev libxslt1-dev libzmq3-dev mono-mcs mono-runtime nedit net-tools pgadmin3 postgresql postgresql-client postgresql-client-common postgresql-common python-antlr python-sqlalchemy python-coverage python-gtk2-dev python-jinja2 python-lxml python-matplotlib python-pexpect expect python-pip python-ply python-psycopg2 python-pygraphviz python-pyside python3-pip qemu-system sqlite3 sudo tk8.5 tree vim-gtk wmctrl xmldiff xpdf xterm xterm zip openjdk-6-jre python3-lxml bash-completion strace libusb-1.0-0-dev cmake dfu-util gnuplot libstdc++-4.8-dev python-mako ;;
sudo apt-get install --no-install-recommends -y --force-yes evince wget autoconf automake curl exuberant-ctags gcc git gnat gtkwave kate lcov libacl1 libacl1-dev libarchive-dev libattr1 libattr1-dev libbonoboui2-0 libdbd-sqlite3-perl libdbi-perl libfile-copy-recursive-perl libglib2.0-0 libgnome2-0 libgnome2-perl libgnome2-vfs-perl libgnomeui-0 libgnomevfs2-0 libgnomevfs2-common libgtk2-gladexml-perl libgtk2-perl libgraphviz-dev libmono-system-data-linq4.0-cil libmono-system-numerics4.0-cil libmono-system-runtime-serialization-formatters-soap4.0-cil libmono-system-runtime4.0-cil libmono-system-web4.0-cil libmono-system-xml4.0-cil libmono-system4.0-cil libsqlite3-dev libtool libxml-libxml-perl libxml-libxml-simple-perl libxml-parser-perl libxml2-dev libxslt1-dev libzmq3-dev mono-mcs mono-runtime nedit net-tools pgadmin3 postgresql postgresql-client postgresql-client-common postgresql-common python-antlr python-sqlalchemy python-coverage python-gtk2-dev python-jinja2 python-lxml python-matplotlib python-pexpect expect python-pip python-ply python-psycopg2 python-pygraphviz python-pyside python3-pip qemu-system sqlite3 sudo tk8.5 tree vim-gtk wmctrl xmldiff xpdf xterm xterm zip openjdk-6-jre python3-lxml bash-completion strace libusb-1.0-0-dev cmake dfu-util gnuplot libstdc++-4.8-dev python-mako || exit 1
;;
*Ubuntu*16.04* )
sudo apt-get install -y --force-yes wget autoconf automake curl exuberant-ctags gcc git gnat gtkwave kate lcov libacl1 libacl1-dev libarchive-dev libattr1 libattr1-dev libbonoboui2-0 libdbd-sqlite3-perl libdbi-perl libfile-copy-recursive-perl libglib2.0-0 libgnome2-0 libgnome2-perl libgnome2-vfs-perl libgnomeui-0 libgnomevfs2-0 libgnomevfs2-common libgtk2-gladexml-perl libgtk2-perl libgraphviz-dev libmono-system-data-linq4.0-cil libmono-system-numerics4.0-cil libmono-system-runtime-serialization-formatters-soap4.0-cil libmono-system-runtime4.0-cil libmono-system-web4.0-cil libmono-system-xml4.0-cil libmono-system4.0-cil libsqlite3-dev libtool libxml-libxml-perl libxml-libxml-simple-perl libxml-parser-perl libxml2-dev python-sqlalchemy libxslt1-dev libzmq3-dev mono-mcs mono-reference-assemblies-2.0 mono-runtime nedit net-tools pgadmin3 postgresql postgresql-client postgresql-client-common postgresql-common python-antlr python-coverage python-gtk2-dev python-jinja2 python-lxml python-matplotlib python-pexpect expect python-pip python-psycopg2 python-pygraphviz python-pyside python3-pip qemu-system sqlite3 sudo tk8.5 tree vim-gtk wmctrl xmldiff xpdf xterm xterm zip openjdk-8-jre python3-lxml bash-completion strace libusb-1.0-0-dev cmake dfu-util gnuplot libstdc++-5-dev python-mako ;;
*Debian*stretch* | DockerizedDebian )
sudo apt-get install -y --force-yes wget autoconf automake curl exuberant-ctags gcc git gnat gtkwave kate lcov libacl1 libacl1-dev libarchive-dev libattr1 libattr1-dev libbonoboui2-0 libdbd-sqlite3-perl libdbi-perl libfile-copy-recursive-perl libglib2.0-0 libgnome2-0 libgnome2-perl libgnome2-vfs-perl libgnomeui-0 libgnomevfs2-0 libgnomevfs2-common libgtk2-gladexml-perl libgtk2-perl libgraphviz-dev libmono-system-data-linq4.0-cil libmono-system-numerics4.0-cil libmono-system-runtime-serialization-formatters-soap4.0-cil libmono-system-runtime4.0-cil libmono-system-web4.0-cil libmono-system-xml4.0-cil libmono-system4.0-cil libsqlite3-dev libtool libxml-libxml-perl libxml-libxml-simple-perl libxml-parser-perl libxml2-dev libxslt1-dev libzmq3-dev mono-mcs mono-reference-assemblies-2.0 mono-runtime nedit net-tools pgadmin3 postgresql postgresql-client python-sqlalchemy postgresql-client-common postgresql-common python-antlr python-coverage python-gtk2-dev python-jinja2 python-lxml python-matplotlib python-pexpect expect python-pip python-psycopg2 python-pygraphviz python-pyside python3-pip qemu-system sqlite3 sudo tk8.5 tree vim-gtk wmctrl xmldiff xpdf xterm xterm zip openjdk-8-jre python3-lxml bash-completion strace libusb-1.0-0-dev cmake dfu-util gnuplot libstdc++-6-dev libgnatcoll-python1.7-dev python-mako ;;
*Debian*buster* )
sudo apt-get install -y --force-yes wget autoconf automake curl exuberant-ctags gcc git gnat gtkwave kate lcov libacl1 libacl1-dev libarchive-dev libattr1 libattr1-dev libbonoboui2-0 libdbd-sqlite3-perl libdbi-perl libfile-copy-recursive-perl libglib2.0-0 libgnome2-0 libgnomeui-0 libgnomevfs2-0 libgnomevfs2-common libgtk2-perl libgraphviz-dev libmono-system-data-linq4.0-cil libmono-system-numerics4.0-cil libmono-system-runtime-serialization-formatters-soap4.0-cil libmono-system-runtime4.0-cil libmono-system-web4.0-cil libmono-system-xml4.0-cil libmono-system4.0-cil libsqlite3-dev libtool libxml-libxml-perl libxml-libxml-simple-perl libxml-parser-perl libxml2-dev libxslt1-dev libzmq3-dev mono-mcs mono-runtime nedit net-tools pgadmin3 postgresql postgresql-client postgresql-client-common postgresql-common python-antlr python-coverage python-gtk2-dev python-sqlalchemy python-jinja2 python-lxml python-matplotlib python-pexpect expect python-pip python-psycopg2 python-pygraphviz python-pyside python3-pip qemu-system sqlite3 sudo tk8.5 tree vim-gtk wmctrl xmldiff xpdf xterm xterm zip openjdk-8-jre python3-lxml bash-completion strace libusb-1.0-0-dev cmake dfu-util gnuplot libstdc++-6-dev libgnatcoll-python17-dev python-mako ;;
sudo apt-get install --no-install-recommends -y --force-yes evince wget autoconf automake curl exuberant-ctags gcc git gnat gtkwave kate lcov libacl1 libacl1-dev libarchive-dev libattr1 libattr1-dev libbonoboui2-0 libdbd-sqlite3-perl libdbi-perl libfile-copy-recursive-perl libglib2.0-0 libgnome2-0 libgnome2-perl libgnome2-vfs-perl libgnomeui-0 libgnomevfs2-0 libgnomevfs2-common libgtk2-gladexml-perl libgtk2-perl libgraphviz-dev libmono-system-data-linq4.0-cil libmono-system-numerics4.0-cil libmono-system-runtime-serialization-formatters-soap4.0-cil libmono-system-runtime4.0-cil libmono-system-web4.0-cil libmono-system-xml4.0-cil libmono-system4.0-cil libsqlite3-dev libtool libxml-libxml-perl libxml-libxml-simple-perl libxml-parser-perl libxml2-dev python-sqlalchemy libxslt1-dev libzmq3-dev mono-mcs mono-reference-assemblies-2.0 mono-runtime nedit net-tools pgadmin3 postgresql postgresql-client postgresql-client-common postgresql-common python-antlr python-coverage python-gtk2-dev python-jinja2 python-lxml python-matplotlib python-pexpect expect python-pip python-psycopg2 python-pygraphviz python-pyside python3-pip qemu-system sqlite3 sudo tk8.5 tree vim-gtk wmctrl xmldiff xpdf xterm xterm zip openjdk-8-jre python3-lxml bash-completion strace libusb-1.0-0-dev cmake dfu-util gnuplot libstdc++-5-dev python-mako || exit 1
;;
*Debian*stretch* | *Debian*stretch*Dockerized )
sudo apt-get install --no-install-recommends -y --force-yes evince wget autoconf automake curl exuberant-ctags gcc git gnat gtkwave kate lcov libacl1 libacl1-dev libarchive-dev libattr1 libattr1-dev libbonoboui2-0 libdbd-sqlite3-perl libdbi-perl libfile-copy-recursive-perl libglib2.0-0 libgnome2-0 libgnome2-perl libgnome2-vfs-perl libgnomeui-0 libgnomevfs2-0 libgnomevfs2-common libgtk2-gladexml-perl libgtk2-perl libgraphviz-dev libmono-system-data-linq4.0-cil libmono-system-numerics4.0-cil libmono-system-runtime-serialization-formatters-soap4.0-cil libmono-system-runtime4.0-cil libmono-system-web4.0-cil libmono-system-xml4.0-cil libmono-system4.0-cil libsqlite3-dev libtool libxml-libxml-perl libxml-libxml-simple-perl libxml-parser-perl libxml2-dev libxslt1-dev libzmq3-dev mono-mcs mono-reference-assemblies-2.0 mono-runtime nedit net-tools pgadmin3 postgresql postgresql-client python-sqlalchemy postgresql-client-common postgresql-common python-antlr python-coverage python-gtk2-dev python-jinja2 python-lxml python-matplotlib python-pexpect expect python-pip python-psycopg2 python-pygraphviz python-pyside python3-pip qemu-system sqlite3 sudo tk8.5 tree vim-gtk wmctrl xmldiff xpdf xterm xterm zip openjdk-8-jre python3-lxml bash-completion strace libusb-1.0-0-dev cmake dfu-util gnuplot libstdc++-6-dev libgnatcoll-python1.7-dev python-mako || exit 1
;;
*Ubuntu*20.04* )
sudo apt-get install --no-install-recommends -y --force-yes evince gdebi wget autoconf automake curl exuberant-ctags gcc git gnat-10 gtkwave kate lcov libacl1 libacl1-dev libarchive-dev libattr1 libattr1-dev libdbd-sqlite3-perl libdbi-perl libfile-copy-recursive-perl libglib2.0-0 libgtk2-perl libgraphviz-dev libmono-system-data-linq4.0-cil libmono-system-numerics4.0-cil libmono-system-runtime-serialization-formatters-soap4.0-cil libmono-system-runtime4.0-cil libmono-system-web4.0-cil libmono-system-xml4.0-cil libmono-system4.0-cil libsqlite3-dev libtool libxml-libxml-perl libxml-libxml-simple-perl libxml-parser-perl libxml2-dev libxslt1-dev libzmq3-dev mono-mcs mono-runtime nedit net-tools pgadmin3 postgresql postgresql-client postgresql-client-common postgresql-common python-coverage python-lxml python-pexpect expect python3-pip qemu-system sqlite3 sudo tk8.6 tree vim-gtk wmctrl xmldiff xterm xterm zip openjdk-11-jre python3-lxml bash-completion strace libusb-1.0-0-dev cmake dfu-util gnuplot libstdc++-8-dev python-mako gprbuild python3-singledispatch python3-stringtemplate3 python3-numpy python3-pyside2.* python3-pygraphviz python3-sqlalchemy python3-ply python3-matplotlib python3-lxml python3-pexpect python3-psycopg2 python3-antlr python3-antlr3 python3-websocket python-setuptools make python3-setuptools g++ psmisc bsdmainutils gnat-gps python-is-python2 bzip2 unzip rsync libncurses5:i386 libgmp10:i386 || exit 1
# pip2 is not available in ubuntu20.04 repos
pip2 >/dev/null || (curl https://bootstrap.pypa.io/get-pip.py --output /var/tmp/get-pip.py && sudo python2 /var/tmp/get-pip.py) || exit 1
# antlr2 for python2 (package python-antlr) is not available anymore either
python2 -c "import antlr" &> /dev/null || (wget -O /tmp/python-pyside.deb "https://download.tuxfamily.org/taste/python2-antlr2-for-ubuntu20.deb" && sudo gdebi -n -o=--no-install-recommends /tmp/python-pyside.deb) || exit 1
;;
*Debian*buster* | Debian*buster*Dockerized )
sudo apt-get install --no-install-recommends -y --force-yes evince gdebi wget autoconf automake curl exuberant-ctags gcc git gnat gtkwave kate lcov libacl1 libacl1-dev libarchive-dev libattr1 libattr1-dev libdbd-sqlite3-perl libdbi-perl libfile-copy-recursive-perl libglib2.0-0 libgtk2-perl libgraphviz-dev libmono-system-data-linq4.0-cil libmono-system-numerics4.0-cil libmono-system-runtime-serialization-formatters-soap4.0-cil libmono-system-runtime4.0-cil libmono-system-web4.0-cil libmono-system-xml4.0-cil libmono-system4.0-cil libsqlite3-dev libtool libxml-libxml-perl libxml-libxml-simple-perl libxml-parser-perl libxml2-dev libxslt1-dev libzmq3-dev mono-mcs mono-runtime nedit net-tools pgadmin3 postgresql postgresql-client postgresql-client-common postgresql-common python-antlr python-coverage python-gtk2-dev python-sqlalchemy python-jinja2 python-lxml python-matplotlib python-pexpect expect python-pip python-psycopg2 python3-pip qemu-system sqlite3 sudo tk8.6 tree vim-gtk wmctrl xmldiff xpdf xterm xterm zip openjdk-11-jre python3-lxml bash-completion strace libusb-1.0-0-dev cmake dfu-util gnuplot libstdc++-8-dev python-mako gprbuild python3-singledispatch python3-stringtemplate3 python3-numpy python3-pyside2.* python3-pygraphviz python3-ply python3-matplotlib python3-lxml python3-sqlalchemy python3-pexpect python3-psycopg2 python3-antlr python3-antlr3 python3-websocket python-setuptools make python3-setuptools g++ psmisc gnat-gps bzip2 bsdmainutils unzip rsync libncurses5:i386 libgmp10:i386 || exit 1
pip3 install --user wheel || exit 1
;;
* )
echo 'Unrecognised distribution:' "${VERSION}"
echo "Please update ~/tool-src/install/03_debian.sh to cover your distribution and send us a patch."
......
......@@ -26,8 +26,9 @@ fi
# Unfortunately, the --upgrade DOES NOT ALWAYS WORK.
# Uninstall first...
echo y | pip2 uninstall opengeode
echo y | pip3 uninstall opengeode
pip2 install --user --upgrade . || exit 1
pip3 install --user --upgrade . || exit 1
# Add .local/bin to PATH
PATH_CMD='export PATH=$PATH:$HOME/.local/bin'
......
......@@ -3,13 +3,13 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. "${DIR}/common.sh"
# Setup speedometer library in ~/.local
cd "$DIR/../speedometer" || exit 1
cd "$DIR/../speedometer/python3" || exit 1
# Skip install if the version installed is the same and the tree is clean
HEAD="$(grep version speedometer/speedometer.py | head -1 | awk -F\" '{print $(NF-1)}')"
# This is much slower than a --version option would be...
# But there's no such functionality in speedometer :-(
VERSION_INSTALLED="$(pip2 freeze | grep speedometer | awk -F= '{print $NF}')"
VERSION_INSTALLED="$(pip3 freeze | grep speedometer | awk -F= '{print $NF}')"
GIT_OUTPUT=$(git status --porcelain)
if [ "${GIT_OUTPUT}" == "" ] ; then
TREE_DIRTY=0
......@@ -25,7 +25,8 @@ fi
# Unfortunately, the --upgrade DOES NOT ALWAYS WORK.
# Uninstall first...
echo y | pip2 uninstall speedometer
pip2 install --user --upgrade . || exit 1
echo y | pip3 uninstall speedometer
pip3 install --user --upgrade . || exit 1
# Add .local/bin to PATH
PATH_CMD='export PATH=$PATH:$HOME/.local/bin'
......
......@@ -8,7 +8,7 @@ VERSION_INSTALLED="$(taste-gui --version 2>&1 | head -1 | awk '{print $NF}')"
cd "$DIR/../asn1-value-editor" || exit 1
# Skip install if the version installed is the same and the tree is clean
HEAD="$(grep __version asn1_value_editor/asn1_value_editor.py | head -1 | awk -F\" '{print $(NF-1);}')"
HEAD="$(grep __version python3/asn1_value_editor/asn1_value_editor.py | head -1 | awk -F\" '{print $(NF-1);}')"
GIT_OUTPUT=$(git status --porcelain)
if [ "${GIT_OUTPUT}" == "" ] ; then
......@@ -24,8 +24,9 @@ fi
# Unfortunately, the --upgrade DOES NOT ALWAYS WORK.
# Uninstall first...
echo y | pip3 uninstall asn1-value-editor
echo y | pip2 uninstall asn1-value-editor
pip2 install --user --upgrade . || exit 1
make install || exit 1
# Add .local/bin to PATH
PATH_CMD='export PATH=$PATH:$HOME/.local/bin'
......
#!/bin/bash
echo [MSC EDITOR V1] This version of the TASTE MSC editor cannot run in Debian buster
echo [MSC EDITOR V1] Skipped installation
exit 0
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. "${DIR}/common.sh"
......
Subproject commit 73beb3a5d1b2e9418ee83918d7dda8c16a40cace
Subproject commit b736e709c55a2ff9eeabb5df4ef5136fe84b8695
Supports Markdown
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