diff options
| author | Ken Sharp <ken.sharp@artifex.com> | 2022-08-01 12:28:05 +0100 |
|---|---|---|
| committer | Ken Sharp <ken.sharp@artifex.com> | 2022-08-01 12:34:13 +0100 |
| commit | 9d3ba211dbebfdaf88ca93f2ebd91c72ac13c80d (patch) | |
| tree | d39e9c4ec702bd1a9c3cea1f1874fbda65453a14 /psi | |
| parent | 8958762daf5c75ebd7f076f5140376acd09652b4 (diff) | |
| download | ghostpdl-9d3ba211dbebfdaf88ca93f2ebd91c72ac13c80d.tar.gz | |
Windows build - Fix versioning of the binaries
It seems that the same information is stored in two ways in the version
resource of Windows binaries. As numeric data and as a human-readable
string.
With the addition of the patch level we had updated the string data but
had omitted to update the numeric information. In addition it appears
that we always had the word order reversed, so that instead of (eg)
9.57.1.0 our numeric version was coming out as 0.0.9.57 (wrong order
and no patch level, if the patch level had been present this would
have read 1.0.9.57).
This commit corrects the word order of FILEVERSION and PRODUCTVERSION
and adds the patch level to them, which means we also need to define
the patch level on the invocation of the Resource Compiler.
Diffstat (limited to 'psi')
| -rw-r--r-- | psi/dwmain.rc | 6 | ||||
| -rw-r--r-- | psi/gsdll32.rc | 6 | ||||
| -rw-r--r-- | psi/winint.mak | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/psi/dwmain.rc b/psi/dwmain.rc index 3e81c9d20..a96d0eac6 100644 --- a/psi/dwmain.rc +++ b/psi/dwmain.rc @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2021 Artifex Software, Inc. +/* Copyright (C) 2001-2022 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -35,8 +35,8 @@ GSIMAGE_ICON ICON gsgraph_ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,GS_VERSION_MAJOR,GS_VERSION_MINOR - PRODUCTVERSION 0,0,GS_VERSION_MAJOR,GS_VERSION_MINOR + FILEVERSION GS_VERSION_MAJOR,GS_VERSION_MINOR,GS_VERSION_PATCH,0 + PRODUCTVERSION GS_VERSION_MAJOR,GS_VERSION_MINOR,GS_VERSION_PATCH,0 BEGIN BLOCK "StringFileInfo" BEGIN diff --git a/psi/gsdll32.rc b/psi/gsdll32.rc index a03540aca..6bbf6d03c 100644 --- a/psi/gsdll32.rc +++ b/psi/gsdll32.rc @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2021 Artifex Software, Inc. +/* Copyright (C) 2001-2022 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -51,8 +51,8 @@ BEGIN END VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,GS_VERSION_MAJOR,GS_VERSION_MINOR - PRODUCTVERSION 0,0,GS_VERSION_MAJOR,GS_VERSION_MINOR + FILEVERSION GS_VERSION_MAJOR,GS_VERSION_MINOR,GS_VERSION_PATCH,0 + PRODUCTVERSION GS_VERSION_MAJOR,GS_VERSION_MINOR,GS_VERSION_PATCH,0 BEGIN BLOCK "StringFileInfo" BEGIN diff --git a/psi/winint.mak b/psi/winint.mak index d916088a7..d604d0241 100644 --- a/psi/winint.mak +++ b/psi/winint.mak @@ -85,7 +85,7 @@ $(GS_OBJ).res: $(PSSRC)dwmain.rc $(dwres_h) $(ICONS) $(WININT_MAK) $(ECHOGS_XE) -w $(PSGEN)_exe.rc -x 23 define -s gstext_ico $(GLGENDIR)\gswin.ico $(ECHOGS_XE) -a $(PSGEN)_exe.rc -x 23 define -s gsgraph_ico $(GLGENDIR)\gswin.ico $(ECHOGS_XE) -a $(PSGEN)_exe.rc -R $(PSSRC)dwmain.rc - $(RCOMP) -dGS_DOT_VERSION=$(GS_DOT_VERSION) -dGS_VERSION_MAJOR=$(GS_VERSION_MAJOR) -dGS_VERSION_MINOR=$(GS_VERSION_MINOR) -i$(PSSRCDIR) -i$(PSGENDIR) -i$(GLSRCDIR) $(i_INCDIR) -r $(RO_)$(GS_OBJ).res $(PSGEN)_exe.rc + $(RCOMP) -dGS_DOT_VERSION=$(GS_DOT_VERSION) -dGS_VERSION_MAJOR=$(GS_VERSION_MAJOR) -dGS_VERSION_MINOR=$(GS_VERSION_MINOR) -dGS_VERSION_PATCH=$(GS_VERSION_PATCH) -i$(PSSRCDIR) -i$(PSGENDIR) -i$(GLSRCDIR) $(i_INCDIR) -r $(RO_)$(GS_OBJ).res $(PSGEN)_exe.rc del $(PSGEN)_exe.rc # resources for main program (includes dialogs) @@ -93,7 +93,7 @@ $(GSDLL_OBJ).res: $(PSSRC)gsdll32.rc $(gp_mswin_h) $(ICONS) $(WININT_MAK) $(ECHOGS_XE) -w $(PSGEN)_dll.rc -x 23 define -s gstext_ico $(GLGENDIR)\gswin.ico $(ECHOGS_XE) -a $(PSGEN)_dll.rc -x 23 define -s gsgraph_ico $(GLGENDIR)\gswin.ico $(ECHOGS_XE) -a $(PSGEN)_dll.rc -R $(PSSRC)gsdll32.rc - $(RCOMP) -dGS_DOT_VERSION=$(GS_DOT_VERSION) -dGS_VERSION_MAJOR=$(GS_VERSION_MAJOR) -dGS_VERSION_MINOR=$(GS_VERSION_MINOR) -i$(PSSRCDIR) -i$(PSGENDIR) -i$(GLSRCDIR) $(i_INCDIR) -r $(RO_)$(GSDLL_OBJ).res $(PSGEN)_dll.rc + $(RCOMP) -dGS_DOT_VERSION=$(GS_DOT_VERSION) -dGS_VERSION_MAJOR=$(GS_VERSION_MAJOR) -dGS_VERSION_MINOR=$(GS_VERSION_MINOR) -dGS_VERSION_PATCH=$(GS_VERSION_PATCH) -i$(PSSRCDIR) -i$(PSGENDIR) -i$(GLSRCDIR) $(i_INCDIR) -r $(RO_)$(GSDLL_OBJ).res $(PSGEN)_dll.rc del $(PSGEN)_dll.rc |