Download as
Browse Code »

Commit e19811f19e746f967c1c1d04d8b3fde74263cdde

Authored by André Araújo
1 parent 7e0a72ee
Exists in master

Adiciona instalação do avconv no Makefile

Showing 3 changed files with 41 additions and 36 deletions   Show diff stats
1 -!/.gitignore  
2 .* 1 .*
3 *~ 2 *~
  3 +!.gitignore
  4 +!.gitempty
4 *.log 5 *.log
5 -node_modules  
6 -wikilibras_server  
7 video/* 6 video/*
8 tmp/ 7 tmp/
  8 +node_modules/
  9 +wikilibras_server
@@ -9,8 +9,6 @@ CACHE += "./server.log" @@ -9,8 +9,6 @@ CACHE += "./server.log"
9 DONE = [\33[32;5mFinalizado\33[m] 9 DONE = [\33[32;5mFinalizado\33[m]
10 FAIL = [\33[31;5mFalhou\33[m] Codigo: $$? 10 FAIL = [\33[31;5mFalhou\33[m] Codigo: $$?
11 11
12 -.PHONY: clean install list run start stop  
13 -  
14 __help__: 12 __help__:
15 @echo "" 13 @echo ""
16 @echo " \33[32;5m make clean \33[0m \33[34;5m Remove os logs do servidor \33[0m" 14 @echo " \33[32;5m make clean \33[0m \33[34;5m Remove os logs do servidor \33[0m"
@@ -21,11 +19,16 @@ __help__: @@ -21,11 +19,16 @@ __help__:
21 @echo " \33[32;5m make stop \33[0m \33[34;5m finaliza a API instanciada no background \33[0m" 19 @echo " \33[32;5m make stop \33[0m \33[34;5m finaliza a API instanciada no background \33[0m"
22 @echo "" 20 @echo ""
23 21
24 -install: clean .update .blender .nodejs .npm .mongodb 22 +clean:
  23 + @rm -rf $(CACHE)
  24 +
  25 +install: uninstall .update .blender .libav .nodejs .npm .mongodb
25 @echo "\33[31;5mO computador deve ser reiniciado para concluir o processo\33[0m" 26 @echo "\33[31;5mO computador deve ser reiniciado para concluir o processo\33[0m"
26 27
27 -.update:  
28 - @sudo apt-get update 28 +uninstall: clean
  29 + @sudo rm -rf "./node_modules"
  30 + @sudo rm -f "./wikilibras_server"
  31 + @sudo rm -rf "./node_modules"
29 32
30 .blender: 33 .blender:
31 @sudo apt-get -y install blender 34 @sudo apt-get -y install blender
@@ -40,16 +43,21 @@ install: clean .update .blender .nodejs .npm .mongodb @@ -40,16 +43,21 @@ install: clean .update .blender .nodejs .npm .mongodb
40 sudo ln -sf "/usr/share/blender$(BLENDER_VER)/blender" "/usr/bin/blender" && \ 43 sudo ln -sf "/usr/share/blender$(BLENDER_VER)/blender" "/usr/bin/blender" && \
41 sudo ln -sf "/usr/share/blender$(BLENDER_VER)/blenderplayer" "/usr/bin/blenderplayer" 44 sudo ln -sf "/usr/share/blender$(BLENDER_VER)/blenderplayer" "/usr/bin/blenderplayer"
42 45
43 -clean:  
44 - @rm -rf $(CACHE) 46 +.libav:
  47 + @sudo apt-get -y install libav-tools
  48 +
  49 +.mongodb:
  50 + @sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
  51 + @echo "deb http://repo.mongodb.org/apt/ubuntu "$$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | sudo tee "/etc/apt/sources.list.d/mongodb-org-3.0.list"
  52 + @sudo apt-get update
  53 + @sudo apt-get install -y mongodb-org
  54 + @sudo rm "/etc/apt/sources.list.d/mongodb-org-3.0.list"
45 55
46 .nodejs: 56 .nodejs:
47 @sudo apt-get -y install nodejs 57 @sudo apt-get -y install nodejs
48 @sudo ln -sf "/usr/bin/nodejs" "/usr/bin/node" 58 @sudo ln -sf "/usr/bin/nodejs" "/usr/bin/node"
49 59
50 .npm: 60 .npm:
51 - @sudo rm -rf "./node_modules"  
52 - @sudo rm -f "./wikilibras_server"  
53 @sudo apt-get -y install gcc make build-essential npm 61 @sudo apt-get -y install gcc make build-essential npm
54 @sudo ln -sf "$$HOME" "wikilibras_server" 62 @sudo ln -sf "$$HOME" "wikilibras_server"
55 @sudo npm cache clean 63 @sudo npm cache clean
@@ -57,12 +65,8 @@ clean: @@ -57,12 +65,8 @@ clean:
57 @sudo npm link forever node-gyp 65 @sudo npm link forever node-gyp
58 @sudo npm install 66 @sudo npm install
59 67
60 -.mongodb:  
61 - @sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10  
62 - @echo "deb http://repo.mongodb.org/apt/ubuntu "$$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | sudo tee "/etc/apt/sources.list.d/mongodb-org-3.0.list" 68 +.update:
63 @sudo apt-get update 69 @sudo apt-get update
64 - @sudo apt-get install -y mongodb-org  
65 - @sudo rm "/etc/apt/sources.list.d/mongodb-org-3.0.list"  
66 70
67 list: 71 list:
68 @forever list 72 @forever list
1 { 1 {
2 - "name": "wikilibras-api",  
3 - "version": "0.0.1",  
4 - "description": "An API for WikiLibras",  
5 - "main": "server.js",  
6 - "scripts": {  
7 - "test": "echo \"Error: no test specified\" && exit 1",  
8 - "start": "node server.js"  
9 - },  
10 - "author": "LAViD",  
11 - "license": "MIT",  
12 - "private": true,  
13 - "dependencies": {  
14 - "body-parser": "^1.9.2",  
15 - "express": "~3.5.1",  
16 - "mkdirp": "^0.5.0",  
17 - "mongoose": "~3.8.x",  
18 - "node-uuid": "^1.4.1",  
19 - "python-shell": "0.0.3"  
20 - } 2 + "name": "wikilibras-api",
  3 + "version": "0.0.1",
  4 + "description": "An API for WikiLibras",
  5 + "main": "server.js",
  6 + "scripts": {
  7 + "test": "echo \"Error: no test specified\" && exit 1",
  8 + "start": "node server.js"
  9 + },
  10 + "author": "LAViD",
  11 + "license": "MIT",
  12 + "private": true,
  13 + "dependencies": {
  14 + "body-parser": "^1.9.2",
  15 + "express": "~3.5.1",
  16 + "mkdirp": "^0.5.0",
  17 + "mongoose": "~3.8.x",
  18 + "node-uuid": "^1.4.1",
  19 + "python-shell": "0.0.3"
  20 + }
21 } 21 }