instalador do usuário com wheels

Bruno
1 parent 8ab1f95e
Showing 5 changed files with 8 additions and 9 deletions Show diff stats
Makefile
install/user_install.bat
plugin/Plugin-x64/CorePlugin.dll
plugin/Plugin-x64/CorePlugin.lib
plugin/corePlugin.cpp
 ############################## 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:
@@ -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)
  
@@ -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));
     }
1	1	############################## MAKEFILE VLIBRAS ############################
2	2	# #
3		-# Bruno Santos #
	3	+# Bruno Santos #
4	4	# brunosantos@lavid.ufpb.br #
5	5	# #
6	6	############################################################################
...	...	@@ -25,6 +25,8 @@ INCLUDES = include\pyTradutor.h include\pyClip.h
25	25
26	26	CLEAN_OBJ = del -q *.obj
27	27
	28	+HOME = %homepath%
	29	+
28	30	#Gera executável testLibras
29	31	all: $(FILES) $(INCLUDES) src\testLibras.cpp
30	32	$(CC) -Fe$(OUT) -EHsc src\testLibras.cpp $(FILES) $(CFLAGS) $(LFLAGS)
...	...	@@ -69,9 +71,6 @@ test-plugin:
69	71	$(CC) plugin\testPlugin.cpp -EHsc
70	72	$(CLEAN_OBJ)
71	73
72		-# Baixa e instala dependências
73		-install:
74		- instalador\install
75	74
76	75	#Gera documentação
77	76	doc:
...	...
...	...	@@ -43,10 +43,11 @@ msiexec /i python-2.7.9.msi /passive
43	43
44	44	::################# Instalação do Aelius #################
45	45
46		-pyyaml.exe
47		-numpy.exe
48		-matplotlib.exe
49		-nltk.exe
	46	+python.exe pip-6.0.8-py2.py3-none-any.whl/pip install pip-6.0.8-py2.py3-none-any.whl
	47	+pip install PyYAML-3.11-cp27-none-win32.whl
	48	+pip install numpy-1.9.2+mkl-cp27-none-win32.whl
	49	+pip install matplotlib-1.4.3-cp27-none-win32.whl
	50	+pip install nltk-3.0.2-py2.py3-none-any.whl
50	51
51	52	IF NOT EXIST C:"\Program Files (x86)\7-Zip" (msiexec /i 7zip.msi /passive)
52	53
...	...
...	...	@@ -26,7 +26,6 @@
26	26	//Copia área de transferência para input
27	27	char *input = clipboard->clip();
28	28
29		-
30	29	//Retorna a tradução do texto para glosa
31	30	return strlwr(tradutor->convertStringToGlosa(input));
32	31	}
...	...