diff options
| author | glx <glx@openttd.org> | 2020-05-26 21:38:07 +0200 |
|---|---|---|
| committer | glx22 <glx22@users.noreply.github.com> | 2020-05-26 22:44:18 +0200 |
| commit | 2b2f60caf5f4b7db182940e3b9fbb5d2e8129032 (patch) | |
| tree | 8369fdd69b1864da79e01d4efafdffb77956cb62 /projects/generate.vbs | |
| parent | 800ade77021b34adf8daa5ca5de0efaa8df24152 (diff) | |
| download | openttd-2b2f60caf5f4b7db182940e3b9fbb5d2e8129032.tar.xz | |
Fix: VS 2019 16.6 doesn't like newlines in <SettingsCommandLine>
Diffstat (limited to 'projects/generate.vbs')
| -rw-r--r-- | projects/generate.vbs | 11 |
1 files changed, 8 insertions, 3 deletions
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 |