From a64e89994f6a9df051aa97a2f10ce43ac2f67546 Mon Sep 17 00:00:00 2001 From: Jose Manuel Delicado Date: Sat, 6 Aug 2016 18:22:54 +0200 Subject: [PATCH] Added spelling dictionaries for almost all application languages. Setup.py has been modified to handle them automatically. Remember running git submodule update. Increased version number to 0.85. Updated readme --- README.md | 2 +- doc/application.py | 2 +- mysc/pa.c format/App/AppInfo/appinfo.ini | 4 ++-- scripts/twblue.nsi | 10 +++++----- src/application.py | 2 +- src/setup.py | 4 ++-- updates/stable.json | 2 +- windows-dependencies | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 6aef15d4..fb852420 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ This dependency has been built using pure basic 4.61. Its source can be found at * [NSIS Unicode Portable,](http://portableapps.com/apps/development/nsis_portable) version 2.46.5 rev 3 * [PortableApps.com Launcher,](http://portableapps.com/apps/development/portableapps.com_launcher) version 2.2 -* [PortableApps.com Installer,](http://portableapps.com/apps/development/portableapps.com_installer) version 3.1.3 +* [PortableApps.com Installer,](http://portableapps.com/apps/development/portableapps.com_installer) version 3.3.2 Important! Install these 3 apps into the same folder, otherwise you won't be able to build the pa.c version. For example: D:\portableApps\NSISPortable, D:\PortableApps\PortableApps.com installer, ... diff --git a/doc/application.py b/doc/application.py index 02192a15..ff33ac83 100644 --- a/doc/application.py +++ b/doc/application.py @@ -2,7 +2,7 @@ name = 'TWBlue' snapshot = False if snapshot == False: - version = "0.84" + version = "0.85" update_url = 'http://twblue.es/updates/twblue_ngen.json' mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/stable.json' else: diff --git a/mysc/pa.c format/App/AppInfo/appinfo.ini b/mysc/pa.c format/App/AppInfo/appinfo.ini index bea75abf..059b90ff 100644 --- a/mysc/pa.c format/App/AppInfo/appinfo.ini +++ b/mysc/pa.c format/App/AppInfo/appinfo.ini @@ -20,8 +20,8 @@ CommercialUse=true EULAVersion=2 [Version] -PackageVersion=0.84.0.0 -DisplayVersion=0.84 +PackageVersion=0.85.0.0 +DisplayVersion=0.85 [Control] Icons=1 diff --git a/scripts/twblue.nsi b/scripts/twblue.nsi index 5927a8ef..4368a006 100644 --- a/scripts/twblue.nsi +++ b/scripts/twblue.nsi @@ -13,9 +13,9 @@ SetCompressor /solid lzma SetDatablockOptimize on VIAddVersionKey ProductName "TWBlue" VIAddVersionKey LegalCopyright "Copyright 2016 Manuel Cortéz." -VIAddVersionKey ProductVersion "0.84" -VIAddVersionKey FileVersion "0.84" -VIProductVersion "0.84.0.0" +VIAddVersionKey ProductVersion "0.85" +VIAddVersionKey FileVersion "0.85" +VIProductVersion "0.85.0.0" !insertmacro MUI_PAGE_WELCOME !define MUI_LICENSEPAGE_RADIOBUTTONS !insertmacro MUI_PAGE_LICENSE "license.txt" @@ -69,10 +69,10 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "D WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "UninstallString" '"$INSTDIR\uninstall.exe"' WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall" "InstallLocation" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall" "Publisher" "Manuel Cortéz" -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "DisplayVersion" "0.84" +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "DisplayVersion" "0.85" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "URLInfoAbout" "http://twblue.es" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "VersionMajor" 0 -WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "VersionMinor" 84 +WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "VersionMinor" 85 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "NoModify" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "NoRepair" 1 SectionEnd diff --git a/src/application.py b/src/application.py index 02192a15..ff33ac83 100644 --- a/src/application.py +++ b/src/application.py @@ -2,7 +2,7 @@ name = 'TWBlue' snapshot = False if snapshot == False: - version = "0.84" + version = "0.85" update_url = 'http://twblue.es/updates/twblue_ngen.json' mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/stable.json' else: diff --git a/src/setup.py b/src/setup.py index 1f38a759..3bd0b308 100644 --- a/src/setup.py +++ b/src/setup.py @@ -41,7 +41,6 @@ def get_architecture_files(): ("Microsoft.VC90.MFC", glob("../windows-dependencies/x64/Microsoft.VC90.MFC/*")),] def get_data(): - import accessible_output2 import sound_lib import enchant return [ @@ -50,7 +49,8 @@ def get_data(): ("accessible_output2/lib", glob("accessible_output2/lib/*.dll")), ("keys/lib", glob("keys/lib/*.dll")), ("keymaps", glob("keymaps/*.keymap")), -]+get_sounds()+get_locales()+get_documentation()+sound_lib.find_datafiles()+accessible_output2.find_datafiles()+enchant.utils.win32_data_files()+get_architecture_files()+wx_files() +("share/enchant/myspell", glob("../windows-dependencies/dictionaries/*)), +]+get_sounds()+get_locales()+get_documentation()+sound_lib.find_datafiles()+enchant.utils.win32_data_files()+get_architecture_files()+wx_files() def get_documentation (): answer = [("documentation", ["documentation/license.txt"])] diff --git a/updates/stable.json b/updates/stable.json index 20537335..bd28b00b 100644 --- a/updates/stable.json +++ b/updates/stable.json @@ -1,4 +1,4 @@ -{"current_version": "0.84", +{"current_version": "0.85", "description": "The first version for the new generation of TWBlue.", "downloads": {"Windows32": "http://twblue.es/pubs/twblue_ngen_0.80_x86.zip", diff --git a/windows-dependencies b/windows-dependencies index d40c8966..d927229b 160000 --- a/windows-dependencies +++ b/windows-dependencies @@ -1 +1 @@ -Subproject commit d40c89666083a45062d0dbd6a78d8f4476f3aecd +Subproject commit d927229b99e4f4be5aa0dc89ccef36a36e69bc18