Skip to content

Commit e3ee244

Browse files
committed
exit values causing problems.
1 parent fa72ec8 commit e3ee244

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@ python:
1212
# command to install dependencies
1313
install:
1414
- sudo apt-get update
15+
# to install wllvm
1516
- sudo apt-get install -y python-pip
16-
- sudo apt-get install -y llvm-3.5 clang-3.5 libapr1-dev libaprutil1-dev
17-
# dragonegg uses 3.3
17+
# apache prerequisites
18+
- sudo apt-get install -y libapr1-dev libaprutil1-dev
19+
# for the clang build
20+
- sudo apt-get install -y llvm-3.5 clang-3.5
21+
# dragonegg prereqs. dragonegg and llvm-gcc use llvm 3.3
1822
- sudo apt-get install -y llvm-3.3 llvm-gcc-4.7
1923
- sudo pip install -e .
2024
- export WLLVM_HOME=`pwd`

wllvm/extractor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def main():
2929
try:
3030
extraction(sys.argv)
3131
except:
32-
return 1
32+
pass
3333
return 0
3434

3535
if __name__ == '__main__':

wllvm/version.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,18 @@
1111
1.0.1 - 8/2/2016 the rst gets a make over, and doc strings
1212
became more pervasive.
1313
14-
1.0.2 - 8/2/2016 dragonegg issues. trying to include a polite 'as' wrapper
14+
1.0.2 - 8/4/2016 dragonegg issues. trying to include a polite 'as' wrapper
1515
(i.e. not a console_script called as).
1616
17-
1.0.3 - 8/2/2016 travis build fixes.
17+
1.0.3 - 8/4/2016 travis build fixes.
18+
19+
1.0.4 - 8/4/2016 travis build fixes, and exception handling fixes.
20+
21+
1.0.5 - 8/4/2016 exit value was upsetting travis.
1822
1923
2024
2125
2226
"""
23-
wllvm_version='1.0.4.dev1'
27+
wllvm_version='1.0.5'
2428

wllvm/wllvm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def main():
2727
if not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
2828
buildAndAttachBitcode(builder)
2929
except:
30-
return 1
30+
pass
3131
return 0
3232

3333

wllvm/wllvmpp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def main():
2323
if not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
2424
buildAndAttachBitcode(builder)
2525
except:
26-
return 1
26+
pass
2727
return 0
2828

2929

0 commit comments

Comments
 (0)