Skip to content

Commit 5bc1345

Browse files
k-takatabrammool
k-takata
authored and
brammool
committed
patch 9.0.0421: MS-Windows makefiles are inconsistently named
Problem: MS-Windows makefiles are inconsistently named. Solution: Use consistent names. (Ken Takata, closes #11088)
1 parent c572ad5 commit 5bc1345

File tree

13 files changed

+310
-299
lines changed

13 files changed

+310
-299
lines changed

‎.appveyor.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ test_script:
2626
- cd src/testdir
2727
# Testing with MSVC gvim
2828
- path C:\Python35-x64;%PATH%
29-
- nmake -f Make_dos.mak VIMPROG=..\gvim
30-
- nmake -f Make_dos.mak clean
29+
- nmake -f Make_mvc.mak VIMPROG=..\gvim
30+
- nmake -f Make_mvc.mak clean
3131
# Testing with MSVC console version
32-
- nmake -f Make_dos.mak VIMPROG=..\vim
32+
- nmake -f Make_mvc.mak VIMPROG=..\vim
3333

3434
# vim: sw=2 sts=2 et ts=8 sr

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,11 +563,11 @@ jobs:
563563
call "%VCVARSALL%" ${{ matrix.vcarch }}
564564
565565
echo %COL_GREEN%Start testing Vim in background.%COL_RESET%
566-
start cmd /c "cd src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
566+
start cmd /c "cd src2\testdir & nmake -nologo -f Make_mvc.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
567567
568568
echo %COL_GREEN%Test gVim:%COL_RESET%
569569
cd src\testdir
570-
nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || exit 1
570+
nmake -nologo -f Make_mvc.mak VIMPROG=..\gvim || exit 1
571571
572572
- name: Show the result of testing Vim
573573
shell: cmd
@@ -590,7 +590,7 @@ jobs:
590590
echo %COL_GREEN%The result of testing Vim:%COL_RESET%
591591
cd src2\testdir
592592
if exist messages type messages
593-
nmake -nologo -f Make_dos.mak report VIMPROG=..\..\src\vim || exit 1
593+
nmake -nologo -f Make_mvc.mak report VIMPROG=..\..\src\vim || exit 1
594594
595595
if "%timeout%"=="1" (
596596
echo %COL_RED%Timed out.%COL_RESET%

‎Filelist‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ SRC_ALL = \
171171
src/viminfo.c \
172172
src/winclip.c \
173173
src/window.c \
174-
src/tee/tee.c \
175174
src/xxd/xxd.c \
176175
src/testdir/gen_opt_test.vim \
177176
src/testdir/README.txt \
@@ -487,7 +486,6 @@ SRC_UNIX = \
487486
src/vimtutor \
488487
src/gvimtutor \
489488
src/which.sh \
490-
src/tee/Makefile \
491489
src/xxd/Makefile \
492490

493491
# source files for both DOS and Unix
@@ -516,7 +514,7 @@ SRC_DOS_UNIX = \
516514
src/proto/if_tcl.pro \
517515
src/typemap \
518516

519-
# source files for DOS (also in the extra archive)
517+
# source files for MS-Windows (also in the extra archive)
520518
SRC_DOS = \
521519
src/GvimExt/*.mak \
522520
src/GvimExt/GvimExt.reg \
@@ -570,6 +568,7 @@ SRC_DOS = \
570568
src/proto/os_win32.pro \
571569
src/proto/os_mswin.pro \
572570
src/testdir/Make_dos.mak \
571+
src/testdir/Make_mvc.mak \
573572
src/testdir/Make_ming.mak \
574573
src/testdir/dos.vim \
575574
src/uninstall.c \
@@ -578,7 +577,10 @@ SRC_DOS = \
578577
src/vimrun.c \
579578
src/xpm_w32.c \
580579
src/xpm_w32.h \
580+
src/tee/Make_ming.mak \
581581
src/tee/Make_mvc.mak \
582+
src/tee/Makefile \
583+
src/tee/tee.c \
582584
src/xxd/Make_ming.mak \
583585
src/xxd/Make_mvc.mak \
584586
nsis/gvim.nsi \
@@ -945,9 +947,6 @@ EXTRA = \
945947
README_extra.txt \
946948
src/VisVim/VisVim.dll \
947949
runtime/vimlogo.xpm \
948-
src/tee/Makefile \
949-
src/tee/Make_mvc.mak \
950-
src/tee/tee.c \
951950

952951
# files in READMEdir that are included from the top dir
953952
IN_README_DIR = \

‎src/GvimExt/Make_mvc.mak‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# Makefile for GvimExt, using MSVC
2+
# Options:
3+
# DEBUG=yes Build debug version (for VC7 and maybe later)
4+
# CPUARG= /arch:IA32/AVX/etc, call from main makefile to set
5+
# automatically from CPUNR
6+
#
7+
8+
TARGETOS = WINNT
9+
10+
!ifndef APPVER
11+
APPVER = 5.01
12+
!endif
13+
!ifndef WINVER
14+
WINVER = 0x0501
15+
!endif
16+
17+
!if "$(DEBUG)" != "yes"
18+
NODEBUG = 1
19+
!endif
20+
21+
!ifdef PROCESSOR_ARCHITECTURE
22+
# On Windows NT
23+
! ifndef CPU
24+
CPU = i386
25+
! if !defined(PLATFORM) && defined(TARGET_CPU)
26+
PLATFORM = $(TARGET_CPU)
27+
! endif
28+
! ifdef PLATFORM
29+
! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64")
30+
CPU = AMD64
31+
! elseif ("$(PLATFORM)" == "arm64") || ("$(PLATFORM)" == "ARM64")
32+
CPU = ARM64
33+
! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86")
34+
! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted.
35+
! endif
36+
! endif
37+
! endif
38+
!else
39+
CPU = i386
40+
!endif
41+
42+
!ifdef SDK_INCLUDE_DIR
43+
!include $(SDK_INCLUDE_DIR)\Win32.mak
44+
!elseif "$(USE_WIN32MAK)"=="yes"
45+
!include <Win32.mak>
46+
!else
47+
cc = cl
48+
link = link
49+
rc = rc
50+
cflags = -nologo -c
51+
lflags = -incremental:no -nologo
52+
rcflags = /r
53+
olelibsdll = ole32.lib uuid.lib oleaut32.lib user32.lib gdi32.lib advapi32.lib
54+
!endif
55+
56+
# include CPUARG
57+
cflags = $(cflags) $(CPUARG)
58+
59+
# set WINVER and _WIN32_WINNT
60+
cflags = $(cflags) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)
61+
62+
!if "$(CL)" == "/D_USING_V110_SDK71_"
63+
rcflags = $(rcflags) /D_USING_V110_SDK71_
64+
!endif
65+
66+
SUBSYSTEM = console
67+
!if "$(SUBSYSTEM_VER)" != ""
68+
SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER)
69+
!endif
70+
71+
!if "$(CPU)" == "AMD64" || "$(CPU)" == "ARM64"
72+
OFFSET = 0x11C000000
73+
!else
74+
OFFSET = 0x1C000000
75+
!endif
76+
77+
all: gvimext.dll
78+
79+
gvimext.dll: gvimext.obj \
80+
gvimext.res
81+
$(link) $(lflags) -dll -def:gvimext.def -base:$(OFFSET) -out:$*.dll $** $(olelibsdll) shell32.lib comctl32.lib -subsystem:$(SUBSYSTEM)
82+
if exist $*.dll.manifest mt -nologo -manifest $*.dll.manifest -outputresource:$*.dll;2
83+
84+
gvimext.obj: gvimext.h
85+
86+
.cpp.obj:
87+
$(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp
88+
89+
gvimext.res: gvimext.rc
90+
$(rc) /nologo $(rcflags) $(rcvars) gvimext.rc
91+
92+
clean:
93+
- if exist gvimext.dll del gvimext.dll
94+
- if exist gvimext.lib del gvimext.lib
95+
- if exist gvimext.exp del gvimext.exp
96+
- if exist gvimext.obj del gvimext.obj
97+
- if exist gvimext.res del gvimext.res
98+
- if exist gvimext.dll.manifest del gvimext.dll.manifest

‎src/GvimExt/Makefile‎

Lines changed: 3 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,4 @@
1-
# Makefile for GvimExt, using MSVC
2-
# Options:
3-
# DEBUG=yes Build debug version (for VC7 and maybe later)
4-
# CPUARG= /arch:IA32/AVX/etc, call from main makefile to set
5-
# automatically from CPUNR
6-
#
1+
!message This makefile is deprecated. Use Make_mvc.mak instead.
2+
!message
73

8-
TARGETOS = WINNT
9-
10-
!ifndef APPVER
11-
APPVER = 5.01
12-
!endif
13-
!ifndef WINVER
14-
WINVER = 0x0501
15-
!endif
16-
17-
!if "$(DEBUG)" != "yes"
18-
NODEBUG = 1
19-
!endif
20-
21-
!ifdef PROCESSOR_ARCHITECTURE
22-
# On Windows NT
23-
! ifndef CPU
24-
CPU = i386
25-
! if !defined(PLATFORM) && defined(TARGET_CPU)
26-
PLATFORM = $(TARGET_CPU)
27-
! endif
28-
! ifdef PLATFORM
29-
! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64")
30-
CPU = AMD64
31-
! elseif ("$(PLATFORM)" == "arm64") || ("$(PLATFORM)" == "ARM64")
32-
CPU = ARM64
33-
! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86")
34-
! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted.
35-
! endif
36-
! endif
37-
! endif
38-
!else
39-
CPU = i386
40-
!endif
41-
42-
!ifdef SDK_INCLUDE_DIR
43-
!include $(SDK_INCLUDE_DIR)\Win32.mak
44-
!elseif "$(USE_WIN32MAK)"=="yes"
45-
!include <Win32.mak>
46-
!else
47-
cc = cl
48-
link = link
49-
rc = rc
50-
cflags = -nologo -c
51-
lflags = -incremental:no -nologo
52-
rcflags = /r
53-
olelibsdll = ole32.lib uuid.lib oleaut32.lib user32.lib gdi32.lib advapi32.lib
54-
!endif
55-
56-
# include CPUARG
57-
cflags = $(cflags) $(CPUARG)
58-
59-
# set WINVER and _WIN32_WINNT
60-
cflags = $(cflags) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)
61-
62-
!if "$(CL)" == "/D_USING_V110_SDK71_"
63-
rcflags = $(rcflags) /D_USING_V110_SDK71_
64-
!endif
65-
66-
SUBSYSTEM = console
67-
!if "$(SUBSYSTEM_VER)" != ""
68-
SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER)
69-
!endif
70-
71-
!if "$(CPU)" == "AMD64" || "$(CPU)" == "ARM64"
72-
OFFSET = 0x11C000000
73-
!else
74-
OFFSET = 0x1C000000
75-
!endif
76-
77-
all: gvimext.dll
78-
79-
gvimext.dll: gvimext.obj \
80-
gvimext.res
81-
$(link) $(lflags) -dll -def:gvimext.def -base:$(OFFSET) -out:$*.dll $** $(olelibsdll) shell32.lib comctl32.lib -subsystem:$(SUBSYSTEM)
82-
if exist $*.dll.manifest mt -nologo -manifest $*.dll.manifest -outputresource:$*.dll;2
83-
84-
gvimext.obj: gvimext.h
85-
86-
.cpp.obj:
87-
$(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp
88-
89-
gvimext.res: gvimext.rc
90-
$(rc) /nologo $(rcflags) $(rcvars) gvimext.rc
91-
92-
clean:
93-
- if exist gvimext.dll del gvimext.dll
94-
- if exist gvimext.lib del gvimext.lib
95-
- if exist gvimext.exp del gvimext.exp
96-
- if exist gvimext.obj del gvimext.obj
97-
- if exist gvimext.res del gvimext.res
98-
- if exist gvimext.dll.manifest del gvimext.dll.manifest
4+
!include Make_mvc.mak

‎src/Make_cyg_ming.mak‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ xxd/xxd.exe: xxd/xxd.c
11491149
$(MAKE) -C xxd -f Make_ming.mak CC='$(CC)'
11501150

11511151
tee/tee.exe: tee/tee.c
1152-
$(MAKE) -C tee CC='$(CC)'
1152+
$(MAKE) -C tee -f Make_ming.mak CC='$(CC)'
11531153

11541154
GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
11551155
$(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) CXX='$(CXX)' STATIC_STDCPLUS=$(STATIC_STDCPLUS)
@@ -1176,7 +1176,7 @@ ifdef MZSCHEME
11761176
endif
11771177
$(MAKE) -C GvimExt -f Make_ming.mak clean
11781178
$(MAKE) -C xxd -f Make_ming.mak clean
1179-
$(MAKE) -C tee clean
1179+
$(MAKE) -C tee -f Make_ming.mak clean
11801180

11811181
# Run vim script to generate the Ex command lookup table.
11821182
# This only needs to be run when a command name has been added or changed.

‎src/Make_mvc.mak‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ tee/tee.exe: tee/tee.c
14001400

14011401
GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
14021402
cd GvimExt
1403-
$(MAKE) /NOLOGO -f Makefile $(MAKEFLAGS_GVIMEXT)
1403+
$(MAKE) /NOLOGO -f Make_mvc.mak $(MAKEFLAGS_GVIMEXT)
14041404
cd ..
14051405

14061406

@@ -1441,7 +1441,7 @@ clean: testclean
14411441
$(MAKE) /NOLOGO -f Make_mvc.mak clean
14421442
cd ..
14431443
cd GvimExt
1444-
$(MAKE) /NOLOGO -f Makefile clean
1444+
$(MAKE) /NOLOGO -f Make_mvc.mak clean
14451445
cd ..
14461446

14471447
# Run vim script to generate the Ex command lookup table.
@@ -1463,36 +1463,36 @@ nvcmdidxs: nv_cmds.h
14631463

14641464
test:
14651465
cd testdir
1466-
$(MAKE) /NOLOGO -f Make_dos.mak
1466+
$(MAKE) /NOLOGO -f Make_mvc.mak
14671467
cd ..
14681468

14691469
testgvim testgui:
14701470
cd testdir
1471-
$(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\gvim
1471+
$(MAKE) /NOLOGO -f Make_mvc.mak VIMPROG=..\gvim
14721472
cd ..
14731473

14741474
testtiny:
14751475
cd testdir
1476-
$(MAKE) /NOLOGO -f Make_dos.mak tiny
1476+
$(MAKE) /NOLOGO -f Make_mvc.mak tiny
14771477
cd ..
14781478

14791479
testgvimtiny:
14801480
cd testdir
1481-
$(MAKE) /NOLOGO -f Make_dos.mak tiny VIMPROG=..\gvim
1481+
$(MAKE) /NOLOGO -f Make_mvc.mak tiny VIMPROG=..\gvim
14821482
cd ..
14831483

14841484
testclean:
14851485
cd testdir
1486-
$(MAKE) /NOLOGO -f Make_dos.mak clean
1486+
$(MAKE) /NOLOGO -f Make_mvc.mak clean
14871487
cd ..
14881488

14891489
# Run individual OLD style test.
14901490
# These do not depend on the executable, compile it when needed.
14911491
$(SCRIPTS_TINY):
14921492
cd testdir
14931493
- if exist $@.out del $@.out
1494-
$(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) nolog
1495-
$(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) $@.out
1494+
$(MAKE) /NOLOGO -f Make_mvc.mak VIMPROG=..\$(VIMTESTTARGET) nolog
1495+
$(MAKE) /NOLOGO -f Make_mvc.mak VIMPROG=..\$(VIMTESTTARGET) $@.out
14961496
@ if exist test.log ( type test.log & exit /b 1 )
14971497
cd ..
14981498

@@ -1501,19 +1501,19 @@ $(SCRIPTS_TINY):
15011501
$(NEW_TESTS):
15021502
cd testdir
15031503
- if exist $@.res del $@.res
1504-
$(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) nolog
1505-
$(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) $@.res
1506-
$(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) report
1504+
$(MAKE) /NOLOGO -f Make_mvc.mak VIMPROG=..\$(VIMTESTTARGET) nolog
1505+
$(MAKE) /NOLOGO -f Make_mvc.mak VIMPROG=..\$(VIMTESTTARGET) $@.res
1506+
$(MAKE) /NOLOGO -f Make_mvc.mak VIMPROG=..\$(VIMTESTTARGET) report
15071507
cd ..
15081508

15091509
# Run Vim9 tests.
15101510
# These do not depend on the executable, compile it when needed.
15111511
test_vim9:
15121512
cd testdir
15131513
-del test_vim9_*.res
1514-
$(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) nolog
1515-
$(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) $(TEST_VIM9_RES)
1516-
$(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\$(VIMTESTTARGET) report
1514+
$(MAKE) /NOLOGO -f Make_mvc.mak VIMPROG=..\$(VIMTESTTARGET) nolog
1515+
$(MAKE) /NOLOGO -f Make_mvc.mak VIMPROG=..\$(VIMTESTTARGET) $(TEST_VIM9_RES)
1516+
$(MAKE) /NOLOGO -f Make_mvc.mak VIMPROG=..\$(VIMTESTTARGET) report
15171517
cd ..
15181518

15191519
###########################################################################

0 commit comments

Comments
 (0)