Skip to content

Commit

Permalink
Fix windows resource FILEVERSION (#40752)
Browse files Browse the repository at this point in the history
  • Loading branch information
@musm
musm authored May 8, 2021
1 parent 87d4e3f commit 27d3931
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cli/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions contrib/windows/julia.rc
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

4 comments on commit 27d3931

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Executing the daily package evaluation, I will reply here when finished:

@nanosoldier runtests(ALL, isdaily = true)

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your package evaluation job has completed - possible new issues were detected. A full report can be found here. cc @maleadt

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Executing the daily package evaluation, I will reply here when finished:

@nanosoldier runtests(ALL, isdaily = true)

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your package evaluation job has completed - possible issues were detected. A full report can be found here. cc @maleadt

Please sign in to comment.