[librsvg/msvc-tarball-introspection: 20/20] NMake Makefiles: Fix introspection for release tarballs

[Marge Bot <marge-bot src gnome org>]

commit bb9a3f9e525e7672c6534e8a8383f0fec46bab5e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Feb 14 16:01:06 2022 +0800

    NMake Makefiles: Fix introspection for release tarballs
    
    We were checking unnecessarily whether we are building from a GIT checkout for
    the various items that we use in the NMake Makefiles, so add a check when
    invoking the NMake Makefiles before we check for the GIT-only items.
    
    Also, make the process of generating the file listings for the introspection
    more silenced.
    
    This will fix the introspection builds from release tarballs.
    
    Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/662>

 win32/detectenv-msvc.mak | 4 +++-
 win32/generate-msvc.mak  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak
index 9cec1df02..9721e1fe6 100644
--- a/win32/detectenv-msvc.mak
+++ b/win32/detectenv-msvc.mak
@@ -27,7 +27,9 @@ _HASH=^#
     && ![cl -nologo -TC -P vercl.x $(ERRNUL)]
 !include vercl.i
 !if ![echo VCVER= ^\> vercl.vc] \
-    && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
+    && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]    \
+       && ![echo.>>vercl.vc]   \
+       && ![if not exist ..\.git echo IS_NOT_GIT=1 >>vercl.vc]
 !include vercl.vc
 !endif
 !endif
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index 6af43531f..7c47ad435 100644
--- a/win32/generate-msvc.mak
+++ b/win32/generate-msvc.mak
@@ -17,10 +17,11 @@ $(OUTDIR)\librsvg\librsvg.def: .\librsvg.symbols
 # Generate listing file for introspection
 $(OUTDIR)\librsvg\Rsvg_2_0_gir_list: $(librsvg_real_pub_HDRS)
        @if exist $@ del $@
-       @for %%s in ($**) do echo %%s >> $@
+       @for %%s in ($**) do @echo %%s >> $@
 
 # Generate NMake Makefiles (for git checkouts only)
 
+!ifndef IS_NOT_GIT
 config.h.win32: ..\.git ..\configure.ac prebuild.py config.h.win32.in
 config-msvc.mak: ..\.git ..\configure.ac prebuild.py config-msvc.mak.in
 ..\include\librsvg\rsvg-version.h: ..\.git ..\configure.ac prebuild.py ..\include\librsvg\rsvg-version.h.in
@@ -34,3 +35,4 @@ remove-generated-nmake-files: ..\.git
        @-del /f/q config.h.win32
        @-del /f/q ..\include\librsvg\rsvg-version.h
        @-for /f %%d in ('dir /ad /b vs*') do @rmdir /s/q %%d
+!endif