luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-08-22 14:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added a command-line option "magic --commit" which provides the commit

Browse Source 
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.
This commit is contained in:
Tim Edwards
2022-02-25 09:56:22 -05:00
parent db4fa65bfc
commit bae5d9cd06
5 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
8.3.272 8.3.273
scripts/defs.mak.in
+2 -1
View File
@@ -70,13 +70,14 @@ WISH_EXE = @WISH_EXE@
TCL_LIB_DIR = @TCL_LIB_DIR@ TCL_LIB_DIR = @TCL_LIB_DIR@
MAGIC_VERSION = `cat ../VERSION | cut -d. -f1-2` MAGIC_VERSION = `cat ../VERSION | cut -d. -f1-2`
MAGIC_REVISION = `cat ../VERSION | cut -d. -f3` MAGIC_REVISION = `cat ../VERSION | cut -d. -f3`
MAGIC_COMMIT = `git rev-parse HEAD`
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CXX = @CXX@ CXX = @CXX@
CPPFLAGS = -I. -I${MAGICDIR} @CPPFLAGS@ 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 += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
DFLAGS_NOSTUB = @extra_defs@ @DEFS@ -DGCORE=\"@GCORE@\" DFLAGS_NOSTUB = @extra_defs@ @DEFS@ -DGCORE=\"@GCORE@\"
DFLAGS_NOSTUB += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG DFLAGS_NOSTUB += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
tcltk/Makefile
+1
View File
@@ -62,6 +62,7 @@ magicdnull: magicdnull.c ${MAGICDIR}/defs.mak
magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak ${MAGICDIR}/VERSION magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak ${MAGICDIR}/VERSION
sed -e /MAGIC_VERSION/s%MAGIC_VERSION%${MAGIC_VERSION}%g \ sed -e /MAGIC_VERSION/s%MAGIC_VERSION%${MAGIC_VERSION}%g \
-e /MAGIC_REVISION/s%MAGIC_REVISION%${MAGIC_REVISION}%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.tcl.in > magic.tcl
magic.sh: magic.sh.in ${MAGICDIR}/defs.mak magic.sh: magic.sh.in ${MAGICDIR}/defs.mak
tcltk/magic.sh.in
+1
View File
@@ -33,6 +33,7 @@ for i in "$@" ; do
-noc*) TKCON=;; -noc*) TKCON=;;
-dnull) DNULL=true;; -dnull) DNULL=true;;
--version) TKCON=; DNULL=true;; --version) TKCON=; DNULL=true;;
--commit) TKCON=; DNULL=true;;
--prefix) TKCON=; DNULL=true;; --prefix) TKCON=; DNULL=true;;
*) arglist="$arglist${arglist:+ }\"${i//\"/\\\"}\"";; *) arglist="$arglist${arglist:+ }\"${i//\"/\\\"}\"";;
esac esac
tcltk/magic.tcl.in
+4
View File
@@ -205,6 +205,10 @@ for {set i 0} {$i < $argc} {incr i 1} {
puts stdout "MAGIC_VERSION.MAGIC_REVISION" puts stdout "MAGIC_VERSION.MAGIC_REVISION"
exit 0 exit 0
} }
^--commit {
puts stdout "MAGIC_COMMIT"
exit 0
}
^--prefix { ^--prefix {
puts stdout $CAD_ROOT puts stdout $CAD_ROOT
exit 0 exit 0