diff --git a/.gitignore b/.gitignore index 774b5f7..68a12b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ -!/.gitignore .* *~ +!.gitignore +!.gitempty *.log -node_modules -wikilibras_server video/* tmp/ +node_modules/ +wikilibras_server diff --git a/Makefile b/Makefile index 100cad1..4c68bf8 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,6 @@ CACHE += "./server.log" DONE = [\33[32;5mFinalizado\33[m] FAIL = [\33[31;5mFalhou\33[m] Codigo: $$? -.PHONY: clean install list run start stop - __help__: @echo "" @echo " \33[32;5m make clean \33[0m \33[34;5m Remove os logs do servidor \33[0m" @@ -21,11 +19,16 @@ __help__: @echo " \33[32;5m make stop \33[0m \33[34;5m finaliza a API instanciada no background \33[0m" @echo "" -install: clean .update .blender .nodejs .npm .mongodb +clean: + @rm -rf $(CACHE) + +install: uninstall .update .blender .libav .nodejs .npm .mongodb @echo "\33[31;5mO computador deve ser reiniciado para concluir o processo\33[0m" -.update: - @sudo apt-get update +uninstall: clean + @sudo rm -rf "./node_modules" + @sudo rm -f "./wikilibras_server" + @sudo rm -rf "./node_modules" .blender: @sudo apt-get -y install blender @@ -40,16 +43,21 @@ install: clean .update .blender .nodejs .npm .mongodb sudo ln -sf "/usr/share/blender$(BLENDER_VER)/blender" "/usr/bin/blender" && \ sudo ln -sf "/usr/share/blender$(BLENDER_VER)/blenderplayer" "/usr/bin/blenderplayer" -clean: - @rm -rf $(CACHE) +.libav: + @sudo apt-get -y install libav-tools + +.mongodb: + @sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 + @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" + @sudo apt-get update + @sudo apt-get install -y mongodb-org + @sudo rm "/etc/apt/sources.list.d/mongodb-org-3.0.list" .nodejs: @sudo apt-get -y install nodejs @sudo ln -sf "/usr/bin/nodejs" "/usr/bin/node" .npm: - @sudo rm -rf "./node_modules" - @sudo rm -f "./wikilibras_server" @sudo apt-get -y install gcc make build-essential npm @sudo ln -sf "$$HOME" "wikilibras_server" @sudo npm cache clean @@ -57,12 +65,8 @@ clean: @sudo npm link forever node-gyp @sudo npm install -.mongodb: - @sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 - @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" +.update: @sudo apt-get update - @sudo apt-get install -y mongodb-org - @sudo rm "/etc/apt/sources.list.d/mongodb-org-3.0.list" list: @forever list diff --git a/package.json b/package.json index 875b061..8bb0b5b 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,21 @@ { - "name": "wikilibras-api", - "version": "0.0.1", - "description": "An API for WikiLibras", - "main": "server.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "start": "node server.js" - }, - "author": "LAViD", - "license": "MIT", - "private": true, - "dependencies": { - "body-parser": "^1.9.2", - "express": "~3.5.1", - "mkdirp": "^0.5.0", - "mongoose": "~3.8.x", - "node-uuid": "^1.4.1", - "python-shell": "0.0.3" - } + "name": "wikilibras-api", + "version": "0.0.1", + "description": "An API for WikiLibras", + "main": "server.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node server.js" + }, + "author": "LAViD", + "license": "MIT", + "private": true, + "dependencies": { + "body-parser": "^1.9.2", + "express": "~3.5.1", + "mkdirp": "^0.5.0", + "mongoose": "~3.8.x", + "node-uuid": "^1.4.1", + "python-shell": "0.0.3" + } } -- libgit2 0.21.2