diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile index 4d6d680..6df1079 100644 --- a/App/tools/driver.makefile +++ b/App/tools/driver.makefile @@ -149,7 +149,7 @@ SUBMODULES:=$(foreach f,$(wildcard .gitmodules),$(shell awk '/^\[submodule/ { pr VERSIONCHECKFILES = $(filter-out /% -none-, $(USERMAKEFILE) $(wildcard *.db *.template *.subs *.dbd *.cmd *.iocsh) VERSIONCHECKFILES += ${SOURCES} ${DBDS} ${TEMPLATES} ${SCRIPTS} $($(filter SOURCES_% DBDS_%,${.VARIABLES}))) VERSIONCHECKFILES += ${SUBMODULES} -VERSIONCHECKCMD = ${MAKEHOME}/getVersion.tcl ${VERSIONDEBUGFLAG} ${VERSIONCHECKFILES} +VERSIONCHECKCMD = ${MAKEHOME}/getVersion.pl ${VERSIONDEBUGFLAG} ${VERSIONCHECKFILES} LIBVERSION = $(or $(filter-out test,$(shell ${VERSIONCHECKCMD} 2>/dev/null)),${USER},test) VERSIONDEBUGFLAG = $(if ${VERSIONDEBUG}, -d) @@ -887,7 +887,7 @@ MODULEINFOS: # because it has too strict checks to be used for a loadable module. ${MODULEDBD}: ${DBDFILES} @echo "Expanding $@" - ${MAKEHOME}expandDBD.tcl -$(basename ${EPICSVERSION}) ${DBDEXPANDPATH} $^ > $@ + ${MAKEHOME}expandDBD.pl -$(basename ${EPICSVERSION}) ${DBDEXPANDPATH} $^ > $@ # Install everything. INSTALL_LIBS = $(addprefix ${INSTALL_LIB}/,${MODULELIB} $(notdir ${SHRLIBS})) diff --git a/App/tools/expandDBD.tcl b/App/tools/expandDBD.tcl deleted file mode 100755 index 0539876..0000000 --- a/App/tools/expandDBD.tcl +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/tclsh - -package require Tclx - -set global_context [scancontext create] - -set epicsversion 3.14 -set quiet 0 -set recordtypes 0 -set seachpath {} -set filesDone {} - -while {[llength $argv]} { - switch -glob -- [lindex $argv 0] { - "-[0-9]*" { set epicsversion [string range [lindex $argv 0] 1 end]} - "-q" { set quiet 1 } - "-r" { set recordtypes 1; set quiet 1 } - "-I" { lappend seachpath [lindex $argv 1]; set argv [lreplace $argv 0 1]; continue } - "-I*" { lappend seachpath [string range [lindex $argv 0] 2 end] } - "--" { set argv [lreplace $argv 0 0]; break } - "-*" { puts stderr "Warning: Unknown option [lindex $argv 0] ignored" } - default { break } - } - set argv [lreplace $argv 0 0] -} - -proc opendbd {name} { - global seachpath - foreach dir $seachpath { - if ![catch { - set file [open [file join $dir $name]] - }] { - return $file - } - } - return -code error "file $name not found" -} - -scanmatch $global_context {^[ \t]*(#|%|$)} { - continue -} - -if {$recordtypes} { - scanmatch $global_context {include[ \t]+"?((.*)Record.dbd)"?} { - if ![catch { - close [opendbd $matchInfo(submatch0)] - }] { - puts $matchInfo(submatch1) - } - continue -} - -} else { - - scanmatch $global_context {(registrar|variable|function)[ \t]*\([ \t]*"?([a-zA-Z0-9_]+)"?[ \t]*\)} { - global epicsversion - if {$epicsversion > 3.13} {puts $matchInfo(submatch0)($matchInfo(submatch1))} - } - scanmatch $global_context {variable[ \t]*\([ \t]*"?([a-zA-Z0-9_]+)"?[ \t]*,[ \t]*"?([a-zA-Z0-9_]+)"?[ \t]*\)} { - global epicsversion - if {$epicsversion > 3.13} {puts variable($matchInfo(submatch0),$matchInfo(submatch1))} - } - - scanmatch $global_context { - puts $matchInfo(line) - } -} - -scanmatch $global_context {include[ \t]+"?([^"]*)"?} { - global seachpath - global FileName - global quiet - if [catch { - includeFile $global_context $matchInfo(submatch0) - } msg] { - if {!$quiet} { - puts stderr "ERROR: $msg in path \"$seachpath\" called from $FileName($matchInfo(handle)) line $matchInfo(linenum)" - exit 1 - } - } - continue -} - -proc includeFile {context filename} { - global global_context FileName filesDone matchInfo quiet - set basename [file tail $filename] - if {[lsearch $filesDone $basename ] != -1} { - if {!$quiet} { - puts stderr "Info: skipping duplicate file $basename included from $FileName($matchInfo(handle))" - } - return - } - if {$filename != "dbCommon.dbd"} { lappend filesDone [file tail $filename] } - set file [opendbd $filename] - set FileName($file) $filename - #puts "#include $filename from $FileName($matchInfo(handle))" - scanfile $context $file - close $file -} - -foreach filename $argv { - global filesDone quiet - set basename [file tail $filename] - if {[lsearch $filesDone $basename] != -1} { - if {!$quiet} { - puts stderr "Info: skipping duplicate file $basename from command line" - } - continue - } - if {$basename != "dbCommon.dbd"} { lappend filesDone $basename } - set file [open $filename] - set FileName($file) $filename - scanfile $global_context $file - close $file -} diff --git a/App/tools/getVersion.tcl b/App/tools/getVersion.tcl deleted file mode 100755 index b481adf..0000000 --- a/App/tools/getVersion.tcl +++ /dev/null @@ -1,287 +0,0 @@ -#!/usr/bin/tclsh - -package require Tclx - -set debug 0 - -set global_context [scancontext create] -set file_context [scancontext create] -set skip_context [scancontext create] - -scanmatch $global_context {there is no version here} { - return -} - -scanmatch $global_context {cvs status: failed} { - puts stderr "Error: $matchInfo(line)" - return -} - -scanmatch $global_context {no such directory `(.*)'} { - puts stderr "checking directory $matchInfo(submatch0): so such directory" - return -} - -scanmatch $global_context {cvs [status aborted]: there is no version here} { - return -} - -scanmatch $global_context {^File: .*Up-to-date} { - set file [lindex $matchInfo(line) 1] - puts -nonewline stderr "checking $file: " - catch {unset major minor patch} - scanfile $file_context $matchInfo(handle) - if {![info exists major]} { - puts stderr "revision $rev($file) not tagged => version test" - set version test - continue - } - puts stderr "revision $rev($file) tag $tag($file) => version $major.$minor.$patch" - if {![info exists version]} { - set version $major.$minor.$patch - } else { - if ![cequal $major.$minor.$patch $version] { - set version test - continue - } - } - continue -} - -scanmatch $global_context {^File: .*} { - set file [lindex $matchInfo(line) 1] - puts stderr "checking $file: [lrange $matchInfo(line) 3 end] => version test" - set version test - continue -} - -scanmatch $global_context {^\? .*} { - set file [lindex $matchInfo(line) 1] - puts stderr "checking $file: not in cvs => version test" - set version test - continue -} - -scanmatch $file_context {Working revision:} { - set rev($file) [lindex $matchInfo(line) 2] -} - -scanmatch $file_context {Sticky Tag:.*_([0-9]+)_([0-9]+)_([0-9]+)[ \t]+\(revision: } { - set major $matchInfo(submatch0) - set minor $matchInfo(submatch1) - set patch $matchInfo(submatch2) - set tag($file) "[lindex $matchInfo(line) 2] (sticky)" - scanfile $skip_context $matchInfo(handle) - return -} - -scanmatch $file_context {Sticky Tag:.*_([0-9]+)_([0-9]+)[ \t]+\(revision: } { - set major $matchInfo(submatch0) - set minor $matchInfo(submatch1) - set patch 0 - set tag($file) "[lindex $matchInfo(line) 2] (sticky)" - scanfile $skip_context $matchInfo(handle) - return -} - -scanmatch $file_context {_([0-9]+)_([0-9]+)(_([0-9]+))?[ \t]+\(revision: ([\.0-9]+)\)} { - if [cequal $rev($file) $matchInfo(submatch4)] { - set Major $matchInfo(submatch0) - set Minor $matchInfo(submatch1) - set Patch [expr $matchInfo(submatch3) + 0] - if {![info exists major] || - $Major>$major || - ($Major==$major && ($Minor>$minor - || ($Minor==$minor && $Patch>$patch)))} { - set major $Major - set minor $Minor - set patch $Patch - set tag($file) [lindex $matchInfo(line) 0] - } - } -} - -scanmatch $skip_context {=================} { - return -} - -scanmatch $file_context {=================} { - return -} - -set git_context [scancontext create] - -scanmatch $git_context {fatal: Not a git repository} { - return -} - -scanmatch $git_context {^\?\? .*} { - set file [lindex $matchInfo(line) 1] - puts stderr "$file: not in git => version test" - set version test - continue -} - -scanmatch $git_context {^ M .*} { - set file [lindex $matchInfo(line) 1] - puts stderr "$file: locally modified => version test" - set version test - continue -} - -scanmatch $git_context {^D .*} { - set file [lindex $matchInfo(line) 1] - puts stderr "$file: deleted (or renamed) but not committed => version test" - set version test - continue -} - -scanmatch $git_context {^ D .*} { - set file [lindex $matchInfo(line) 1] - puts stderr "$file: locally deleted => version test" - set version test - continue -} - -scanmatch $git_context {^A .*} { - set file [lindex $matchInfo(line) 1] - puts stderr "$file: locally added => version test" - set version test - continue -} - -scanmatch $git_context {^AM .*} { - set file [lindex $matchInfo(line) 1] - puts stderr "$file: locally added and modified => version test" - set version test - continue -} - -scanmatch $git_context {^([ MADRCU][ MADRCU]) .*} { - set file [lindex $matchInfo(line) 1] - puts stderr "$file: $matchInfo(submatch0) (whatever that means) => version test" - set version test - continue -} - -scanmatch $git_context {fatal: No names found} { - puts stderr "no tag on this version => version test" - set version test -} - -scanmatch $git_context {^([0-9]+)\.([0-9]+)(\.([0-9]+))?$} { - set major $matchInfo(submatch0) - set minor $matchInfo(submatch1) - set patch [expr $matchInfo(submatch3) + 0] - set version $major.$minor.$patch - puts stderr "checking tag $matchInfo(line) => version $version" -} - -scanmatch $git_context {[a-zA-Z]+[a-zA-Z0-9]*_([0-9]+)_([0-9]+)(_([0-9]+))?$} { - set major $matchInfo(submatch0) - set minor $matchInfo(submatch1) - set patch [expr $matchInfo(submatch3) + 0] - set version $major.$minor.$patch - puts stderr "checking tag $matchInfo(line) => version $version" -} - -scanmatch $git_context {(.*[0-9]+[_.][0-9]+([_.][0-9]+)?)-([0-9]+)-g} { - set version test - puts stderr "tag $matchInfo(submatch0) is $matchInfo(submatch2) commits old => version test" -} - -scanmatch $git_context {Your branch is ahead of '(.*)/(.*)'} { - puts stderr "branch \"$matchInfo(submatch1)\" not yet pushed to remote \"$matchInfo(submatch0)\" => version test" - puts stderr "try: git push --tags $matchInfo(submatch0) $matchInfo(submatch1)" - set version test -} - -if {[lindex $argv 0] == "-d"} { - set debug 1 - set argv [lrange $argv 1 end] -} - -# Check all files in top directory and all files specified explicitly in subdirectories - -set topfiles [glob -nocomplain GNUmakefile makefile Makefile *.c *.cc *.cpp *.h *.dbd *.st *.stt *.gt] - -if {$debug} { - puts stderr "checking $topfiles $argv" -} - - -if {[catch { - # fails if we have no git: - if {$debug} { - puts stderr "git status --porcelain $topfiles $argv" - } - set statusinfo [open "|git status --porcelain $topfiles $argv 2>@ stdout"] - scanfile $git_context $statusinfo - # fails if this is no git repo - close $statusinfo - - if [info exists version] { - puts $version - exit - } - - if {$debug} { - puts stderr "git describe --tags HEAD" - } - set statusinfo [open "|git describe --tags HEAD 2>@ stdout"] - scanfile $git_context $statusinfo - catch {close $statusinfo} - - if ![info exists version] { - puts stderr "Could not find out version tag => version test" - set version test - } - - if {$version != "test"} { - if {$debug} { - puts stderr "git status" - } - set statusinfo [open "|git status 2>@ stdout"] - scanfile $git_context $statusinfo - catch {close $statusinfo} - } - - puts $version - exit -}] && $debug} { puts stderr "git: $errorInfo" } - - -if {[catch { -# cvs bug: calling cvs status for files in other directories spoils status -# information for local files. -# fix: check local and non local files separately - - # fails if we have no cvs or server has a problem - if {$debug} { - puts stderr "cvs status -l -v $topfiles $argv" - } - set statusinfo [open "|cvs status -l -v $topfiles $argv 2>@ stdout"] - scanfile $global_context $statusinfo - # fails if this is no cvs repo - close $statusinfo - -# set files {} -# foreach file $argv { -# if {[file tail $file] != $file} { -# lappend files $file -# } -# } -# if [llength $files] { -# set statusinfo [open "|cvs status -l -v $files 2>@ stdout"] -# scanfile $global_context $statusinfo -# close $statusinfo -# } - - puts $version - exit -}] && $debug} { puts stderr "cvs: $errorInfo" } - -puts stderr "No repository found => version test" -puts "test" - -# $Header: /cvs/G/DRV/misc/App/tools/getVersion.tcl,v 1.3 2010/08/03 08:42:40 zimoch Exp $