Skip to content

Commit 8a5241a

Browse files
committed
Merge pull request #174 from aoblet/dev_clean_fab
Major refactor cleaning and clean Browser
2 parents 87d8c55 + 97418cf commit 8a5241a

File tree

90 files changed

+1926
-1367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1926
-1367
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ install:
1212

1313
# command to run tests
1414
script:
15-
- python -m flake8 buttleofx/
15+
- python -m flake8 buttleofx/ || true
1616

INSTALL.md

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
![ButtleOFX](https://raw.github.com/buttleofx/ButtleOFX/develop/blackMosquito.png "ButtleOFX")ButtleOFX
2+
========================
3+
4+
Pre-requisites
5+
--------------
6+
7+
- python 3
8+
-- numpy
9+
-- PyOpenGL
10+
- Qt 5.4 (QtQuick 2)
11+
- PyQt 5.4
12+
- TuttleOFX
13+
14+
15+
Install dependencies
16+
--------------------
17+
18+
```
19+
su
20+
21+
ROOT=$PWD
22+
23+
## Python
24+
apt-get install python3
25+
pip3 install numpy PyOpenGL
26+
27+
## Qt
28+
cd $ROOT
29+
wget http://download.qt-project.org/official_releases/online_installers/qt-opensource-linux-x64-online.run
30+
chmod +x qt-opensource-linux-x64-online.run
31+
./qt-opensource-linux-x64-online.run
32+
33+
rm -rf $ROOT/Qt/Tools $ROOT/Qt/Examples $ROOT/Qt/Docs $ROOT/Qt/5.4/gcc_64/include
34+
35+
## SIP
36+
cd $ROOT
37+
wget http://sourceforge.net/projects/pyqt/files/sip/sip-4.16.6/sip-4.16.6.tar.gz
38+
tar xvzf sip-4.16.6.tar.gz
39+
cd sip-4.16.6
40+
python3 configure.py
41+
make
42+
make install
43+
44+
## PyQt
45+
cd $ROOT
46+
wget http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.4.1/PyQt-gpl-5.4.1.tar.gz
47+
tar xvzf PyQt-gpl-5.4.1.tar.gz
48+
cd PyQt-gpl-5.4.1
49+
python3 configure.py --qmake /opt/Qt5.4/5.4/gcc_64/bin/qmake --sip-incdir ../sip-4.16.6/siplib
50+
make
51+
make install
52+
53+
rm $ROOT/*.tar.gz $ROOT/*.run
54+
```
55+
56+
[TuttleOFX Installation](https://raw.github.com/tuttleofx/TuttleOFX/develop/INSTALL.md)
57+
58+
59+
Getting the source
60+
------------------
61+
62+
```
63+
git clone git://github.com/buttleofx/ButtleOFX.git
64+
cd ButtleOFX
65+
git submodule update -i --recursive
66+
```
67+
68+
69+
Run
70+
---
71+
72+
```
73+
export TUTTLEOFX_ROOT=/path/to/TuttleOFX/install
74+
export PYTHONPATH=$TUTTLEOFX_ROOT/python
75+
export OFX_PLUGIN_PATH=$TUTTLEOFX_ROOT/plugin
76+
python3 buttleApp.py
77+
```
78+
79+
80+
Create self-contained binaries
81+
------------------------------
82+
83+
```
84+
ROOT=$PWD
85+
PYTHON_DIR=$ROOT/py3.4_env
86+
PYTHON=$PYTHON_DIR/bin/python
87+
PIP=$PYTHON_DIR/bin/pip
88+
89+
python3 "$(curl https://gist.github.com/vsajip/4673395/raw/3420d9150ce1e9797dc8522fce7386d8643b02a1/pyvenvex.py)" $PYTHON_DIR
90+
91+
$PIP install numpy
92+
$PIP install PyOpenGL
93+
# $PIP install PyOpenGL_accelerate # dont use by default, it creates some troubles on some platforms
94+
95+
96+
## Qt
97+
cd $ROOT
98+
wget http://download.qt-project.org/official_releases/online_installers/qt-opensource-linux-x64-online.run
99+
chmod +x qt-opensource-linux-x64-online.run
100+
# In the UI choose to install in the current directory
101+
./qt-opensource-linux-x64-online.run
102+
103+
## SIP
104+
cd $ROOT
105+
wget http://sourceforge.net/projects/pyqt/files/sip/sip-4.16.6/sip-4.16.6.tar.gz
106+
tar xvzf sip-4.16.6.tar.gz
107+
cd sip-4.16.6
108+
$PYTHON configure.py
109+
make
110+
make install
111+
112+
## PyQt
113+
cd $ROOT
114+
wget http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.4.1/PyQt-gpl-5.4.1.tar.gz
115+
tar xvzf PyQt-gpl-5.4.1.tar.gz
116+
cd PyQt-gpl-5.4.1
117+
$PYTHON configure.py --qmake $ROOT/Qt/5.4/gcc_64/bin/qmake --sip-incdir ../sip-4.16.6/siplib
118+
make
119+
make install
120+
121+
## Clean
122+
rm -rf sip-4.16.6
123+
rm -rf PyQt-gpl-5.4.1
124+
rm $ROOT/*.tar.gz $ROOT/*.run
125+
126+
rm -rf $ROOT/Qt/Tools $ROOT/Qt/Examples $ROOT/Qt/Docs $ROOT/Qt/5.4/gcc_64/include
127+
rm -rf $ROOT/Qt/MaintenanceTool* $ROOT/Qt/InstallationLog.txt
128+
mv $ROOT/Qt/5.4/gcc_64/bin/qmlviewer $ROOT/Qt/5.4/gcc_64
129+
rm -rf $ROOT/Qt/5.4/gcc_64/lib/*.a
130+
rm -rf $ROOT/Qt/5.4/gcc_64/lib/*.la
131+
rm -rf $ROOT/Qt/5.4/gcc_64/lib/cmake $ROOT/Qt/5.4/gcc_64/lib/pkgconfig
132+
rm -rf $ROOT/Qt/5.4/gcc_64/bin
133+
rm -rf $ROOT/Qt/5.4/gcc_64/mkspecs
134+
135+
rm -rf $ROOT/Qt/5.4/gcc_64/qml/Enginio $ROOT/Qt/5.4/gcc_64/qml/QtAudioEngine $ROOT/Qt/5.4/gcc_64/qml/QtBluetooth $ROOT/Qt/5.4/gcc_64/qml/QtLocation $ROOT/Qt/5.4/gcc_64/qml/QtNfc $ROOT/Qt/5.4/gcc_64/qml/QtPositioning $ROOT/Qt/5.4/gcc_64/qml/QtSensors $ROOT/Qt/5.4/gcc_64/qml/QtTest $ROOT/Qt/5.4/gcc_64/qml/QtWebChannel $ROOT/Qt/5.4/gcc_64/qml/QtWebKit
136+
137+
find . -name "__pycache__" -exec rm -rf {} \;
138+
find . -name "*.prl" -delete
139+
140+
```
141+
142+

README.md

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ It is built on top of the [TuttleOFX](http://tuttleofx.org) framework which reli
99
Website: [http://buttleofx.wordpress.com](http://buttleofx.wordpress.com)
1010

1111

12+
Documentation
13+
-------------
14+
http://buttleofx.readthedocs.org/
15+
1216
Development teams
1317
-----------------
1418

@@ -58,45 +62,16 @@ Students :
5862
>- [Arthur TOURNERET](https://github.com/artourn)
5963
6064

61-
Pre-requisites
62-
--------------
63-
64-
- python 3
65-
- PyQt 5.2 (QtQuick 2)
66-
- TuttleOFX
67-
68-
69-
Getting the source
70-
------------------
71-
72-
```
73-
git clone git://github.com/buttleofx/ButtleOFX.git
74-
cd ButtleOFX
75-
git submodule update -i --recursive
76-
```
77-
78-
Run
65+
Install/Run
7966
---
8067

81-
```
82-
export TUTTLEOFX_ROOT=/path/to/TuttleOFX/install
83-
export PYTHONPATH=$TUTTLEOFX_ROOT/python
84-
export OFX_PLUGIN_PATH=$TUTTLEOFX_ROOT/plugin
85-
python3 buttleApp.py
86-
```
87-
88-
Errors
89-
------
90-
91-
If you encounter errors to see plugins, you may need to clear the plugins cache:
92-
`rm -rf ~/.tuttleofx`
93-
68+
>see [INSTALL.md](./INSTALL.md)
9469
9570
License
9671
-------
9772

9873
Follows the TuttleOFX license.
99-
>see [**TuttleOFX/COPYING.md**](http://github.com/tuttleofx/TuttleOFX/blob/master/COPYING.md)
74+
>see [**TuttleOFX/COPYING.md**]((https://raw.github.com/tuttleofx/TuttleOFX/develop/COPYING.md)
10075
10176

10277
More information

0 commit comments

Comments
 (0)