From ff0ee0db6e79dcc18ffbecc53ddae8fa4320144d Mon Sep 17 00:00:00 2001 From: bruno Date: Wed, 25 Mar 2015 10:00:53 -0300 Subject: [PATCH] Adicionando script do inno setup --- Clipboard/Clipboard.py | 2 +- install/inno setup/user_install.bat | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ install/inno setup/user_install.iss | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ install/user_install.bat | 49 +++++++++++++++++++++++++++++++++++++------------ plugin/Plugin-x86/CorePlugin.dll | Bin 65536 -> 0 bytes plugin/Plugin-x86/CorePlugin.lib | Bin 2148 -> 0 bytes plugin/corePlugin.cpp | 2 +- 7 files changed, 174 insertions(+), 14 deletions(-) create mode 100644 install/inno setup/user_install.bat create mode 100644 install/inno setup/user_install.iss diff --git a/Clipboard/Clipboard.py b/Clipboard/Clipboard.py index 10b99e8..ab3005e 100644 --- a/Clipboard/Clipboard.py +++ b/Clipboard/Clipboard.py @@ -19,7 +19,7 @@ def clip(): if isinstance(text, unicode): return text.encode("utf-8") else: - return "Selecione um texto" + return "SELECIONE UM TEXTO" def bdragOn(): global process diff --git a/install/inno setup/user_install.bat b/install/inno setup/user_install.bat new file mode 100644 index 0000000..4cea320 --- /dev/null +++ b/install/inno setup/user_install.bat @@ -0,0 +1,82 @@ +::############################## Instalador VLibras ############################ +::# # +::# Bruno Santos # +::# brunosantos@lavid.ufpb.br # +::# # +::############################################################################## + +::Define Título da janela do prompt +TITLE Instalador VLibras-Core Windows + +::Limpa a tela +CLS + +::Desabilita mensagens +@ECHO off + +ECHO ############### Instalando VLibras ############### +::################# Variáveis de Ambiente ################# + +ECHO Exportando Variaveis de Ambiente: + +::Váriaveis Permanentes (Sistema) +ECHO AELIUS_DATA +SETX AELIUS_DATA %HOMEDRIVE%\vlibras-libs\aelius_data /M + +ECHO NLTK_DATA +SETX NLTK_DATA %HOMEDRIVE%\vlibras-libs\nltk_data /M + +ECHO HUNPOS_TAGGER +SETX HUNPOS_TAGGER %HOMEDRIVE%\vlibras-libs\bin\hunpos-tag.exe /M + +ECHO PYTHONPATH +SETX PYTHONPATH %HOMEDRIVE%\Python27;%HOMEDRIVE%\Python27\Scripts;%HOMEDRIVE%\Python27\Lib\site-packages;%HOMEDRIVE%\vlibras-libs;%HOMEDRIVE%\vlibras-libs\vlibras-translate\src;%HOMEDRIVE%\vlibras-libs\Clipboard /M + +@echo off +set path_value=%PATH% + +If NOT "%path_value%"=="%path_value:vlibras=%" ( + echo ok +) else ( + SETX "PATH" "%PATH%";%HOMEDRIVE%\vlibras-libs\bin;%HOMEDRIVE%\Python27;%HOMEDRIVE%\Python27\Scripts;%HOMEDRIVE%\Python27\Lib\site-packages /M +) + +::Código executa a partir desse ponto caso o usuário não precise configurar as variáveis de ambiente +::################# Instalação do Python ################# + +msiexec /i python-2.7.9.msi /passive +ECHO OK + +::################# Dependências ################# +c:\Python27\python.exe pip-6.0.8-py2.py3-none-any.whl/pip install pip-6.0.8-py2.py3-none-any.whl +ECHO OK + +c:\Python27\Scripts\pip install PyYAML-3.11-cp27-none-win32.whl +ECHO OK + +c:\Python27\Scripts\pip install numpy-1.9.2+mkl-cp27-none-win32.whl +ECHO OK + +c:\Python27\Scripts\pip install six-1.9.0-py2.py3-none-any.whl +ECHO OK + +c:\Python27\Scripts\pip install pyparsing-2.0.3-py2-none-any.whl +ECHO OK + +c:\Python27\Scripts\pip install pytz-2014.10-py2.py3-none-any.whl +ECHO OK + +c:\Python27\Scripts\pip install python_dateutil-2.4.0-py2.py3-none-any.whl +ECHO OK + +c:\Python27\Scripts\pip install matplotlib-1.4.3-cp27-none-win32.whl +ECHO OK + +c:\Python27\Scripts\pip install nltk-3.0.2-py2.py3-none-any.whl +ECHO OK + +::################# HUNPOS.PY ############################# +COPY %HOMEDRIVE%\vlibras-libs\nltk_data\hunpos.py %homedrive%\Python27\Lib\site-packages\nltk\tag\ /y +COPY %HOMEDRIVE%\vlibras-libs\nltk_data\data.py %homedrive%\Python27\Lib\site-packages\nltk /y + +ECHO VLibras Tradutor instalado com sucesso! diff --git a/install/inno setup/user_install.iss b/install/inno setup/user_install.iss new file mode 100644 index 0000000..9a96afa --- /dev/null +++ b/install/inno setup/user_install.iss @@ -0,0 +1,53 @@ +;INSTALADOR VLIBRAS WINDOWS +;Bruno Santos, março de 2015 + +#define MyAppName "VLibras" +#define MyAppVersion "1.0" +#define MyAppPublisher "LAViD" +#define MyAppURL "http://www.lavid.ufpb.br" +#define MyAppExeName "Playerx86.exe" + +[Setup] +AppId={{9AA2CD86-F136-47FA-9EFE-474057F0C45F} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={sd}\vlibras-libs +DisableDirPage=yes +DefaultGroupName={#MyAppName} +DisableProgramGroupPage=yes +OutputDir=saida +OutputBaseFilename=VLibras Installer +SetupIconFile="C:\Users\bruno\Desktop\user_install\icon\deaf.ico" +Compression=lzma +SolidCompression=yes + + + +WizardImageFile = "C:\Users\bruno\Pictures\avatar.bmp" +WizardSmallImageFile = "C:\Users\bruno\Pictures\icon.bmp" + +[Languages] +Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}" +Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; OnlyBelowVersion: 0,6.1 + +[Files] +Source: "C:\Users\bruno\Desktop\user_install\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; IconFilename: "{app}\icon\deaf.ico" +Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" +Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; Tasks: desktopicon; IconFilename: "{app}\icon\deaf.ico" +Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\Player\{#MyAppExeName}"; Tasks: quicklaunchicon; IconFilename: "{app}\icon\deaf.ico" + + +[Run] +Filename: {sd}\vlibras-libs\required\user_install.bat; Flags: runhidden + diff --git a/install/user_install.bat b/install/user_install.bat index f92f1fb..53765e1 100644 --- a/install/user_install.bat +++ b/install/user_install.bat @@ -15,7 +15,6 @@ CLS @ECHO off ECHO ############### Instalando VLibras ############### - ::################# Variáveis de Ambiente ################# ECHO Exportando Variaveis de Ambiente: @@ -31,33 +30,59 @@ ECHO HUNPOS_TAGGER SETX HUNPOS_TAGGER %HOMEPATH%\vlibras-libs\bin\hunpos-tag.exe /M ECHO PYTHONPATH -SETX PYTHONPATH %HOMEDRIVE%\Python27;%HOMEDRIVE%\Python27\Scripts;%HOMEDRIVE%\Python27\Lib\site-packages;%HOMEPATH%\vlibras-libs;%HOMEPATH%\vlibras-translate\src;%HOMEPATH%\vlibras-core-win\Clipboard /M +SETX PYTHONPATH %HOMEDRIVE%\Python27;%HOMEDRIVE%\Python27\Scripts;%HOMEDRIVE%\Python27\Lib\site-packages;%HOMEPATH%\vlibras-libs;%HOMEPATH%\vlibras-libs\vlibras-translate\src;%HOMEPATH%\vlibras-libs\Clipboard /M SETX "PATH" "%PATH%";%HOMEPATH%\vlibras-libs\bin;%HOMEDRIVE%\Python27;%HOMEDRIVE%\Python27\Scripts;%HOMEDRIVE%\Python27\Lib\site-packages /M ::Código executa a partir desse ponto caso o usuário não precise configurar as variáveis de ambiente - ::################# Instalação do Python ################# msiexec /i python-2.7.9.msi /passive +ECHO OK -::################# Instalação do Aelius ################# +::################# Dependências ################# +c:\Python27\python.exe pip-6.0.8-py2.py3-none-any.whl/pip install pip-6.0.8-py2.py3-none-any.whl +ECHO OK -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 +c:\Python27\Scripts\pip install PyYAML-3.11-cp27-none-win32.whl +ECHO OK -IF NOT EXIST C:"\Program Files (x86)\7-Zip" (msiexec /i 7zip.msi /passive) +c:\Python27\Scripts\pip install numpy-1.9.2+mkl-cp27-none-win32.whl +ECHO OK + +c:\Python27\Scripts\pip install six-1.9.0-py2.py3-none-any.whl +ECHO OK + +c:\Python27\Scripts\pip install pyparsing-2.0.3-py2-none-any.whl +ECHO OK + +c:\Python27\Scripts\pip install pytz-2014.10-py2.py3-none-any.whl +ECHO OK + +c:\Python27\Scripts\pip install python_dateutil-2.4.0-py2.py3-none-any.whl +ECHO OK +c:\Python27\Scripts\pip install matplotlib-1.4.3-cp27-none-win32.whl +ECHO OK + +c:\Python27\Scripts\pip install nltk-3.0.2-py2.py3-none-any.whl +ECHO OK + +::#################### 7-zip ############################## +IF NOT EXIST C:"\Program Files (x86)\7-Zip" (msiexec /i 7zip.msi /passive) ECHO 7-Zip instalado com sucesso! COPY C:"\Program Files (x86)\7-Zip\7z.exe" %SYSTEMROOT%\System32 -::################# Instalação do VLibras ################# +::################# Instalação do VLibras ################# ECHO Extraindo Arquivos... -7z x -o%HOMEPATH% vlibras-libs.zip vlibras-libs +7z x -o%HOMEPATH% vlibras-libs.zip vlibras-libs -y + +::################# LINK ################################## +COPY %homepath%\vlibras-libs\Tradutor.lnk %homepath%\Desktop\ /y + +::################# HUNPOS.PY ############################# +COPY %homepath%\vlibras-libs\nltk_data\hunpos.py %homedrive%\Python27\Lib\site-packages\nltk\tag\ /y ECHO VLibras Tradutor instalado com sucesso! diff --git a/plugin/Plugin-x86/CorePlugin.dll b/plugin/Plugin-x86/CorePlugin.dll index 66fbc6a..f88934d 100644 Binary files a/plugin/Plugin-x86/CorePlugin.dll and b/plugin/Plugin-x86/CorePlugin.dll differ diff --git a/plugin/Plugin-x86/CorePlugin.lib b/plugin/Plugin-x86/CorePlugin.lib index d9d92ef..ea4d792 100644 Binary files a/plugin/Plugin-x86/CorePlugin.lib and b/plugin/Plugin-x86/CorePlugin.lib differ diff --git a/plugin/corePlugin.cpp b/plugin/corePlugin.cpp index d102440..fb742b5 100644 --- a/plugin/corePlugin.cpp +++ b/plugin/corePlugin.cpp @@ -26,7 +26,7 @@ char *input = clipboard.clip(); //Retorna a tradução do texto para glosa - return strlwr(tradutor->convertStringToGlosa(input)); + return tradutor->convertStringToGlosa(input); } EXPORT_API int coreFinalize() -- libgit2 0.21.2