Skip to content

Commit 4b68953

Browse files
committed
Fixed some build issues
1 parent 74f9e0d commit 4b68953

File tree

6 files changed

+110
-101
lines changed

6 files changed

+110
-101
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ innosetup.iss
55
run.bat
66
msvcx90/
77
wininst/
8+
ldoce5viewer/qtgui/ui/main.py
9+
ldoce5viewer/qtgui/ui/advanced.py
10+
ldoce5viewer/qtgui/ui/main.py
11+
ldoce5viewer/qtgui/ui/indexer.py
12+
ldoce5viewer/qtgui/resources/icons/*.png

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG := ldoce5viewer
2-
PYTHON := python2
2+
PYTHON := python
33

44
runqt: qtui qtresource
55
$(PYTHON) ./ldoce5viewer.py

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Prerequisites
1515

1616
* Longman Dictionary of Contemporary English 5th Edition (DVD-ROM)
1717

18-
* Python 2.7 or 2.6 (not 3.x)
18+
* Python 2.7 or 2.6 (or 3.x)
1919

2020
* PyQt
2121

@@ -47,7 +47,7 @@ Installation
4747

4848
```bash
4949
$ make
50-
$ sudo python2.7 ./setup.py install --optimize
50+
$ sudo python ./setup.py install --optimize
5151
$ sudo cp ./ldoce5viewer.desktop /usr/share/applications/
5252
$ sudo cp ./ldoce5viewer/qtgui/resources/ldoce5viewer.svg /usr/share/pixmaps/
5353
$ [ -x /usr/bin/update-desktop-database ] && sudo update-desktop-database -q

ldoce5viewer/qtgui/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'''Entry point for the application'''
22

3-
from __future__ import absolute_import
3+
from __future__ import unicode_literals, absolute_import, print_function
44

55
_SINGLEAPP_KEY = 'ed437af1-0388-4e13-90e9-486bdc88c77a'
66

@@ -36,7 +36,8 @@ def _dummySetPlaceholderText(self, *args, **kwargs):
3636
from . import ui
3737
from . import resources
3838
except ImportError:
39-
raise RuntimeError("need to run '$ make' in order for the program to work")
39+
print("need to run '$ make' in order for the program to work")
40+
exit()
4041

4142

4243
def _setup_py2exe(config):

0 commit comments

Comments
 (0)