Code Review
/
apps
/
low-level-can-service.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
b1cb035
)
Fixes for pyinstaller
author
Petteri Aimonen
<jpa@git.mail.kapsi.fi>
Tue, 3 Dec 2013 18:10:48 +0000
(20:10 +0200)
committer
Petteri Aimonen
<jpa@git.mail.kapsi.fi>
Sun, 29 Dec 2013 18:26:58 +0000
(20:26 +0200)
generator/nanopb_generator.py
patch
|
blob
|
history
diff --git
a/generator/nanopb_generator.py
b/generator/nanopb_generator.py
index
ab6f3cb
..
6ccb96f
100755
(executable)
--- a/
generator/nanopb_generator.py
+++ b/
generator/nanopb_generator.py
@@
-6,7
+6,14
@@
nanopb_version = "nanopb-0.2.5-dev"
import sys
try:
+ # Add some dummy imports to keep packaging tools happy.
import google, distutils.util # bbfreeze seems to need these
+ import pkg_resources # pyinstaller / protobuf 2.5 seem to need these
+except:
+ # Don't care, we will error out later if it is actually important.
+ pass
+
+try:
import google.protobuf.text_format as text_format
except:
sys.stderr.write('''