From: Sven Dietricht Date: Thu, 17 Feb 2000 04:48:29 +0000 (-0000) Subject: ntpd.dsp, ntpdate.dsp, ntpdc.dsp, ntpq.dsp, ntptrace.dsp: X-Git-Tag: NTP_4_0_99_F~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2ad963937a84bc738595dd1d7401727e5f1a28e;p=thirdparty%2Fntp.git ntpd.dsp, ntpdate.dsp, ntpdc.dsp, ntpq.dsp, ntptrace.dsp: Shell script mkver.bat no longer requires Perl mkver.bat: Shell script mkver.bat no longer requires Perl Modifications by: Frederick Czajka [w2k@austin.rr.com] bk: 38ab7d9deIp3hoTD7ZcTdd2c2r6P9w --- diff --git a/ports/winnt/ntpd/ntpd.dsp b/ports/winnt/ntpd/ntpd.dsp index b4b9391b2..2bc4991c1 100644 --- a/ports/winnt/ntpd/ntpd.dsp +++ b/ports/winnt/ntpd/ntpd.dsp @@ -572,8 +572,8 @@ ProjDir=. InputPath=..\..\..\configure "$(ProjDir)\version.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Using environment var PERL ($(PERL)) - $(PERL)\bin\perl ..\scripts\mkver.bat -P ntpd + echo Using NT Shell Script to generate version.c + ..\scripts\mkver.bat -P ntpd # End Custom Build @@ -585,9 +585,9 @@ ProjDir=. InputPath=..\..\..\configure "$(ProjDir)\version.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Using environment var PERL ($(PERL)) - $(PERL)\bin\perl ..\scripts\mkver.bat -P ntpd - + echo Using NT Shell Script to generate version.c + ..\scripts\mkver.bat -P ntpd + # End Custom Build !ENDIF diff --git a/ports/winnt/ntpdate/ntpdate.dsp b/ports/winnt/ntpdate/ntpdate.dsp index 59c107539..5ad30cfe2 100644 --- a/ports/winnt/ntpdate/ntpdate.dsp +++ b/ports/winnt/ntpdate/ntpdate.dsp @@ -122,8 +122,8 @@ ProjDir=. InputPath=..\..\..\configure "$(ProjDir)\version.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Using environment var PERL ($(PERL)) - $(PERL)\bin\perl ..\scripts\mkver.bat -P ntpdate + echo Using NT Shell Script to generate version.c + ..\scripts\mkver.bat -P ntpdate # End Custom Build @@ -134,8 +134,8 @@ ProjDir=. InputPath=..\..\..\configure "$(ProjDir)\version.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Using environment var PERL ($(PERL)) - $(PERL)\bin\perl ..\scripts\mkver.bat -P ntpdate + echo Using NT Shell Script to generate version.c + ..\scripts\mkver.bat -P ntpdate # End Custom Build diff --git a/ports/winnt/ntpdc/ntpdc.dsp b/ports/winnt/ntpdc/ntpdc.dsp index c284a1625..73c40b9de 100644 --- a/ports/winnt/ntpdc/ntpdc.dsp +++ b/ports/winnt/ntpdc/ntpdc.dsp @@ -125,8 +125,8 @@ ProjDir=. InputPath=..\..\..\configure "$(ProjDir)\version.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Using environment var PERL ($(PERL)) - $(PERL)\bin\perl ..\scripts\mkver.bat -P ntpdc + echo Using NT Shell Script to generate version.c + ..\scripts\mkver.bat -P ntpdc # End Custom Build @@ -137,8 +137,8 @@ ProjDir=. InputPath=..\..\..\configure "$(ProjDir)\version.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Using environment var PERL ($(PERL)) - $(PERL)\bin\perl ..\scripts\mkver.bat -P ntpdc + echo Using NT Shell Script to generate version.c + ..\scripts\mkver.bat -P ntpdc # End Custom Build diff --git a/ports/winnt/ntpq/ntpq.dsp b/ports/winnt/ntpq/ntpq.dsp index 6a140a9c6..d837ddb90 100644 --- a/ports/winnt/ntpq/ntpq.dsp +++ b/ports/winnt/ntpq/ntpq.dsp @@ -125,8 +125,8 @@ ProjDir=. InputPath=..\..\..\configure "$(ProjDir)\version.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Using environment var PERL ($(PERL)) - $(PERL)\bin\perl ..\scripts\mkver.bat -P ntpq + echo Using NT Shell Script to generate version.c + ..\scripts\mkver.bat -P ntpq # End Custom Build @@ -137,8 +137,8 @@ ProjDir=. InputPath=..\..\..\configure "$(ProjDir)\version.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Using environment var PERL ($(PERL)) - $(PERL)\bin\perl ..\scripts\mkver.bat -P ntpq + echo Using NT Shell Script to generate version.c + ..\scripts\mkver.bat -P ntpq # End Custom Build diff --git a/ports/winnt/ntptrace/ntptrace.dsp b/ports/winnt/ntptrace/ntptrace.dsp index c10d5e8fa..32d3597d4 100644 --- a/ports/winnt/ntptrace/ntptrace.dsp +++ b/ports/winnt/ntptrace/ntptrace.dsp @@ -129,8 +129,8 @@ ProjDir=. InputPath=..\..\..\configure "$(ProjDir)\version.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Using environment var PERL ($(PERL)) - $(PERL)\bin\perl ..\scripts\mkver.bat -P ntptrace + echo Using NT Shell Script to generate version.c + ..\scripts\mkver.bat -P ntptrace # End Custom Build @@ -141,8 +141,8 @@ ProjDir=. InputPath=..\..\..\configure "$(ProjDir)\version.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Using environment var PERL ($(PERL)) - $(PERL)\bin\perl ..\scripts\mkver.bat -P ntptrace + echo Using NT Shell Script to generate version.c + ..\scripts\mkver.bat -P ntptrace # End Custom Build diff --git a/ports/winnt/scripts/mkver.bat b/ports/winnt/scripts/mkver.bat index 012424498..fd1355c9d 100755 --- a/ports/winnt/scripts/mkver.bat +++ b/ports/winnt/scripts/mkver.bat @@ -1,100 +1,68 @@ -@rem = '--*-Perl-*--'; -@rem = ' -@echo off -perl -S %0.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 -goto endofperl -@rem '; +@ECHO OFF + +GOTO PROG ###################################################################### # # Revision: mkver.bat -# Author: Greg Schueman -# Date: 05/03/1996 -# Purpose: Provide a perl script for NT to replace the -# mkversion shell script. +# Author: Frederick Czajka +# Date: 02/10/2000 +# Purpose: Provide a NT Shell script to replace the perl script +# that replaced the UNIX mkver shell script. # +# # -# -# Subroutines: -# print_help -# -# +# Notes: I had two goals with this script one to only use native +# NT Shell commands and two was too emulate the PERL style +# output. This required some work for the DATE format as +# you will see and TIME was really tricky to get a format +# matching PERLs! # ###################################################################### +:PROG -use English; -use Getopt::Long; - -#********************************************************************* -# Program Dependency Requirements -#********************************************************************* +IF {%1} == {} GOTO USAGE +IF {%1} == {-H} GOTO USAGE +IF {%2} == {} GOTO USAGE +IF {%1} == {-P} GOTO BEGIN -#********************************************************************* -# Set Environment -#********************************************************************* -$PROGRAM = $0; -$USAGE = "Usage: ${PROGRAM} [ -P -H ]\n"; +REM For any other bizarre permutation... +GOTO USAGE +:BEGIN -#********************************************************************* -# Subroutine Print Help -#********************************************************************* +SET GENERATED_PROGRAM=%2 -sub print_help -{ - print STDERR $USAGE; - print STDERR " -P --Program Name Database Name\n"; - print STDERR " -H --Help Help on options\n"; - print STDERR "\n"; -} # print_help end +REM Reimplemented from orginal Unix Shell script +IF NOT EXIST .version ECHO 0 > .version +FOR /F %%i IN (.version) do @SET RUN=%%i +SET /A RUN=%RUN%+1 +ECHO %RUN% > .version +FOR /F "TOKENS=2 DELIMS== " %%a IN ('findstr /b /l VERSION= ..\..\..\configure') DO @SET VER=%%a +FOR /F "TOKENS=5-8 DELIMS=:. " %%a IN ('echo.^|time') DO SET HH=%%a&SET MM=%%b&SET SS=%%c&SET HS=%%d +FOR /F "TOKENS=1-4 DELIMS=/ " %%a IN ('date/t') DO SET DAY=%%a&SET nmm=%%b&SET dd=%%c&SET yyyy=%%d -#********************************************************************* -# Main program -#********************************************************************* - -# -# Process runtime options -# -$result = GetOptions('help|H', 'prog|P=s'); - -if ($opt_help == 1) -{ - print_help(); - exit(); -}; - - -if (length($opt_prog) > 0) - { $GENERATED_PROGRAM=$opt_prog; } -else - { die "Program Name parameter required."; } - -# -# Program logic -# - -$DATE = localtime; -chomp $DATE; -$RUN = "0"; # Not working yet - -open( INPUT, '<..\..\..\configure' ); -open( OUTPUT, '>version.c' ); +IF %NMM% ==01 SET MONTH=Jan +IF %NMM% ==02 SET MONTH=Feb +IF %NMM% ==03 SET MONTH=Mar +IF %NMM% ==04 SET MONTH=Apr +IF %NMM% ==05 SET MONTH=May +IF %NMM% ==06 SET MONTH=Jun +IF %NMM% ==07 SET MONTH=Jul +IF %NMM% ==08 SET MONTH=Aug +IF %NMM% ==09 SET MONTH=Sep +IF %NMM% ==10 SET MONTH=Oct +IF %NMM% ==11 SET MONTH=Nov +IF %NMM% ==12 SET MONTH=Dec -while ($_ = ) -{ -# if (/^[0-9a-zA-Z_]*=/) - if (/^VERSION=/) - { - $FLAGS = $POSTMATCH; - } -} -chomp $FLAGS; +ECHO char * Version = "%GENERATED_PROGRAM% %VER% %DAY% %MONTH% %DD% %HH%:%MM%:%SS% %YYYY% (%RUN%)" ; > version.c -print OUTPUT "char * Version = \"$GENERATED_PROGRAM $FLAGS $DATE ($RUN)\" ;"; +GOTO EOF +:USAGE -close( OUTPUT ); -close( INPUT ); + ECHO Usage: mkver.bat [ -P -H ] + ECHO -P Database Name + ECHO -H Help on options -__END__ -:endofperl +:EOF \ No newline at end of file