From: Juergen Perlinger Date: Mon, 13 Apr 2015 21:24:19 +0000 (+0200) Subject: make sure batch files are executed via 'call' -- multiple custom build steps fail... X-Git-Tag: NTP_4_3_27~1^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2701bbb33dea52de23ca44b93fa0810741ebf8c0;p=thirdparty%2Fntp.git make sure batch files are executed via 'call' -- multiple custom build steps fail otherwise. bk: 552c3403aFs6nOmfZyoXdHT1_ryrLw --- diff --git a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj b/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj index ffde68bf3..1e29c6c91 100644 --- a/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj +++ b/ports/winnt/vs2013/loopback-pps/loopback-ppsapi-provider.vcxproj @@ -220,24 +220,24 @@ Using NT Shell Script to generate version.c ..\..\scripts\mkver.bat -P loopback-ppsapi - ..\..\scripts\mkver.bat -P loopback-ppsapi + call ..\..\scripts\mkver.bat -P loopback-ppsapi .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P loopback-ppsapi + call ..\..\scripts\mkver.bat -P loopback-ppsapi .\version.c;%(Outputs) Using NT Shell Script to generate version.c Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P loopback-ppsapi + call ..\..\scripts\mkver.bat -P loopback-ppsapi - ..\..\scripts\mkver.bat -P loopback-ppsapi + call ..\..\scripts\mkver.bat -P loopback-ppsapi .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P loopback-ppsapi + call ..\..\scripts\mkver.bat -P loopback-ppsapi .\version.c;%(Outputs) diff --git a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj b/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj index d70c18156..be141be36 100644 --- a/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj +++ b/ports/winnt/vs2013/ntp-keygen/ntp-keygen.vcxproj @@ -236,24 +236,24 @@ Using NT Shell Script to generate version.c ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) Using NT Shell Script to generate version.c Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) diff --git a/ports/winnt/vs2013/ntpd/ntpd.vcxproj b/ports/winnt/vs2013/ntpd/ntpd.vcxproj index 24bd6cb7a..a88b1a8d7 100644 --- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj +++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj @@ -387,32 +387,37 @@ invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h .\gen-ntp_keyword $(TmpBaseDir) - .\gen-ntp_keyword $(TmpBaseDir) + call .\gen-ntp_keyword.bat $(TmpBaseDir) ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) + + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) - ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - .\gen-ntp_keyword $(TmpBaseDir) + call .\gen-ntp_keyword.bat $(TmpBaseDir) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) + + + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - .\gen-ntp_keyword $(TmpBaseDir) + call .\gen-ntp_keyword.bat $(TmpBaseDir) - .\gen-ntp_keyword $(TmpBaseDir) + call .\gen-ntp_keyword.bat $(TmpBaseDir) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) - ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) + + + + + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd invoking keyword-gen on ntp_parser.h to produce ntp_keyword.h - .\gen-ntp_keyword $(TmpBaseDir) + call .\gen-ntp_keyword.bat $(TmpBaseDir) - ..\..\..\..\ntpd\ntp_parser.h;%(AdditionalInputs) - ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd;%(Outputs) + + + ..\..\..\..\ntpd\ntp_keyword.h;..\..\..\..\ntpd\keyword-gen-utd @@ -449,42 +454,39 @@ Using NT Shell Script to generate version.c ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) + + .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) + + .\version.c;%(Outputs) Using NT Shell Script to generate version.c Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) + + + + .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat;..\..\include\config.h;%(AdditionalInputs) + + .\version.c;%(Outputs) - - true - true - true - true - true - true - diff --git a/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters b/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters index e6c43e801..fc14e36a5 100644 --- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters +++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters @@ -99,9 +99,6 @@ Source Files - - Source Files - Reference Clock @@ -288,6 +285,9 @@ Parse Lib + + Source Files + @@ -539,9 +539,6 @@ Header Files - - Source Files - \ No newline at end of file diff --git a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj index 98f84a935..2f39bdf33 100644 --- a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj +++ b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj @@ -253,24 +253,24 @@ Using NT Shell Script to generate version.c ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) Using NT Shell Script to generate version.c Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) diff --git a/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj b/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj index 54c02538d..cbed89d25 100644 --- a/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj +++ b/ports/winnt/vs2013/ntpdc/ntpdc.vcxproj @@ -244,24 +244,24 @@ Using NT Shell Script to generate version.c ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) Using NT Shell Script to generate version.c Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) diff --git a/ports/winnt/vs2013/ntpq/ntpq.vcxproj b/ports/winnt/vs2013/ntpq/ntpq.vcxproj index da96c405c..c7476d8ee 100644 --- a/ports/winnt/vs2013/ntpq/ntpq.vcxproj +++ b/ports/winnt/vs2013/ntpq/ntpq.vcxproj @@ -243,24 +243,24 @@ Using NT Shell Script to generate version.c ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) Using NT Shell Script to generate version.c Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs) .\version.c;%(Outputs) Using NT Shell Script to generate version.c - ..\..\scripts\mkver.bat -P $(ProjectName) + call ..\..\scripts\mkver.bat -P $(ProjectName) .\version.c;%(Outputs)