CCF_100/relational
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch GUI generation to Qt5

Browse Source 
Use Qt5 GUI generation in the makefile.

Also drop support for PySide.
This commit is contained in:
Salvo 'LtWorf' Tomaselli 2015-02-19 13:59:41 +01:00
parent fd4677be00
commit 98da6fa7f6
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -1,17 +1,12 @@
default: default:
echo "sorry, no default action" echo "sorry, no default action"
gui: pyqt pyside
pyside: gui: pyqt
pyside-uic relational_pyside/survey.ui > relational_pyside/survey.py
pyside-uic relational_pyside/maingui.ui > relational_pyside/maingui.py
pyside-uic relational_pyside/rel_edit.ui > relational_pyside/rel_edit.py
pyqt: pyqt:
pyuic4 relational_gui/survey.ui > relational_gui/survey.py pyuic5 relational_gui/survey.ui > relational_gui/survey.py
pyuic4 relational_gui/maingui.ui > relational_gui/maingui.py pyuic5 relational_gui/maingui.ui > relational_gui/maingui.py
pyuic4 relational_gui/rel_edit.ui > relational_gui/rel_edit.py pyuic5 relational_gui/rel_edit.ui > relational_gui/rel_edit.py
uninstall: uninstall:
rm -rf /opt/relational rm -rf /opt/relational
@ -39,7 +34,7 @@ dist: clean
rm -rf /tmp/relational/setup/.svn/ rm -rf /tmp/relational/setup/.svn/
rm -rf /tmp/relational/debscript/.svn/ rm -rf /tmp/relational/debscript/.svn/
rm -rf /tmp/relational/mac/.svn/ rm -rf /tmp/relational/mac/.svn/
rm -rf /tmp/relational/relational/.svn/ rm -rf /tmp/relational/relational/.svn/
rm -rf /tmp/relational/relational_gui/.svn/ rm -rf /tmp/relational/relational_gui/.svn/
rm -rf /tmp/relational/relational_pyside/.svn/ rm -rf /tmp/relational/relational_pyside/.svn/
rm -rf /tmp/relational/mac rm -rf /tmp/relational/mac
@ -47,7 +42,7 @@ dist: clean
rm -rf /tmp/relational/relational_curses/.svn/ rm -rf /tmp/relational/relational_curses/.svn/
rm -rf /tmp/relational/relational_readline/.svn/ rm -rf /tmp/relational/relational_readline/.svn/
rm -rf /tmp/relational/test/.svn rm -rf /tmp/relational/test/.svn
#mv /tmp/relational /tmp/relational-`./relational_gui.py -v | grep Relational | cut -d" " -f2` #mv /tmp/relational /tmp/relational-`./relational_gui.py -v | grep Relational | cut -d" " -f2`
#(cd /tmp; tar -zcf relational.tar.gz relational-*/) #(cd /tmp; tar -zcf relational.tar.gz relational-*/)
(cd /tmp; tar -zcf relational.tar.gz relational/) (cd /tmp; tar -zcf relational.tar.gz relational/)
@ -65,5 +60,5 @@ clean:
rm -rf *.deb || echo ok rm -rf *.deb || echo ok
rm -rf relational_mac rm -rf relational_mac
debian: debian:
dpkg-buildpackage dpkg-buildpackage