@@ -74,14 +74,17 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
7474# Before creating an archive first delete all backup files, *.orig, etc.
7575
7676MAJOR = 7
77- MINOR = 3
77+ MINOR = 4a
7878
7979# Uncomment this line if the Win32s version is to be included.
80- DOSBIN_S = dosbin_s
80+ # DOSBIN_S = dosbin_s
8181
8282# Uncomment this line if the 16 bit DOS version is to be included.
8383# DOSBIN_D16 = dosbin_d16
8484
85+ # Uncomment this line if the 32 bit DOS version is to be included.
86+ # DOSBIN_D32 = dosbin_d32
87+
8588# CHECKLIST for creating a new version:
8689#
8790# - Update Vim version number. For a test version in: src/version.h, Contents,
@@ -128,36 +131,20 @@ DOSBIN_S = dosbin_s
128131# PC:
129132# - Run make on Unix to update the ".mo" files.
130133# - "make dossrc" and "make dosrt". Unpack the archives on a PC.
131- # 16 bit DOS version: (OBSOLETE, 16 bit version doesn't build)
132- # - Set environment for compiling with Borland C++ 3.1.
133- # - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
134- # case set environment for compiling with Borland C++ 4.0 and do
135- # "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
136- # NOTE: this currently fails because Vim is too big.
137- # - "make test" and check the output.
138- # - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
139- # "uninstald16.exe".
140- # 32 bit DOS version:
141- # - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
142- # - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for
143- # "ALL DONE".
144- # - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
145- # "uninstald32.exe".
146134# Win32 console version:
147- # - Set environment for Visual C++ 2008, e.g.:
148- # "E:\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat". Or, when using the
149- # Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the paths when necessary).
150- # For Windows 98/ME the 2003 version is required, but then it won't work on
151- # Windows 7 and 64 bit.
152- # - "nmake -f Make_mvc.mak"
135+ # - Set environment for Visual C++ 2008, e.g.: "msvc2008.bat" Or:
136+ # "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat".
137+ # Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
138+ # paths when necessary).
139+ # For Windows 98/ME the 2003 version is required, but then the executable
140+ # won't work on Windows 7 and 64 bit.
141+ # - "nmake -f Make_mvc.mak" (use the same path as for vcvars32.bat)
153142# - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
154- # - Rename the executables to " vimw32.exe", " xxdw32.exe" .
143+ # - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe.
155144# - Rename vim.pdb to vimw32.pdb.
156- # - When building the Win32s version later, delete vimrun.exe, install.exe and
157- # uninstal.exe. Otherwise rename executables to installw32.exe and
158- # uninstalw32.exe.
145+ # - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe.
159146# Win32 GUI version:
160- # - "nmake -f Make_mvc.mak GUI=yes.
147+ # - "nmake -f Make_mvc.mak GUI=yes"
161148# - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
162149# - Move gvim.pdb to here.
163150# - Delete vimrun.exe, install.exe and uninstal.exe.
@@ -167,23 +154,13 @@ DOSBIN_S = dosbin_s
167154# - Rename "gvim.exe" to "gvim_ole.exe".
168155# - Rename gvim.pdb to "gvim_ole.pdb".
169156# - Delete install.exe and uninstal.exe.
170- # - If building the Win32s version delete vimrun.exe.
171- # Win32s GUI version:
172- # - Set environment for Visual C++ 4.1 (requires a new console window):
173- # "vcvars32.bat" (use the path for VC 4.1 e:\msdev\bin)
174- # - "nmake -f Make_mvc.mak GUI=yes INTL=no clean" (use the path for VC 4.1)
175- # - "nmake -f Make_mvc.mak GUI=yes INTL=no" (use the path for VC 4.1)
176- # - Rename "gvim.exe" to "gvim_w32s.exe".
177- # - Rename "install.exe" to "installw32.exe"
178- # - Rename "uninstal.exe" to "uninstalw32.exe"
179- # - The produced uninstalw32.exe and vimrun.exe are used.
180157# Create the archives:
181158# - Copy all the "*.exe" files to where this Makefile is.
182159# - Copy all the "*.pdb" files to where this Makefile is.
183160# - "make dosbin".
184161# NSIS self installing exe:
185162# - To get NSIS see http://nsis.sourceforge.net
186- # - Make sure gvim_ole.exe, vimd32.exe, vimw32.exe, installw32.exe,
163+ # - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
187164# uninstalw32.exe and xxdw32.exe have been build as mentioned above.
188165# - copy these files (get them from a binary archive or build them):
189166# gvimext.dll in src/GvimExt
@@ -196,7 +173,44 @@ DOSBIN_S = dosbin_s
196173# - go to ../nsis and do "makensis gvim.nsi" (takes a few minutes).
197174# - Copy gvim##.exe to the dist directory.
198175#
199- # OS/2: (OBSOLETE, OS/2 version is no longer distributed)
176+ # 64 bit builds (these are not in the normal distribution, the 32 bit build
177+ # works just fine on 64 bit systems).
178+ # Like the console and GUI version, but first run vcvars64.bat or
179+ # "..\VC\vcvarsall.bat x86_amd64".
180+ # - "nmake -f Make_mvc.mak"
181+ # - "nmake -f Make_mvc.mak GUI=yes"
182+ # Or run src/bigvim64.bat for an OLE version.
183+ #
184+ # OBSOLETE systems: You can build this if you have an appropriate system.
185+ #
186+ # 16 bit DOS version: (doesn't build anywhere)
187+ # - Set environment for compiling with Borland C++ 3.1.
188+ # - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
189+ # case set environment for compiling with Borland C++ 4.0 and do
190+ # "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
191+ # NOTE: this currently fails because Vim is too big.
192+ # - "make test" and check the output.
193+ # - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
194+ # "uninstald16.exe".
195+ #
196+ # 32 bit DOS version: (requires Windows XP or earlier)
197+ # - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
198+ # - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for
199+ # "ALL DONE".
200+ # - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
201+ # "uninstald32.exe".
202+ #
203+ # Win32s GUI version: (requires very old compiler)
204+ # - Set environment for Visual C++ 4.1 (requires a new console window):
205+ # "vcvars32.bat" (use the path for VC 4.1 e:\msdev\bin)
206+ # - "nmake -f Make_mvc.mak GUI=yes INTL=no clean" (use the path for VC 4.1)
207+ # - "nmake -f Make_mvc.mak GUI=yes INTL=no" (use the path for VC 4.1)
208+ # - Rename "gvim.exe" to "gvim_w32s.exe".
209+ # - Rename "install.exe" to "installw32.exe"
210+ # - Rename "uninstal.exe" to "uninstalw32.exe"
211+ # - The produced uninstalw32.exe and vimrun.exe are used.
212+ #
213+ # OS/2: (requires an OS/2 system)
200214# - Unpack the Unix archive.
201215# - "make -f Make_os2.mak".
202216# - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe and copy
@@ -295,6 +309,8 @@ unixall: dist prepare
295309 $(LANG_SRC ) \
296310 | (cd dist/$( VIMRTDIR) ; tar xf -)
297311# Need to use a "distclean" config.mk file
312+ # Note: this file is not included in the repository to avoid problems, but it's
313+ # OK to put it in the archive.
298314 cp -f src/config.mk.dist dist/$(VIMRTDIR)/src/auto/config.mk
299315# Create an empty config.h file, make dependencies require it
300316 touch dist/$(VIMRTDIR)/src/auto/config.h
@@ -450,7 +466,7 @@ runtime_unix2dos: dosrt_unix2dos
450466 cd dist/vim/$(VIMRTDIR ) ; tar cf - * \
451467 | (cd ../../../runtime/dos; tar xf -)
452468
453- dosbin : prepare dosbin_gvim dosbin_w32 dosbin_d32 dosbin_ole $(DOSBIN_S ) $(DOSBIN_D16 )
469+ dosbin : prepare dosbin_gvim dosbin_w32 $( DOSBIN_D32 ) $(DOSBIN_S ) $(DOSBIN_D16 )
454470
455471# make Win32 gvim
456472dosbin_gvim : dist no_title.vim dist/$(COMMENT_GVIM )
0 commit comments