IMP: Improve kDistRelease macro for CLI app.

Signed-off-by: Amlal <amlal@el-mahrouss-logic.com>

10 files changed, 28 insertions, 8 deletions

diff --git a/build-unix.json b/build-unix.json
index 0a81007..30de878 100644
--- a/build-unix.json
+++ b/build-unix.json
@@ -7,6 +7,6 @@
   "compiler_flags": ["-fPIC", "-shared", "-fPIC"],
   "cpp_macros": [
     "__NDK_DLL__=202401",
-    "kDistRelease=$(git rev-parse --abbrev-ref HEAD)"
+    "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
   ]
 }
diff --git a/build.json b/build.json
index 876d8f6..7cea723 100644
--- a/build.json
+++ b/build.json
@@ -7,6 +7,6 @@
   "compiler_flags": ["-fPIC", "-shared"],
   "cpp_macros": [
     "__NDK_DLL__=202401",
-    "kDistRelease=$(git rev-parse --abbrev-ref HEAD)"
+    "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
   ]
 }
diff --git a/dev/ndk/Version.hxx b/dev/ndk/Version.hxx
index 90391e5..fdf6e27 100644
--- a/dev/ndk/Version.hxx
+++ b/dev/ndk/Version.hxx
@@ -7,3 +7,8 @@
 #pragma once
 
 #define kDistVersion "v1.1.0"
+
+#define ToPPString(X) __Str(X)
+#define __Str(X) #X
+
+#define kDistRelease ToPPString(kDistReleaseBranch)
diff --git a/tools/asm-unix.json b/tools/asm-unix.json
index c48e8b6..2071e78 100644
--- a/tools/asm-unix.json
+++ b/tools/asm-unix.json
@@ -5,5 +5,8 @@
   "sources_path": ["asm.cxx"],
   "output_name": "asm.exe",
   "compiler_flags": ["-L/usr/lib", "-lndk"],
-  "cpp_macros": ["__CL__=202401"]
+  "cpp_macros": [
+    "__ASM__=202401",
+    "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
+  ]
 }
diff --git a/tools/asm.cxx b/tools/asm.cxx
index d5caa3f..0a28a04 100644
--- a/tools/asm.cxx
+++ b/tools/asm.cxx
@@ -37,7 +37,7 @@ int main(int argc, char const* argv[])
 			std::printf("asm.exe: Frontend Assembler (64x0, POWER64, AMD64).\n");
 			std::printf("asm.exe: Version: %s, Release: %s.\n", kDistVersion, kDistRelease);
 			std::printf("asm.exe: Designed by Amlal El Mahrouss, Copyright ZKA Technologies.\n");
-			std::printf("libndk.dylib/ndk.dll: Designed by Amlal El Mahrouss, Copyright ZKA Technologies.\n");
+			std::printf("libndk.so/ndk.dll: Designed by Amlal El Mahrouss, Copyright ZKA Technologies.\n");
 
 			return 0;
 		}
diff --git a/tools/cl-unix.json b/tools/cl-unix.json
index d252bb2..9ef07a2 100644
--- a/tools/cl-unix.json
+++ b/tools/cl-unix.json
@@ -5,5 +5,8 @@
   "sources_path": ["cl.cxx"],
   "output_name": "cl.exe",
   "compiler_flags": ["-L/usr/lib", "-lndk"],
-  "cpp_macros": ["__CL__=202401"]
+  "cpp_macros": [
+    "__CL__=202401",
+    "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
+  ]
 }
diff --git a/tools/cl.json b/tools/cl.json
index 4e24f99..6f6bfd1 100644
--- a/tools/cl.json
+++ b/tools/cl.json
@@ -5,5 +5,8 @@
   "sources_path": ["cl.cxx"],
   "output_name": "cl.exe",
   "compiler_flags": ["-L../", "-lndk"],
-  "cpp_macros": ["__CL__=202401"]
+  "cpp_macros": [
+    "__CL__=202401",
+    "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
+  ]
 }
diff --git a/tools/link-unix.json b/tools/link-unix.json
index 478fb77..d40724c 100644
--- a/tools/link-unix.json
+++ b/tools/link-unix.json
@@ -5,5 +5,8 @@
   "sources_path": ["link.cxx"],
   "output_name": "link.exe",
   "compiler_flags": ["-L/usr/lib", "-lndk"],
-  "cpp_macros": ["__LINK__=202401"]
+  "cpp_macros": [
+    "__LINK__=202401",
+    "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
+  ]
 }
diff --git a/tools/link.json b/tools/link.json
index f5d1f56..dff1454 100644
--- a/tools/link.json
+++ b/tools/link.json
@@ -5,5 +5,8 @@
   "sources_path": ["link.cxx"],
   "output_name": "link.exe",
   "compiler_flags": ["-L../", "-lndk"],
-  "cpp_macros": ["__LINK__=202401"]
+  "cpp_macros": [
+    "__LINK__=202401",
+    "kDistReleaseBranch=$(git rev-parse --abbrev-ref HEAD)-$(uuidgen)"
+  ]
 }
diff --git a/vendor/.keep b/vendor/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vendor/.keep