openstack
/
congress
Code Issues Proposed changes

Fix for broken antlr3 in stand-alone install 

Restored and updated the permanent symlinks and updated setup.cfg
to facilitate proper standalone installation of antlr3 w congress.

Change-Id: I7b603bcf3785374d5e83d0e5a98669dbd93d8cd9
This commit is contained in:
Eric K 2016-03-21 21:40:23 -07:00
parent 5e2c7cde59
commit c90410f904
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
antlr3runtime/Python/antlr3 Symbolic link
View File

@ -0,0 +1 @@
../../thirdparty/antlr3-antlr-3.5/runtime/Python/antlr3/

1
antlr3runtime/Python3/antlr3 Symbolic link
View File

@ -0,0 +1 @@
../../thirdparty/antlr3-antlr-3.5/runtime/Python3/antlr3/

4
congress/datalog/compile.py
View File

@ -40,12 +40,12 @@ _congressDir = os.path.dirname(
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
if six.PY2: if six.PY2:
sys.path.append(_congressDir + sys.path.append(_congressDir +
"/thirdparty/antlr3-antlr-3.5/runtime/Python/") "/antlr3runtime/Python/")
from congress.datalog.Python2 import CongressLexer from congress.datalog.Python2 import CongressLexer
from congress.datalog.Python2 import CongressParser from congress.datalog.Python2 import CongressParser
else: else:
sys.path.append(_congressDir + sys.path.append(_congressDir +
"/thirdparty/antlr3-antlr-3.5/runtime/Python3/") "/antlr3runtime/Python3/")
from congress.datalog.Python3 import CongressLexer from congress.datalog.Python3 import CongressLexer
from congress.datalog.Python3 import CongressParser from congress.datalog.Python3 import CongressParser
import antlr3 import antlr3

3
setup.cfg
View File

@ -22,7 +22,8 @@ classifier =
[files] [files]
packages = packages =
congress congress
antlr3 antlr3runtime/Python/antlr3
antlr3runtime/Python3/antlr3
[global] [global]
setup-hooks = setup-hooks =