From c447326769fd9f96e1c452df7156f5416a43641f Mon Sep 17 00:00:00 2001 From: "Rodolfo U. Batista" Date: Sun, 30 Aug 2020 10:44:24 -0300 Subject: [PATCH] Updating configuration files. --- .gitignore | 28 +++++++++++++++++++++++++++- BuildFiles.ahk | 13 +++++++------ Compile.ahk | 10 +++------- 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index e3a24a1..53838de 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,30 @@ *.hhc *.hhk *.hhp -*.lnk \ No newline at end of file +*.lnk + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/BuildFiles.ahk b/BuildFiles.ahk index 97e6265..8354a0a 100644 --- a/BuildFiles.ahk +++ b/BuildFiles.ahk @@ -43,7 +43,7 @@ AppPublisherURL={#PmcURL} AppCopyright={#PmcCopyright} AppSupportURL={#PmcURL} AppUpdatesURL={#PmcURL} -DefaultDirName={pf}\MacroCreator +DefaultDirName={commonpf}\MacroCreator DefaultGroupName={#PmcName} AllowNoIcons=yes LicenseFile={#WorkDir}\License.txt @@ -54,31 +54,32 @@ Compression=lzma SolidCompression=yes ChangesAssociations=yes ArchitecturesInstallIn64BitMode=x64 -Uninstallable=not IsTaskSelected('portableinstall') +Uninstallable=not WizardIsTaskSelected('portableinstall') [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "armenian"; MessagesFile: "compiler:Languages\Armenian.isl" Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl" +Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl" Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl" Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl" Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl" Name: "french"; MessagesFile: "compiler:Languages\French.isl" Name: "german"; MessagesFile: "compiler:Languages\German.isl" -Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl" Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl" -Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl" +Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl" Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl" Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl" Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" -Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl" -Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl" +Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl" Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" +Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl" Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl" [Tasks] diff --git a/Compile.ahk b/Compile.ahk index dec7138..d47ebe8 100644 --- a/Compile.ahk +++ b/Compile.ahk @@ -53,15 +53,11 @@ If (ErrorLevel = "ERROR") ExitApp } -RunWait, %ProgramFiles%\Inno Setup 5\iscc.exe %A_ScriptDir%\Installer.iss,, UseErrorLevel +RunWait, %ProgramFiles%\Inno Setup 6\iscc.exe %A_ScriptDir%\Installer.iss,, UseErrorLevel If (ErrorLevel = "ERROR") { - RunWait, %ProgramFiles% (x86)\Inno Setup 5\iscc.exe %A_ScriptDir%\Installer.iss,, UseErrorLevel - If (ErrorLevel = "ERROR") - { - MsgBox, 0x40000, Error, % "Error code: " A_LastError " at line " A_LineNumber - 3 - ExitApp - } + MsgBox, 0x40000, Error, % "Error code: " A_LastError " at line " A_LineNumber - 3 + ExitApp } FileRemoveDir, Compiled\MacroCreatorPortable, 1