From 2b2f60caf5f4b7db182940e3b9fbb5d2e8129032 Mon Sep 17 00:00:00 2001 From: glx Date: Tue, 26 May 2020 21:38:07 +0200 Subject: Fix: VS 2019 16.6 doesn't like newlines in --- projects/generate.vbs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'projects/generate.vbs') diff --git a/projects/generate.vbs b/projects/generate.vbs index 169f8b689..daeb32b03 100644 --- a/projects/generate.vbs +++ b/projects/generate.vbs @@ -321,21 +321,26 @@ Sub load_baseset_data(dir, langdir, ByRef vcxproj, ByRef files, ByRef langs) End Sub Sub generate(data, dest, data2) - Dim srcfile, destfile, line + Dim srcfile, destfile, line, regexp WScript.Echo "Generating " & FSO.GetFileName(dest) & "..." Set srcfile = FSO.OpenTextFile(dest & ".in", 1, 0, 0) Set destfile = FSO.CreateTextFile(dest, -1, 0) If Not IsNull(data2) Then ' Everything above the !!FILTERS!! marker + Set regexp = New RegExp + regexp.Pattern = "!!FILTERS!!" + regexp.Global = True + line = srcfile.ReadLine() - While line <> "!!FILTERS!!" + While Not regexp.Test(line) If len(line) > 0 Then destfile.WriteLine(line) line = srcfile.ReadLine() Wend ' Our generated content - destfile.WriteLine(data2) + line = regexp.Replace(line, data2) + destfile.WriteLine(line) End If ' Everything above the !!FILES!! marker -- cgit v1.2.3-70-g09d2