Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
sakia
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Santiago
sakia
Commits
57d73f09
Commit
57d73f09
authored
8 years ago
by
inso
Browse files
Options
Downloads
Patches
Plain Diff
Qt 5.7
parent
17fb224a
Branches
qt5.7
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ci/travis/before_install.sh
+6
-52
6 additions, 52 deletions
ci/travis/before_install.sh
ci/travis/build.sh
+1
-1
1 addition, 1 deletion
ci/travis/build.sh
ci/travis/qt-installer-noninteractive.qs
+1
-1
1 addition, 1 deletion
ci/travis/qt-installer-noninteractive.qs
with
8 additions
and
54 deletions
ci/travis/before_install.sh
+
6
−
52
View file @
57d73f09
...
...
@@ -15,8 +15,8 @@ then
brew update
brew
install
libsodium
## Ensure your brew QT version is up to date. (brew install qt -> qt 4.8)
brew
install
qt5
5
brew
link
--force
qt5
5
brew
install
qt5
7
brew
link
--force
qt5
7
brew
install
pyenv-virtualenv
pyenv update
elif
[
$TRAVIS_OS_NAME
==
"linux"
]
...
...
@@ -27,9 +27,9 @@ then
libxcb-xfixes0-dev libxrender-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0
\
libxcb-render-util0-dev libxcb-glx0-dev libgl1-mesa-dri libegl1-mesa libpcre3-dev
\
curl libdbus-1-dev libdbus-glib-1-dev autoconf automake libtool libgstreamer-plugins-base0.10-0
wget https://download.qt.io/official_releases/qt/5.
5
/5.
5.1
/qt-opensource-linux-x64-5.
5.1
.run
chmod
+x qt-opensource-linux-x64-5.
5.1
.run
./qt-opensource-linux-x64-5.
5.1
.run
--script
$HOME
/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
wget https://download.qt.io/official_releases/qt/5.
7
/5.
7.0
/qt-opensource-linux-x64-5.
7.0
.run
chmod
+x qt-opensource-linux-x64-5.
7.0
.run
./qt-opensource-linux-x64-5.
7.0
.run
--script
$HOME
/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium13_1.0.1-1_amd64.deb
sudo
dpkg
-i
libsodium13_1.0.1-1_amd64.deb
...
...
@@ -54,53 +54,7 @@ fi
pyenv shell
$PYENV_PYTHON_VERSION
cd
$HOME
wget http://ufpr.dl.sourceforge.net/project/pyqt/sip/sip-4.17/sip-4.17.tar.gz
file sip-4.17.tar.gz
gzip
-t
sip-4.17.tar.gz
tar
xzf sip-4.17.tar.gz
cd
sip-4.17/
python configure.py
make
&&
make
install
pyenv rehash
cd
$HOME
pyenv shell
$PYENV_PYTHON_VERSION
wget http://ufpr.dl.sourceforge.net/project/pyqt/PyQt5/PyQt-5.5.1/PyQt-gpl-5.5.1.tar.gz
file PyQt-gpl-5.5.1.tar.gz
gzip
-t
PyQt-gpl-5.5.1.tar.gz
tar
xzf PyQt-gpl-5.5.1.tar.gz
cd
PyQt-gpl-5.5.1/
if
[
$TRAVIS_OS_NAME
==
"osx"
]
then
python configure.py
--confirm-license
\
--enable
QtCore
\
--enable
QtWidgets
\
--enable
QtGui
\
--enable
QtSvg
\
--enable
QtWebChannel
\
--enable
QtWebEngineWidgets
\
--enable
QtNetwork
\
--enable
QtPrintSupport
\
--enable
QtTest
\
--pyuic5-interpreter
/Users/travis/.pyenv/versions/
$PYENV_PYTHON_VERSION
/bin/python3.5
\
--sip
/Users/travis/.pyenv/versions/
$PYENV_PYTHON_VERSION
/Python.framework/Versions/3.5/bin/sip
elif
[
$TRAVIS_OS_NAME
==
"linux"
]
then
python configure.py
--qmake
"/tmp/qt/5.5/5.5/gcc_64/bin/qmake"
--confirm-license
\
--enable
QtCore
\
--enable
QtWidgets
\
--enable
QtGui
\
--enable
QtSvg
\
--enable
QtWebChannel
\
--enable
QtWebEngineWidgets
\
--enable
QtNetwork
\
--enable
QtPrintSupport
\
--enable
QtTest
\
--pyuic5-interpreter
/home/travis/.pyenv/versions/
$PYENV_PYTHON_VERSION
/bin/python3.5
\
--sip
/home/travis/.pyenv/versions/3.5.2/bin/sip
fi
pip
install
PyQt5
make
-j
2
&&
make
install
pyenv rehash
This diff is collapsed.
Click to expand it.
ci/travis/build.sh
+
1
−
1
View file @
57d73f09
...
...
@@ -15,7 +15,7 @@ then
pip
install
-U
git+https://github.com/posborne/dbus-python.git
pip
install
notify2
export
PATH
=
/tmp/qt/5.
5
/5.
5
/gcc_64/bin:
$PATH
export
PATH
=
/tmp/qt/5.
7
/5.
7
/gcc_64/bin:
$PATH
fi
if
[
$TRAVIS_OS_NAME
==
"osx"
]
then
...
...
This diff is collapsed.
Click to expand it.
ci/travis/qt-installer-noninteractive.qs
+
1
−
1
View file @
57d73f09
...
...
@@ -21,7 +21,7 @@ Controller.prototype.IntroductionPageCallback = function() {
Controller.prototype.TargetDirectoryPageCallback = function()
{
gui.currentPageWidget().TargetDirectoryLineEdit.setText("/tmp/qt/5.
5
");
gui.currentPageWidget().TargetDirectoryLineEdit.setText("/tmp/qt/5.
7
");
gui.clickButton(buttons.NextButton);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment