Permalink
Browse files

AutoHotkey v1.1 is now the Official version, see details

- The readme was significantly updated
- The new Official AutoHotkey logo was added
- References to AutoHotkey_L/Basic were removed
- AHKType() now flags all pre-v1.1 builds as "Legacy" and requires that
  the product name contain "AutoHotkey" in order to pass the check
1 parent 5b6d30d commit 6433341436152800072feb8ff955172570e582e5 @fincs committed Oct 26, 2012
Showing with 29 additions and 26 deletions.
  1. +6 −6 Ahk2Exe.ahk
  2. +5 −5 Lib/AHKType.ahk
  3. +16 −0 README.md
  4. +0 −13 README.txt
  5. +2 −2 ScriptParser.ahk
  6. BIN logo.gif
  7. BIN logo.png
View
@@ -44,7 +44,7 @@ Gui, Menu, MenuBar
Gui, +LastFound
GuiHwnd := WinExist("")
-Gui, Add, Text, x287 y34,
+Gui, Add, Text, x287 y25,
(
©2004-2009 Chris Mallet
©2008-2011 Steve Gray (Lexikos)
@@ -68,10 +68,10 @@ Gui, Add, Button, x519 y241 w53 h23 gDefaultIco, D&efault
Gui, Add, Text, x18 y274, Base File (.bin)
Gui, Add, DDL, x138 y270 w315 h23 R10 AltSubmit vBinFileId Choose%BinFileId%, %BinNames%
Gui, Add, CheckBox, x138 y298 w315 h20 vUseMpress Checked%LastUseMPRESS%, Use MPRESS (if present) to compress resulting exe
-Gui, Add, Button, x258 y329 w75 h28 +Default gConvert, > &Convert <
+Gui, Add, Button, x258 y329 w75 h28 Default gConvert, > &Convert <
Gui, Add, Statusbar,, Ready
if !A_IsCompiled
- Gui, Add, Pic, x40 y5 +0x801000, %A_ScriptDir%\logo.gif
+ Gui, Add, Pic, x29 y16, %A_ScriptDir%\logo.png
else
gosub AddPicture
Gui, Show, w594 h383, Ahk2Exe for AutoHotkey v%A_AhkVersion% -- Script to EXE Converter
@@ -90,9 +90,9 @@ return
AddPicture:
; Code based on http://www.autohotkey.com/forum/viewtopic.php?p=147052
-Gui, Add, Text, x40 y5 +0x80100E hwndhPicCtrl
+Gui, Add, Text, x29 y16 +0xE hwndhPicCtrl
-hRSrc := DllCall("FindResource", "ptr", 0, "str", "LOGO.GIF", "ptr", 10, "ptr")
+hRSrc := DllCall("FindResource", "ptr", 0, "str", "LOGO.PNG", "ptr", 10, "ptr")
sData := DllCall("SizeofResource", "ptr", 0, "ptr", hRSrc, "uint")
hRes := DllCall("LoadResource", "ptr", 0, "ptr", hRSrc, "ptr")
pData := DllCall("LockResource", "ptr", hRes, "ptr")
@@ -116,7 +116,7 @@ ObjRelease(pStream)
return
Never:
-FileInstall, logo.gif, NEVER
+FileInstall, logo.png, NEVER
return
BuildBinFileList:
View
@@ -39,10 +39,10 @@ AHKType(exeName)
if !DllCall("version\VerQueryValue", "ptr", &VersionInfo, "str", "\StringFileInfo\" id "\ProductName", "ptr*", pField, "uint*", cbField)
return "FAIL"
- ; if product name = AutoHotkey_L then allow
- ; else if version <= v1.0.48.05 then block
- if StrGet(pField, cbField) != "AutoHotkey_L" && vert <= 0x01003005
- return "Basic"
+ ; Check it is actually an AutoHotkey executable
+ if !InStr(StrGet(pField, cbField), "AutoHotkey")
+ return "FAIL"
- return "AHK_L"
+ ; We're dealing with a legacy version if it's prior to v1.1
+ return vert >= 0x01010000 ? "Modern" : "Legacy"
}
View
@@ -0,0 +1,16 @@
+# Ahk2Exe #
+
+Ahk2Exe is the official AutoHotkey script to EXE converter, which is written itself in AutoHotkey.
+
+http://www.autohotkey.com/
+
+
+## How to Compile ##
+
+Ahk2Exe can compile itself, just be sure to use a recent AutoHotkey self-contained binary.
+
+
+## To do ##
+
+ - Handle FileInstall on same-line If* commands.
+
View
@@ -1,13 +0,0 @@
-Scripted replacement for Ahk2Exe
-================================
-
-Installation
-------------
-
-Just copy everything to your AutoHotkey\Compiler folder (make sure to backup the existing Ahk2Exe.exe!)
-The source code to the compiler can be found at https://github.com/fincs/Ahk2Exe.
-
-TODO
-----
-
-Handle FileInstall on same-line If* commands.
View
@@ -123,8 +123,8 @@ PreprocessScript(ByRef ScriptText, AhkScript, ExtraFiles, FileList="", FirstScri
AhkType := AHKType(AhkPath)
if AhkType = FAIL
Util_Error("Error: The AutoHotkey build used for auto-inclusion of library functions is not recognized.", 1, AhkPath)
- if AhkType = Basic
- Util_Error("Error: AutoHotkey Basic is not allowed as the build used for auto-inclusion of library functions.", 1, AhkPath)
+ if AhkType = Legacy
+ Util_Error("Error: Legacy AutoHotkey versions (prior to v1.1) are not allowed as the build used for auto-inclusion of library functions.", 1, AhkPath)
RunWait, "%AhkPath%" /iLib "%ilibfile%" "%AhkScript%", %FirstScriptDir%, UseErrorLevel
IfExist, %ilibfile%
{
View
Deleted file not rendered
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6433341

Please sign in to comment.