From bae5d9cd06c5999ad7952b38b0a4cbf676a9017b Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Fri, 25 Feb 2022 09:56:22 -0500
Subject: [PATCH] Added a command-line option "magic --commit" which provides
 the commit number from the git repository, which is overall more reliable
 than the version number, but mainly to support a common method across the
 open source tools for providing information to builds like open_pdks that may
 need to know what version of every tool was used for the build.

---
 VERSION             | 2 +-
 scripts/defs.mak.in | 3 ++-
 tcltk/Makefile      | 1 +
 tcltk/magic.sh.in   | 1 +
 tcltk/magic.tcl.in  | 4 ++++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 19951506..af4f7017 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.272
+8.3.273
diff --git a/scripts/defs.mak.in b/scripts/defs.mak.in
index 77dfddca..3e883248 100755
--- a/scripts/defs.mak.in
+++ b/scripts/defs.mak.in
@@ -70,13 +70,14 @@ WISH_EXE	       = @WISH_EXE@
 TCL_LIB_DIR	       = @TCL_LIB_DIR@
 MAGIC_VERSION	       = `cat ../VERSION | cut -d. -f1-2`
 MAGIC_REVISION	       = `cat ../VERSION | cut -d. -f3`
+MAGIC_COMMIT	       = `git rev-parse HEAD`
 
 CC                     = @CC@
 CPP                    = @CPP@
 CXX		       = @CXX@
 
 CPPFLAGS               = -I. -I${MAGICDIR} @CPPFLAGS@
-DFLAGS                 = @extra_defs@ @stub_defs@ @DEFS@ -DMAGIC_VERSION=\"${MAGIC_VERSION}\" -DMAGIC_REVISION=\"${MAGIC_REVISION}\" -DGCORE=\"@GCORE@\"
+DFLAGS                 = @extra_defs@ @stub_defs@ @DEFS@ -DMAGIC_VERSION=\"${MAGIC_VERSION}\" -DMAGIC_REVISION=\"${MAGIC_REVISION}\" -DMAGIC_COMMIT=\"${MAGIC_COMMIT}\" -DGCORE=\"@GCORE@\"
 DFLAGS		      += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
 DFLAGS_NOSTUB	       = @extra_defs@ @DEFS@ -DGCORE=\"@GCORE@\"
 DFLAGS_NOSTUB	      += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
diff --git a/tcltk/Makefile b/tcltk/Makefile
index 97f214ad..1c764ab0 100644
--- a/tcltk/Makefile
+++ b/tcltk/Makefile
@@ -62,6 +62,7 @@ magicdnull: magicdnull.c ${MAGICDIR}/defs.mak
 magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak ${MAGICDIR}/VERSION
 	sed -e /MAGIC_VERSION/s%MAGIC_VERSION%${MAGIC_VERSION}%g \
 	    -e /MAGIC_REVISION/s%MAGIC_REVISION%${MAGIC_REVISION}%g \
+	    -e /MAGIC_COMMIT/s%MAGIC_COMMIT%${MAGIC_COMMIT}%g \
 	    magic.tcl.in > magic.tcl
 
 magic.sh: magic.sh.in ${MAGICDIR}/defs.mak
diff --git a/tcltk/magic.sh.in b/tcltk/magic.sh.in
index 5993a4c2..538e5a72 100755
--- a/tcltk/magic.sh.in
+++ b/tcltk/magic.sh.in
@@ -33,6 +33,7 @@ for i in "$@" ; do
       -noc*) TKCON=;;
       -dnull) DNULL=true;;
       --version) TKCON=; DNULL=true;;
+      --commit) TKCON=; DNULL=true;;
       --prefix) TKCON=; DNULL=true;;
       *) arglist="$arglist${arglist:+ }\"${i//\"/\\\"}\"";;
    esac
diff --git a/tcltk/magic.tcl.in b/tcltk/magic.tcl.in
index a7f0dd8e..2bee80a0 100755
--- a/tcltk/magic.tcl.in
+++ b/tcltk/magic.tcl.in
@@ -205,6 +205,10 @@ for {set i 0} {$i < $argc} {incr i 1} {
 	 puts stdout "MAGIC_VERSION.MAGIC_REVISION"
 	 exit 0
       }
+      ^--commit {
+	 puts stdout "MAGIC_COMMIT"
+	 exit 0
+      }
       ^--prefix {
 	 puts stdout $CAD_ROOT
 	 exit 0