Skip to content

Commit

Permalink
No need for separate tktest manifest: just re-use the one from wish. …
Browse files Browse the repository at this point in the history
…Give tktest.exe a version-number
  • Loading branch information
jan.nijtmans committed Jan 4, 2024
1 parent ac0122d commit ea8d732
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
10 changes: 2 additions & 8 deletions win/makefile.vc
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ TTK_SQUARE_WIDGET = 0

WISHC = "$(OUT_DIR)\$(WISHNAMEPREFIX)c$(VERSION)$(SUFX).exe"

TKTEST = "$(OUT_DIR)\$(PROJECT)test.exe"
TKTEST = "$(OUT_DIR)\$(PROJECT)test$(VERSION)$(SUFX).exe"
CAT32 = "$(OUT_DIR)\cat32.exe"

WISHOBJS = \
Expand Down Expand Up @@ -582,12 +582,6 @@ $(TMP_DIR)\wish.exe.manifest: $(WIN_DIR)\wish.exe.manifest.in
@TK_WIN_VERSION@ $(DOTVERSION).0.0
<<

$(TMP_DIR)\tktest.exe.manifest: $(WIN_DIR)\tktest.exe.manifest.in
@nmakehlp -s << $** >$@
@MACHINE@ $(MACHINE:IX86=X86)
@TK_WIN_VERSION@ $(DOTVERSION).0.0
<<

#---------------------------------------------------------------------
# Generate the source dependencies. Having dependency rules will
# improve incremental build accuracy without having to resort to a
Expand Down Expand Up @@ -649,7 +643,7 @@ $<

$(TMP_DIR)\tk.res: $(TMP_DIR)\wish.exe.manifest
$(TMP_DIR)\wish.res: $(TMP_DIR)\wish.exe.manifest
$(TMP_DIR)\tktest.res: $(TMP_DIR)\tktest.exe.manifest
$(TMP_DIR)\tktest.res: $(TMP_DIR)\wish.exe.manifest

.SUFFIXES:
.SUFFIXES:.c .rc
Expand Down
4 changes: 2 additions & 2 deletions win/rc/tktest.rc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "Tktest Application\0"
VALUE "OriginalFilename", "tktest.exe\0"
VALUE "OriginalFilename", "tktest" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".exe\0"
VALUE "FileVersion", TK_PATCH_LEVEL
VALUE "LegalCopyright", "Copyright \251 1987-2022 Regents of the University of California and other parties\0"
VALUE "ProductName", "Tk " TK_VERSION " for Windows\0"
Expand Down Expand Up @@ -83,4 +83,4 @@ app ICON DISCARDABLE "wish.ico"
#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
#endif
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "tktest.exe.manifest"
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "wish.exe.manifest"

0 comments on commit ea8d732

Please sign in to comment.