From: Danny Mayer <mayer@ntp.org>
Date: Fri, 13 Jun 2003 03:19:43 +0000 (-0400)
Subject: Remove support for building ntptrace on Win32.
X-Git-Tag: NTP_4_1_80_RC1~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c80db0638734163bfdc9c4f405c08ec66db70faf;p=thirdparty%2Fntp.git

Remove support for building ntptrace on Win32.
Improvement for generating the version number on Win32.

bk: 3ee942cfGr17EzPS710ARzoCYGvgkw
---

diff --git a/ports/winnt/ntp.dsw b/ports/winnt/ntp.dsw
index cc6a8ae7d..222484079 100644
--- a/ports/winnt/ntp.dsw
+++ b/ports/winnt/ntp.dsw
@@ -7,10 +7,6 @@ Project: "instsrv"=".\instsrv\Instsrv.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
-    begin source code control
-    "$/ntp/ports/winnt/instsrv", ASCAAAAA
-    .\instsrv
-    end source code control
 }}}
 
 Package=<4>
@@ -23,10 +19,6 @@ Project: "libntp"=".\libntp\libntp.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
-    begin source code control
-    "$/ntp/ports/winnt/libntp", UJHAAAAA
-    .\libntp
-    end source code control
 }}}
 
 Package=<4>
@@ -39,10 +31,6 @@ Project: "ntpd"=".\ntpd\ntpd.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
-    begin source code control
-    "$/ntp/ports/winnt/ntpd", DKHAAAAA
-    .\ntpd
-    end source code control
 }}}
 
 Package=<4>
@@ -58,10 +46,6 @@ Project: "ntpdate"=".\ntpdate\ntpdate.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
-    begin source code control
-    "$/ntp/ports/winnt/ntpdate", JKHAAAAA
-    .\ntpdate
-    end source code control
 }}}
 
 Package=<4>
@@ -77,10 +61,6 @@ Project: "ntpdc"=".\ntpdc\ntpdc.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
-    begin source code control
-    "$/ntp/ports/winnt/ntpdc", LKHAAAAA
-    .\ntpdc
-    end source code control
 }}}
 
 Package=<4>
@@ -96,29 +76,6 @@ Project: "ntpq"=".\ntpq\ntpq.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
-    begin source code control
-    "$/ntp/ports/winnt/ntpq", NKHAAAAA
-    .\ntpq
-    end source code control
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libntp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ntptrace"=".\ntptrace\ntptrace.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    "$/ntp/ports/winnt/ntptrace", PKHAAAAA
-    .\ntptrace
-    end source code control
 }}}
 
 Package=<4>
@@ -134,10 +91,6 @@ Global:
 
 Package=<5>
 {{{
-    begin source code control
-    "$/ntp/ports/winnt", WIHAAAAA
-    .
-    end source code control
 }}}
 
 Package=<3>
diff --git a/ports/winnt/scripts/mkver.bat b/ports/winnt/scripts/mkver.bat
index fd1355c9d..b24a6724e 100755
--- a/ports/winnt/scripts/mkver.bat
+++ b/ports/winnt/scripts/mkver.bat
@@ -38,10 +38,12 @@ FOR /F %%i IN (.version) do @SET RUN=%%i
 SET /A RUN=%RUN%+1
 ECHO %RUN% > .version
 
+set VER=
+FOR /F "TOKENS=2 DELIMS== " %%a IN ('findstr /b /l "VERSION=" ..\..\..\configure') DO @SET VER=%%a
 
-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
+IF {%VER%} == {} FOR /F "TOKENS=2 DELIMS== " %%a IN ('findstr /l "VERSION=4" ..\..\..\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
 
 IF %NMM% ==01 SET MONTH=Jan
 IF %NMM% ==02 SET MONTH=Feb
@@ -56,6 +58,27 @@ IF %NMM% ==10 SET MONTH=Oct
 IF %NMM% ==11 SET MONTH=Nov
 IF %NMM% ==12 SET MONTH=Dec
 
+IF NOT {%MONTH%} == {} GOTO DATE_OK
+
+# Not US date format! Assume ISO: yyyy-mm-dd
+
+FOR /F "TOKENS=1-4 DELIMS=/- " %%a IN ('date/t') DO SET DAY=%%a&SET yyyy=%%b&SET nmm=%%c&SET dd=%%d
+
+echo a=%%a b=%%b c=%%c d=%%d
+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
+
+:DATE_OK
 ECHO char * Version = "%GENERATED_PROGRAM% %VER% %DAY% %MONTH% %DD% %HH%:%MM%:%SS% %YYYY% (%RUN%)" ; > version.c
 
 GOTO EOF