MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-05 02:38:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #185 from chewi/master

Browse Source 
Allow ANTLR 3.5 to work and update script
This commit is contained in:
ejurgensen 2015-10-08 23:51:15 +02:00
commit da3d32902e
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/antlr34_install.sh → scripts/antlr35_install.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
WORKDIR=~/antlr34.tmp WORKDIR=~/antlr35.tmp
echo "This script will install antlr 3.4 (and matching libantlr) on your computer." echo "This script will install antlr 3.5 (and matching libantlr) on your computer."
read -p "Should the script create $WORKDIR and use it for building? [Y/n] " yn read -p "Should the script create $WORKDIR and use it for building? [Y/n] " yn
if [ "$yn" = "n" ]; then if [ "$yn" = "n" ]; then
exit exit
@ -27,7 +27,7 @@ read -p "Should the script build libantlr3c for 64 bit? [Y/n] " yn
if [ "$yn" != "n" ]; then if [ "$yn" != "n" ]; then
ENABLE64BIT="--enable-64bit" ENABLE64BIT="--enable-64bit"
fi fi
wget --no-check-certificate https://github.com/antlr/website-antlr3/raw/gh-pages/download/antlr-3.4-complete.jar wget --no-check-certificate https://github.com/antlr/website-antlr3/raw/gh-pages/download/antlr-3.5.2-complete.jar
wget --no-check-certificate https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz wget --no-check-certificate https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz
tar xzf libantlr3c-3.4.tar.gz tar xzf libantlr3c-3.4.tar.gz
cd libantlr3c-3.4 cd libantlr3c-3.4
@ -35,10 +35,10 @@ cd libantlr3c-3.4
cd $WORKDIR cd $WORKDIR
sudo mkdir -p "$PREFIX/share/java" sudo mkdir -p "$PREFIX/share/java"
sudo install antlr-3.4-complete.jar "$PREFIX/share/java" sudo install antlr-3.5.2-complete.jar "$PREFIX/share/java"
printf "#!/bin/sh printf "#!/bin/sh
export CLASSPATH export CLASSPATH
CLASSPATH=\$CLASSPATH:$PREFIX/share/java/antlr-3.4-complete.jar:$PREFIX/share/java CLASSPATH=\$CLASSPATH:$PREFIX/share/java/antlr-3.5.2-complete.jar:$PREFIX/share/java
/usr/bin/java org.antlr.Tool \$* /usr/bin/java org.antlr.Tool \$*
" > antlr3 " > antlr3
sudo install --mode=755 antlr3 "$PREFIX/bin" sudo install --mode=755 antlr3 "$PREFIX/bin"

34
src/RSP.g
View File

@ -43,43 +43,43 @@ strcrit : FIELD strop STR -> ^(strop FIELD STR)
| FIELD NOT strop STR -> ^(NOT ^(strop FIELD STR)) | FIELD NOT strop STR -> ^(NOT ^(strop FIELD STR))
; ;
strop : EQUAL strop : equal=EQUAL
| INCLUDES | includes=INCLUDES
| STARTSW | startsw=STARTSW
| ENDSW | endsw=ENDSW
; ;
intcrit : FIELD intop INT -> ^(intop FIELD INT) intcrit : FIELD intop INT -> ^(intop FIELD INT)
| FIELD NOT intop INT -> ^(NOT ^(intop FIELD INT)) | FIELD NOT intop INT -> ^(NOT ^(intop FIELD INT))
; ;
intop : EQUAL intop : equal=EQUAL
| LESS | less=LESS
| GREATER | greater=GREATER
| LTE | lte=LTE
| GTE | gte=GTE
; ;
datecrit: FIELD dateop datespec -> ^(dateop FIELD datespec) datecrit: FIELD dateop datespec -> ^(dateop FIELD datespec)
; ;
dateop : BEFORE dateop : before=BEFORE
| AFTER | after=AFTER
; ;
datespec: dateref datespec: dateref
| INT dateintval dateop dateref -> ^(dateop dateref INT dateintval) | INT dateintval dateop dateref -> ^(dateop dateref INT dateintval)
; ;
dateref : DATE dateref : date=DATE
| TODAY | today=TODAY
; ;
dateintval dateintval
: DAY : day=DAY
| WEEK | week=WEEK
| MONTH | month=MONTH
| YEAR | year=YEAR
; ;
QUOTE : '"'; QUOTE : '"';