From 52a557833ef0c71efbb025cfc6fa20b7f1b0e2e3 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Tue, 18 Feb 2014 14:05:38 -0500 Subject: stuff --- .travis.sh | 2 +- unrpyc/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.sh b/.travis.sh index e09102e..ccc7ffe 100755 --- a/.travis.sh +++ b/.travis.sh @@ -16,7 +16,7 @@ case "$1" in curl https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz | tar -xz ;; install) - sudo apt-get install -q libjpeg-progs libtheora-dev libvpx-dev libx264-dev webp yasm + sudo apt-get install -q libjpeg-progs libtheora-dev libvpx-dev libx264-dev npm webp yasm cd fdk-aac-0.1.3 ./configure --disable-shared diff --git a/unrpyc/Makefile b/unrpyc/Makefile index 044a2bd..ea331ba 100644 --- a/unrpyc/Makefile +++ b/unrpyc/Makefile @@ -16,15 +16,15 @@ script.json: $(patsubst %.rpyc,%.json,$(wildcard script-*.rpyc)) uglifyjs $< --expr > $@ ui-strings.json.o ui-strings_FR.json.o: ui-strings%.json.o: ui-strings%.rpyc *.py - python unrpyc.py --clobber $< $@ + python3 unrpyc.py --clobber $< $@ sed -i -e 's/ \["init_language", "[a-z]*", \],//;s/^\]}$$/}/' $@ ui_settings.json.o: ui_settings.rpyc *.py - python unrpyc.py --clobber $< --ignore-python $@ + python3 unrpyc.py --clobber $< --ignore-python $@ sed -i -e 's/,,/,/g;/: *,$$/d' $@ %.json.o: %.rpyc *.py - python unrpyc.py --clobber $< $@ + python3 unrpyc.py --clobber $< $@ script-%.json: script-%.json.o uglifyjs $< --expr > $@ -- cgit v1.2.3-70-g09d2