From 2f55e463e6efa2167594bdd078f775246cb9648f Mon Sep 17 00:00:00 2001
From: Bruno <brunosantos@lavid.ufpb.br>
Date: Tue, 17 Mar 2015 10:55:13 -0300
Subject: [PATCH] instalador do usuário com wheels

---
 Makefile                         |  7 +++----
 install/user_install.bat         |  9 +++++----
 plugin/Plugin-x64/CorePlugin.dll | Bin 65024 -> 0 bytes
 plugin/Plugin-x64/CorePlugin.lib | Bin 2148 -> 0 bytes
 plugin/corePlugin.cpp            |  1 -
 5 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 plugin/Plugin-x64/CorePlugin.dll

diff --git a/Makefile b/Makefile
index 2db7d26..a8b80e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ############################## MAKEFILE VLIBRAS ############################
 #																		   #						   
-#	Bruno Santos														   #
+#	Bruno Santos	   				      								   #
 #	brunosantos@lavid.ufpb.br   										   #
 #																		   #
 ############################################################################
@@ -25,6 +25,8 @@ INCLUDES = include\pyTradutor.h include\pyClip.h
 
 CLEAN_OBJ = del -q *.obj
 
+HOME = %homepath%
+
 #Gera executável testLibras
 all: $(FILES) $(INCLUDES) src\testLibras.cpp 
 	$(CC) -Fe$(OUT) -EHsc src\testLibras.cpp $(FILES) $(CFLAGS) $(LFLAGS)
@@ -69,9 +71,6 @@ test-plugin:
 	$(CC) plugin\testPlugin.cpp -EHsc
 	$(CLEAN_OBJ)
 	
-# Baixa e instala dependências
-install:
-	instalador\install
 
 #Gera documentação
 doc:
diff --git a/install/user_install.bat b/install/user_install.bat
index c2fe586..f92f1fb 100644
--- a/install/user_install.bat
+++ b/install/user_install.bat
@@ -43,10 +43,11 @@ msiexec /i python-2.7.9.msi /passive
 
 ::################# Instalação do Aelius #################
 
-pyyaml.exe
-numpy.exe
-matplotlib.exe
-nltk.exe
+python.exe pip-6.0.8-py2.py3-none-any.whl/pip install pip-6.0.8-py2.py3-none-any.whl
+pip install PyYAML-3.11-cp27-none-win32.whl
+pip install numpy-1.9.2+mkl-cp27-none-win32.whl
+pip install matplotlib-1.4.3-cp27-none-win32.whl
+pip install nltk-3.0.2-py2.py3-none-any.whl
 
 IF NOT EXIST C:"\Program Files (x86)\7-Zip" (msiexec /i 7zip.msi /passive)
 
diff --git a/plugin/Plugin-x64/CorePlugin.dll b/plugin/Plugin-x64/CorePlugin.dll
deleted file mode 100644
index 776a55f..0000000
Binary files a/plugin/Plugin-x64/CorePlugin.dll and /dev/null differ
diff --git a/plugin/Plugin-x64/CorePlugin.lib b/plugin/Plugin-x64/CorePlugin.lib
index eae376e..7ef0fda 100644
Binary files a/plugin/Plugin-x64/CorePlugin.lib and b/plugin/Plugin-x64/CorePlugin.lib differ
diff --git a/plugin/corePlugin.cpp b/plugin/corePlugin.cpp
index 66ea26e..b202550 100644
--- a/plugin/corePlugin.cpp
+++ b/plugin/corePlugin.cpp
@@ -26,7 +26,6 @@
         //Copia área de transferência para input
         char *input = clipboard->clip(); 
         
-
         //Retorna a tradução do texto para glosa 
         return strlwr(tradutor->convertStringToGlosa(input));
     }
--
libgit2 0.21.2