From 27d39316da8b041b68111e7623c5a80f014c7404 Mon Sep 17 00:00:00 2001
From: Mustafa M <mus-m@outlook.com>
Date: Sat, 8 May 2021 17:20:56 -0400
Subject: [PATCH] Fix windows resource FILEVERSION (#40752)

---
 cli/Makefile             | 2 +-
 contrib/windows/julia.rc | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/Makefile b/cli/Makefile
index b998462db9a32..c38b9972a243b 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -70,7 +70,7 @@ $(BUILDDIR)/julia_res.o: $(JULIAHOME)/contrib/windows/julia.rc $(JULIAHOME)/VERS
 	JLVER=`cat $(JULIAHOME)/VERSION` && \
 	JLVERi=`echo $$JLVER | perl -nle \
 		'/^(\d+)\.?(\d*)\.?(\d*)/ && \
-		print int $$1,",",int $$2,",0,",int $$3'` && \
+		print int $$1,",",int $$2,",",int $$3,",0"'` && \
 	$(CROSS_COMPILE)windres $< -O coff -o $@ -DJLVER=$$JLVERi -DJLVER_STR=\\\"$$JLVER\\\"
 EXE_OBJS += $(BUILDDIR)/julia_res.o
 EXE_DOBJS += $(BUILDDIR)/julia_res.o
diff --git a/contrib/windows/julia.rc b/contrib/windows/julia.rc
index 759b4f1b3023a..9a82ee1083ad6 100644
--- a/contrib/windows/julia.rc
+++ b/contrib/windows/julia.rc
@@ -1,13 +1,13 @@
 #include <winver.h>
 #include <winuser.h>
-1 VERSIONINFO
+VS_VERSION_INFO VERSIONINFO
 FILEVERSION     JLVER
 PRODUCTVERSION  JLVER
 /*
-FILEFLAGSMASK  	VS_FF_PRERELEASE
-FILEFLAGS      	VS_FF_PRERELEASE
+FILEFLAGSMASK  	VS_FFI_FILEFLAGSMASK
+FILEFLAGS      	VER_PRIVATEBUILD
 */
-FILEOS         	VOS_DOS_WINDOWS32
+FILEOS         	VOS__WINDOWS32
 FILETYPE       	VFT_APP
 BEGIN
   BLOCK "StringFileInfo"