Skip to content

Commit 9b64b8a

Browse files
committed
pip teething problems.
1 parent 0325d74 commit 9b64b8a

File tree

9 files changed

+63
-42
lines changed

9 files changed

+63
-42
lines changed

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11

22
all:
3-
@echo 'To ...'
3+
@echo 'To develop : "make develop"'
4+
@echo 'To test install : "make testinstall"'
5+
@echo 'To install : "make install"'
6+
@echo 'To test publish : "make testpublish"'
7+
@echo 'To publish : "make publish"'
48

59

610
#local editable install for developing
@@ -12,7 +16,7 @@ dist: clean
1216
python setup.py bdist_wheel
1317

1418
# If you need to push this project again,
15-
# INCREASE the version number in wllvm/util.py,
19+
# INCREASE the version number in wllvm/version.py,
1620
# otherwise the server will give you an error.
1721

1822
testpublish: dist

setup.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,25 @@
1313
long_description = f.read()
1414

1515
# use the in house version number so we stay in synch with ourselves.
16-
from wllvm.util import wllvm_version
16+
from wllvm.version import wllvm_version
1717

1818
setup(
1919
name='wllvm',
2020
version=wllvm_version,
2121
description='Whole Program LLVM',
2222
long_description=long_description,
2323
url='https://github.com/SRI-CSL/whole-program-llvm',
24-
author='Ian A. Mason, ...',
24+
author='Ian A. Mason, Tristan Ravitch, Dan Liew, Bruno Dutertre, ...',
2525
author_email='iam@csl.sri.com',
26-
2726

28-
packages=find_packages(exclude=['test']),
27+
packages=find_packages(exclude=['test', 'doc' ]),
2928

3029
entry_points = {
3130
'console_scripts': [
3231
'wllvm = wllvm.wllvm:main',
33-
'wllvm++ = wllvm.wllvm++:main',
34-
'wllvm-sanity-checker = wllvm.wllvm-sanity-checker:main',
35-
'extract-bc = wllvm.extract-bc:main',
32+
'wllvm++ = wllvm.wllvmpp:main',
33+
'wllvm-sanity-checker = wllvm.sanity:main',
34+
'extract-bc = wllvm.extractor:main',
3635
],
3736
},
3837

@@ -41,14 +40,19 @@
4140
license='MIT',
4241

4342
classifiers=[
44-
'Development Status :: 3 - Alpha',
43+
'Development Status :: 4 - Beta',
4544
'Natural Language :: English',
45+
'Intended Audience :: Science/Research',
4646
'Intended Audience :: Developers',
47-
'Topic :: System :: Distributed Computing',
47+
'Topic :: Software Development :: Compilers',
4848
'License :: OSI Approved :: MIT License',
4949
'Operating System :: OS Independent',
50+
'Operating System :: MacOS',
51+
'Operating System :: POSIX :: Linux',
52+
'Operating System :: POSIX :: BSD',
5053
'Programming Language :: Python',
5154
'Programming Language :: Python :: 2',
5255
'Programming Language :: Python :: 2.7',
56+
'Programming Language :: Python :: 3',
5357
],
5458
)

wllvm/extraction.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
import sys
33
import subprocess as sp
44

5-
from driver.utils import llvmCompilerPathEnv
6-
from driver.popenwrapper import Popen
7-
from driver.utils import elfSectionName
8-
from driver.utils import darwinSegmentName
9-
from driver.utils import darwinSectionName
10-
from driver.utils import FileType
11-
12-
import driver.logconfig
5+
from utils import llvmCompilerPathEnv
6+
from popenwrapper import Popen
7+
from utils import elfSectionName
8+
from utils import darwinSegmentName
9+
from utils import darwinSectionName
10+
from utils import FileType
11+
12+
import logconfig
1313

1414
import logging
1515
import pprint

wllvm/extract-bc renamed to wllvm/extractor.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@
2121
2222
"""
2323

24-
import sys
24+
import sys, os
2525

2626
sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
2727

28-
from wllvm.extraction import *
28+
from extraction import *
2929

3030
def main():
3131
return extraction(sys.argv)
3232

33+
if __name__ == '__main__':
34+
sys.exit(main())

wllvm/wllvm-sanity-checker renamed to wllvm/sanity.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
77
"""
88

9-
import sys
9+
import sys, os
1010

1111
sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
1212

13-
from wllvm.checker import *
13+
from checker import *
1414

1515
def main():
1616
return Checker().check()
1717

18-
19-
2018

19+
if __name__ == '__main__':
20+
sys.exit(main())

wllvm/utils.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616
prefix = os.path.dirname(fullSelfPath)
1717
driverDir = prefix
1818

19-
# Freeping Creaturism:
20-
#
21-
# this is the all important version number used by pip.
22-
#
23-
#
24-
wllvm_version='1.0.0.dev0'
25-
2619

2720
# Environmental variable for path to compiler tools (clang/llvm-link etc..)
2821
llvmCompilerPathEnv = 'LLVM_COMPILER_PATH'

wllvm/version.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Freeping Creaturism:
2+
#
3+
# this is the all important version number used by pip.
4+
#
5+
#
6+
wllvm_version='1.0.0.dev0'
7+

wllvm/wllvm renamed to wllvm/wllvm.py

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

1616
sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
1717

18+
from utils import *
1819

19-
from wllvm.utils import *
20-
import wllvm.logconfig
20+
import logconfig
2121

2222

2323
def main():
@@ -30,3 +30,7 @@ def main():
3030
buildAndAttachBitcode(builder)
3131

3232
return 0
33+
34+
35+
if __name__ == '__main__':
36+
sys.exit(main())

wllvm/wllvm++ renamed to wllvm/wllvmpp.py

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,20 @@
1313

1414
sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
1515

16-
from wllvm.utils import *
17-
import wllvm.logconfig
16+
from utils import *
17+
import logconfig
1818

19-
cmd = list(sys.argv)
20-
cmd = cmd[1:]
19+
def main():
20+
cmd = list(sys.argv)
21+
cmd = cmd[1:]
2122

22-
builder = getBuilder(cmd, True)
23-
buildObject(builder)
24-
if not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
25-
buildAndAttachBitcode(builder)
23+
builder = getBuilder(cmd, True)
24+
buildObject(builder)
25+
if not os.environ.get('WLLVM_CONFIGURE_ONLY', False):
26+
buildAndAttachBitcode(builder)
27+
28+
29+
30+
if __name__ == '__main__':
31+
sys.exit(main())
32+

0 commit comments

Comments
 (0)