Added 'ext' expansion for proper trigger file detection

No need to specify the full plugin suffix (64 or not) or extension (.dll, .so or .dylib)

Author: 0xeb

README.md

@@ -68,6 +68,7 @@ See also:
 * `$env:EnvVariableName$`: `EnvVariableName` is expanded to its environment variable value if it exists or left unexpanded otherwise
 * `$pkgbase$`: Specify a package base directory. Can be used as part of a dependency file path.
 * `$pkgmodname$`: This is mainly used inside the `reload` directive. It replaces the path seperators with dots (which works nicely as a fully qualified module name). Please see the [package dependency](test_scripts/pkg-dependency/README.md) example file.
+* `$ext$`: This resolves to the plugin suffix and extension ("64.dll", ".so", "64.dylib", etc.). See the trigger native deps files for reference.
 
 ## Using QScripts with trigger files
 

TODO.md

@@ -5,25 +5,18 @@
 - Check for $(pwd)/.qscripts/<sourcefilename.depsfiles> first before checking the current directory
 - This allows less pollution in the current folder
 
-## Native bitness detection
-
-Introduce an automatic 64 detection macro. We don't want two seperate deps files like this:
-
-```
-/triggerfile /keep $env:IDASDK$\bin\plugins\qplugin.dll
-/triggerfile /keep $env:IDASDK$\bin\plugins\qplugin[64].dll
-```
-
 # TODO
 
-- Isolate the timer code from the UI logic
 - Automatically select the previous active script when the UI launches
 - Restore the QScripts window layout when closed and re-opened
 - Use OS specific file change monitors
 
 
-- Refactor filemonitor into a utility class
--- Perhaps implement per OS on Win32, and as is for Linux/Mac
--- For Linux, perhaps call an external process like 'inotify-wait' ?
+# Monitor code and refactoring
+
+- Isolate the timer code from the UI logic
+    - Refactor filemonitor into a utility class
+    - Perhaps implement per OS on Win32, and as is for Linux/Mac
+    - For Linux, perhaps call an external process like 'inotify-wait' ?
 
 

qscripts.cpp

@@ -381,6 +381,7 @@ struct qscripts_chooser_t: public plugmod_t, public chooser_t
     // env:Variable_Name              Expands the 'Variable_Name'
     // pkgbase                        Sets the current pkgbase path
     // pkgmodname                     Expands the file name using the pckbase into the form: 'module.submodule1.submodule2'
+    // ext                            Addon suffix including bitness and extension (example: 64.dll, .so, 64.so, .dylib, etc.)
     void expand_string(qstring &input, qstring &output, const expand_ctx_t& ctx)
     {
         output = std::regex_replace(
@@ -409,6 +410,11 @@ struct qscripts_chooser_t: public plugmod_t, public chooser_t
                     }
                     return "";
                 }
+                else if (strncmp(match1.c_str(), "ext", 3) == 0)
+                {
+                    static_assert(LOADER_DLL[0] == '*');
+                    return LOADER_DLL + 1;
+                }
                 else if (strncmp(match1.c_str(), "pkgbase", 7) == 0)
                 {
                     return ctx.pkg_base.c_str();

test_scripts/trigger-native/plugin_triton/qscripts_native_triton.py.deps.qscripts

@@ -1 +1 @@
-/triggerfile /keep $env:IDASDK$\bin\plugins\qscripts_native_triton64.dll
+/triggerfile /keep $env:IDASDK$\bin\plugins\qscripts_native_triton$ext$

test_scripts/trigger-native/qscripts_native.py.deps.qscripts

@@ -1 +1 @@
-/triggerfile /keep $env:IDASDK$\bin\plugins\qscripts_native.dll
+/triggerfile /keep $env:IDASDK$\bin\plugins\qscripts_native$ext$