build 64-bit package

goreliu · Nov 6, 2017 · 6318842 · 6318842
1 parent 5a9864e
commit 6318842
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,5 +42,6 @@ UserFunctionsAuto.txt
 UserFunctionsAuto.txt.bak
 UserFileList.txt
 tcmatch.dll
+tcmatch64.dll
 tcmatch.tbl
 Plugins.ahk
diff --git a/Lib/TCMatch.ahk b/Lib/TCMatch.ahk
@@ -51,5 +51,10 @@ TCMatch(aHaystack, aNeedle)
         matchTimes := 0
     }
 
+    if (A_PtrSize == 8)
+    {
+        return DllCall("TCMatch64\MatchFileW", "WStr", aNeedle, "WStr", aHaystack)
+    }
+
     return DllCall("TCMatch\MatchFileW", "WStr", aNeedle, "WStr", aHaystack)
 }
diff --git a/Plugins/QRCode.ahk b/Plugins/QRCode.ahk
@@ -2,7 +2,7 @@
 ; 生成二维码
 
 QRCode:
-    if (!FileExist(A_ScriptDir "\Lib\Reserved\quricol32.dll"))
+    if (!FileExist(A_ScriptDir "\Lib\Reserved\quricol" A_PtrSize * 8 ".dll"))
     {
         return
     }
@@ -76,7 +76,7 @@ GenerateQR(string, file = "")
         file := A_Temp "\RunZ.QR.png"
     }
 
-    hModule := DllCall(A_ScriptDir "\Lib\Reserved\quricol32.dll\GeneratePNG"
+    hModule := DllCall(A_ScriptDir "\Lib\Reserved\quricol" A_PtrSize * 8 ".dll\GeneratePNG"
         , "str", file, "str", string, "int", 4, "int", 12, "int", 0)
     DllCall("FreeLibrary", "Ptr", hModule)
     return file

diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+1.2.0
diff --git a/build b/build
@@ -1,7 +1,11 @@
 #!/bin/zsh
 
+set -e
+
+version=$(cat VERSION)
+
 mkdir -p RunZ
-cp * RunZ -r 2>/dev/null
+cp * RunZ -r 2>/dev/null || true
 
 cd RunZ || exit 1
 
@@ -19,6 +23,7 @@ rm -rf RunZ
 rm -rf Doc/.git
 rm -rf Doc/Icons
 rm -rf Doc/Images
+rm -f **/*64.dll
 
 echo -e "历史版本详见 Releases · goreliu/runz · GitHub" > Doc/更新历史.md.new
 echo "https://github.com/goreliu/runz/releases" >> Doc/更新历史.md.new
@@ -36,6 +41,21 @@ mv Doc/Home.md Doc/介绍.md
 cp Doc/更新历史.md ~/tmp/RunZ\ 更新历史.txt
 
 cd ..
-a RunZ-$1.7z RunZ
+a RunZ-$version.7z RunZ
+
+# 64 位版本
+
+cd RunZ
+cp /mnt/c/mine/app/AutoHotkey/AutoHotkeyU64.exe RunZ.exe
+rm -f Lib/Reserved/quricol32.dll
+cp ../Lib/Reserved/quricol64.dll Lib/Reserved/quricol64.dll
+rm -f Lib/TCMatch/tcmatch.dll
+cp ../Lib/TCMatch/tcmatch64.dll Lib/TCMatch/tcmatch64.dll
+sed -i 's/tcmatch.dll/tcmatch64.dll/g' Conf/RunZ.ini.help.txt
+
+cd ..
+a RunZ-x86_64-$version.7z RunZ
+
+mv RunZ-$version.7z ~/tmp
+mv RunZ-x86_64-$version.7z ~/tmp
 rm -rf RunZ
-mv RunZ-$1.7z ~/tmp