diff --git a/.gitignore b/.gitignore index 2e21c8a..774b5f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ -.DS_Store +!/.gitignore +.* +*~ +*.log node_modules -npm-debug.log wikilibras_server video/* tmp/ diff --git a/Makefile b/Makefile index d734a00..a16d9e6 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,26 @@ -LOG=server.log -SERVER=server.js +LOG = server.log +SERVER = server.js +BLENDER_VER = "2.74" +BLENDER_DIR = "blender-$(BLENDER_VER)-linux-glibc211-x86_64" +BLENDER_BZ2 = "$(BLENDER_DIR).tar.bz2" +BLENDER_URL = "http://download.blender.org/release/Blender$(BLENDER_VER)/$(BLENDER_BZ2)" +CACHE += "./events.log" +CACHE += "./server.log" +DONE = [\33[32;5mFinalizado\33[m] +FAIL = [\33[31;5mFalhou\33[m] Codigo: $$? -.PHONY: help install list run start stop +.PHONY: install list run start stop -install: .update .blender .nodejs .npm .mongodb +__help__: + @echo "" + @echo " \33[32;5m make install \33[0m \33[34;5m instala todas as dependencias da API \33[0m" + @echo " \33[32;5m make list \33[0m \33[34;5m lista a API se estiver ativa em background \33[0m" + @echo " \33[32;5m make run \33[0m \33[34;5m conecta o servidor js ao MongoDB para testes \33[0m" + @echo " \33[32;5m make start \33[0m \33[34;5m inicia uma instancia da API em background \33[0m" + @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 @echo "\33[31;5mO computador deve ser reiniciado para concluir o processo\33[0m" .update: @@ -11,16 +28,29 @@ install: .update .blender .nodejs .npm .mongodb .blender: @sudo apt-get -y install blender - + @test -d "/usr/share/blender$(BLENDER_VER)/" || make -s .blender_stable + +.blender_stable: + @wget $(BLENDER_URL) -NcO ""$$HOME"/$(BLENDER_DIR).tar.bz2" + @cd "$$HOME" && \ + tar -xf $(BLENDER_BZ2) && \ + sudo rm -rf "/usr/share/blender$(BLENDER_VER)/" && \ + sudo mv -f "$(BLENDER_DIR)" "/usr/share/blender$(BLENDER_VER)" && \ + 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) + .nodejs: @sudo apt-get -y install nodejs @sudo ln -sf "/usr/bin/nodejs" "/usr/bin/node" .npm: - @sudo apt-get update - @sudo apt-get -y install gcc make build-essential npm @sudo rm -rf "./node_modules" - @sudo ln -sf "$$HOME" "wikilibras_server" + @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 @sudo npm install -g forever node-gyp @sudo npm link forever node-gyp @@ -33,18 +63,6 @@ install: .update .blender .nodejs .npm .mongodb @sudo apt-get install -y mongodb-org @sudo rm "/etc/apt/sources.list.d/mongodb-org-3.0.list" -help: - @echo "" - @echo " \33[33;5m Apenas uma instancia da API deve ser executada\33[0m" - @echo "" - @echo " \33[32;5m help \33[0m \33[34;5m exibe essa ajuda \33[0m" - @echo " \33[32;5m install \33[0m \33[34;5m instala todas as dependencias da API \33[0m" - @echo " \33[32;5m list \33[0m \33[34;5m lista a API se estiver ativa em background \33[0m" - @echo " \33[32;5m run \33[0m \33[34;5m conecta o servidor js ao MongoDB para testes \33[0m" - @echo " \33[32;5m start \33[0m \33[34;5m inicia uma instancia da API em background \33[0m" - @echo " \33[32;5m stop \33[0m \33[34;5m finaliza a API instanciada no background \33[0m" - @echo "" - list: @forever list diff --git a/public/assets/css/.sass-cache/b8ff95717abe9141bb02c85d4daf286641f59094/main.scssc b/public/assets/css/.sass-cache/b8ff95717abe9141bb02c85d4daf286641f59094/main.scssc deleted file mode 100644 index 8839851..0000000 Binary files a/public/assets/css/.sass-cache/b8ff95717abe9141bb02c85d4daf286641f59094/main.scssc and /dev/null differ -- libgit2 0.21.2