Switched Lib to data

Having it named Lib disallowed creating a shortcut to a stdlib folder/having a custom Lib for the scripts Fixed directory creation while compiled
Masonjar13 · Aug 23, 2018 · e917939 · e917939
1 parent 07b4e92
commit e917939
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 26 deletions.
diff --git a/Lib/getFileext.ahk b/Lib/getFileext.ahk
diff --git a/Lib/getFilename.ahk b/Lib/getFilename.ahk
diff --git a/ScriptUp.ahk b/ScriptUp.ahk
@@ -1,29 +1,31 @@
 #singleInstance force
 #persistent
 #noEnv
-#include <threadMan>
+setWorkingDir,% a_scriptDir
+#include data\threadMan.ahk
 menu,tray,tip,ScriptUp
 
 ; compiled installs
 if(a_isCompiled){
-    fileInstall,Lib\dlls\mini32.dll,Lib\dlls\mini32.dll
-    fileInstall,Lib\dlls\mini64.dll,Lib\dlls\mini64.dll
-    fileInstall,Lib\dlls\std32.dll,Lib\dlls\std32.dll
-    fileInstall,Lib\dlls\std64.dll,Lib\dlls\std64.dll
-    fileInstall,Lib\imgs\b1.png,Lib\imgs\b1.png
-    fileInstall,Lib\imgs\b2.png,Lib\imgs\b2.png
-    fileInstall,Lib\imgs\MXIII.png,Lib\imgs\MXIII.png
-    fileInstall,Lib\workerH.ahk,Lib\workerH.ahk
+    fileCreateDir,data\dlls
+    fileCreateDir,data\imgs
+    fileInstall,data\dlls\mini32.dll,data\dlls\mini32.dll
+    fileInstall,data\dlls\mini64.dll,data\dlls\mini64.dll
+    fileInstall,data\dlls\std32.dll,data\dlls\std32.dll
+    fileInstall,data\dlls\std64.dll,data\dlls\std64.dll
+    fileInstall,data\imgs\b1.png,data\imgs\b1.png
+    fileInstall,data\imgs\b2.png,data\imgs\b2.png
+    fileInstall,data\imgs\MXIII.png,data\imgs\MXIII.png
+    fileInstall,data\workerH.ahk,data\workerH.ahk
 }
 
 ; setup config
 ;sini:=(siniD:=a_appData . "\..\Local\ScriptUp") . "\config.ini"
-setWorkingDir,% a_scriptDir
-sini:=a_scriptDir . "\Lib\config.ini"
-dlls:=a_scriptDir . "\Lib\dlls"
-imgs:=a_scriptDir . "\Lib\imgs"
+sini:=a_scriptDir . "\data\config.ini"
+dlls:=a_scriptDir . "\data\dlls"
+imgs:=a_scriptDir . "\data\imgs"
 workerdll:=dlls . "\std" . (a_ptrSize*8) . ".dll"
-workerfile:=a_scriptDir . "\Lib\workerH.ahk"
+workerfile:=a_scriptDir . "\data\workerH.ahk"
 fileLastDir:=a_scriptDir
 if(!fileExist(sini))
     firstRun:=1
@@ -36,7 +38,7 @@ if(!errorLevel) ; auto-correct if the script has been moved
         regWrite,REG_SZ,% regStartupPath,ScriptUp,% a_scriptFullPath
 
 ; start worker
-#include <guiMake>
+#include data\guiMake.ahk
 worker:=new threadMan(workerdll)
 worker.newFromFile(workerfile)
 onExit,cleanup
@@ -52,9 +54,10 @@ if(firstRun){
 setTimer,checkStates,1000
 return
 
-#include <guiSubs>
-#include <optionSubs>
-#include <menuSubs>
+#include data\guiSubs.ahk
+#include data\optionSubs.ahk
+#include data\menuSubs.ahk
+#include data\functions.ahk
 
 checkStates:
 stateList:=worker.varGet("stateList")

diff --git a/Lib/_MemoryLibrary.ahk → data/_MemoryLibrary.ahk b/Lib/_MemoryLibrary.ahk → data/_MemoryLibrary.ahk
diff --git a/Lib/_Struct.ahk → data/_Struct.ahk b/Lib/_Struct.ahk → data/_Struct.ahk
diff --git a/Lib/dlls/mini32.dll → data/dlls/mini32.dll b/Lib/dlls/mini32.dll → data/dlls/mini32.dll
diff --git a/Lib/dlls/mini64.dll → data/dlls/mini64.dll b/Lib/dlls/mini64.dll → data/dlls/mini64.dll
diff --git a/Lib/dlls/std32.dll → data/dlls/std32.dll b/Lib/dlls/std32.dll → data/dlls/std32.dll
diff --git a/Lib/dlls/std64.dll → data/dlls/std64.dll b/Lib/dlls/std64.dll → data/dlls/std64.dll
diff --git a/Lib/hideFocusBorder.ahk → data/functions.ahk b/Lib/hideFocusBorder.ahk → data/functions.ahk
@@ -12,4 +12,12 @@ hideFocusBorder(wParam,lParam:="",msg:="",handle:=""){ ; by 'just me'
             dllCall("user32\PostMessage","ptr",handle,"uint",WM_UPDATEUISTATE,"ptr",SET_HIDEFOCUS,"ptr",0)
     }else if(dllCall("IsWindow","ptr",wParam,"uint"))
         dllCall("user32\PostMessage","ptr",wParam,"uint",WM_UPDATEUISTATE,"ptr",SET_HIDEFOCUS,"ptr",0)
+}
+getFilename(path){
+    splitPath,path,,,,fname
+    return fname
+}
+getFileext(path){
+    splitPath,path,,,ext
+    return ext
 }
diff --git a/Lib/guiMake.ahk → data/guiMake.ahk b/Lib/guiMake.ahk → data/guiMake.ahk
diff --git a/Lib/guiSubs.ahk → data/guiSubs.ahk b/Lib/guiSubs.ahk → data/guiSubs.ahk
diff --git a/Lib/imgs/ICONMX.ico → data/imgs/ICONMX.ico b/Lib/imgs/ICONMX.ico → data/imgs/ICONMX.ico
diff --git a/Lib/imgs/MXIII.png → data/imgs/MXIII.png b/Lib/imgs/MXIII.png → data/imgs/MXIII.png
diff --git a/Lib/imgs/b1.png → data/imgs/b1.png b/Lib/imgs/b1.png → data/imgs/b1.png
diff --git a/Lib/imgs/b2.png → data/imgs/b2.png b/Lib/imgs/b2.png → data/imgs/b2.png
diff --git a/Lib/menuSubs.ahk → data/menuSubs.ahk b/Lib/menuSubs.ahk → data/menuSubs.ahk
diff --git a/Lib/optionSubs.ahk → data/optionSubs.ahk b/Lib/optionSubs.ahk → data/optionSubs.ahk
diff --git a/Lib/sizeof.ahk → data/sizeof.ahk b/Lib/sizeof.ahk → data/sizeof.ahk
diff --git a/Lib/threadMan.ahk → data/threadMan.ahk b/Lib/threadMan.ahk → data/threadMan.ahk
diff --git a/Lib/workerH.ahk → data/workerH.ahk b/Lib/workerH.ahk → data/workerH.ahk