@@ -74,23 +74,24 @@ 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 = 4
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,
8891# MAJOR/MINOR above, VIMMAJOR and VIMMINOR in src/Makefile, README*.txt,
8992# runtime/doc/*.txt and nsis/gvim.nsi. Other things in README_os2.txt. For a
9093# minor/major version: src/GvimExt/GvimExt.reg, src/vim.def, src/vim16.def,
9194# src/gvim.exe.mnf.
92- # - Adjust the date and other info in src/version.h.
93- # - Correct included_patches[] in src/version.c.
9495# - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, MZscheme, Lua (if
9596# you can make it all work), Cscope and "huge" features. Exclude workshop
9697# and SNiFF.
@@ -99,17 +100,23 @@ DOSBIN_S = dosbin_s
99100# - With these features: "make depend" (works best with gcc).
100101# - If you have a lint program: "make lint" and check the output (ignore GTK
101102# warnings).
102- # - Enable the efence library in "src/Makefile" and run "make test". Disable
103- # Python and Ruby to avoid trouble with threads (efence is not threadsafe).
103+ # - If you have valgrind, enable it in src/testdir/Makefile and run "make
104+ # test". Enable EXITFREE, disable GUI, scheme and tcl to avoid false alarms.
105+ # Check the valgrind output.
106+ # - If you have the efence library, enable it in "src/Makefile" and run "make
107+ # test". Disable Python and Ruby to avoid trouble with threads (efence is
108+ # not threadsafe).
109+ # - Adjust the date and other info in src/version.h.
110+ # - Correct included_patches[] in src/version.c.
104111# - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
105112# - Check for missing options in runtime/optwin.vim et al. (with check.vim).
106113# - Do "make menu" to update the runtime/synmenu.vim file.
107114# - Add remarks for changes to runtime/doc/version7.txt.
108115# - Check that runtime/doc/help.txt doesn't contain entries in "LOCAL
109116# ADDITIONS".
110117# - In runtime/doc run "make" and "make html" to check for errors.
111- # - Check if src/Makefile and src/feature.h don't contain any personal
112- # preferences or the GTK, Perl, etc. mentioned above.
118+ # - Check if src/Makefile, src/testdir/Makefile and src/feature.h don't contain
119+ # any personal preferences or the changes mentioned above.
113120# - Check file protections to be "644" for text and "755" for executables (run
114121# the "check" script).
115122# - Check compiling on Amiga, MS-DOS and MS-Windows.
@@ -128,36 +135,20 @@ DOSBIN_S = dosbin_s
128135# PC:
129136# - Run make on Unix to update the ".mo" files.
130137# - "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".
146138# 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"
139+ # - Set environment for Visual C++ 2008, e.g.: "msvc2008.bat" Or:
140+ # "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat".
141+ # Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
142+ # paths when necessary).
143+ # For Windows 98/ME the 2003 version is required, but then the executable
144+ # won't work on Windows 7 and 64 bit systems.
145+ # - "nmake -f Make_mvc.mak" (use the same path as for vcvars32.bat)
153146# - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
154- # - Rename the executables to " vimw32.exe", " xxdw32.exe" .
147+ # - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe.
155148# - 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.
149+ # - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe.
159150# Win32 GUI version:
160- # - "nmake -f Make_mvc.mak GUI=yes.
151+ # - "nmake -f Make_mvc.mak GUI=yes"
161152# - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
162153# - Move gvim.pdb to here.
163154# - Delete vimrun.exe, install.exe and uninstal.exe.
@@ -167,23 +158,13 @@ DOSBIN_S = dosbin_s
167158# - Rename "gvim.exe" to "gvim_ole.exe".
168159# - Rename gvim.pdb to "gvim_ole.pdb".
169160# - 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.
180161# Create the archives:
181162# - Copy all the "*.exe" files to where this Makefile is.
182163# - Copy all the "*.pdb" files to where this Makefile is.
183164# - "make dosbin".
184165# NSIS self installing exe:
185166# - To get NSIS see http://nsis.sourceforge.net
186- # - Make sure gvim_ole.exe, vimd32.exe, vimw32.exe, installw32.exe,
167+ # - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
187168# uninstalw32.exe and xxdw32.exe have been build as mentioned above.
188169# - copy these files (get them from a binary archive or build them):
189170# gvimext.dll in src/GvimExt
@@ -196,7 +177,44 @@ DOSBIN_S = dosbin_s
196177# - go to ../nsis and do "makensis gvim.nsi" (takes a few minutes).
197178# - Copy gvim##.exe to the dist directory.
198179#
199- # OS/2: (OBSOLETE, OS/2 version is no longer distributed)
180+ # 64 bit builds (these are not in the normal distribution, the 32 bit build
181+ # works just fine on 64 bit systems).
182+ # Like the console and GUI version, but first run vcvars64.bat or
183+ # "..\VC\vcvarsall.bat x86_amd64".
184+ # - "nmake -f Make_mvc.mak"
185+ # - "nmake -f Make_mvc.mak GUI=yes"
186+ # Or run src/bigvim64.bat for an OLE version.
187+ #
188+ # OBSOLETE systems: You can build this if you have an appropriate system.
189+ #
190+ # 16 bit DOS version: (doesn't build anywhere)
191+ # - Set environment for compiling with Borland C++ 3.1.
192+ # - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
193+ # case set environment for compiling with Borland C++ 4.0 and do
194+ # "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
195+ # NOTE: this currently fails because Vim is too big.
196+ # - "make test" and check the output.
197+ # - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
198+ # "uninstald16.exe".
199+ #
200+ # 32 bit DOS version: (requires Windows XP or earlier)
201+ # - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
202+ # - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for
203+ # "ALL DONE".
204+ # - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
205+ # "uninstald32.exe".
206+ #
207+ # Win32s GUI version: (requires very old compiler)
208+ # - Set environment for Visual C++ 4.1 (requires a new console window):
209+ # "vcvars32.bat" (use the path for VC 4.1 e:\msdev\bin)
210+ # - "nmake -f Make_mvc.mak GUI=yes INTL=no clean" (use the path for VC 4.1)
211+ # - "nmake -f Make_mvc.mak GUI=yes INTL=no" (use the path for VC 4.1)
212+ # - Rename "gvim.exe" to "gvim_w32s.exe".
213+ # - Rename "install.exe" to "installw32.exe"
214+ # - Rename "uninstal.exe" to "uninstalw32.exe"
215+ # - The produced uninstalw32.exe and vimrun.exe are used.
216+ #
217+ # OS/2: (requires an OS/2 system)
200218# - Unpack the Unix archive.
201219# - "make -f Make_os2.mak".
202220# - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe and copy
@@ -295,6 +313,8 @@ unixall: dist prepare
295313 $(LANG_SRC ) \
296314 | (cd dist/$( VIMRTDIR) ; tar xf -)
297315# Need to use a "distclean" config.mk file
316+ # Note: this file is not included in the repository to avoid problems, but it's
317+ # OK to put it in the archive.
298318 cp -f src/config.mk.dist dist/$(VIMRTDIR)/src/auto/config.mk
299319# Create an empty config.h file, make dependencies require it
300320 touch dist/$(VIMRTDIR)/src/auto/config.h
@@ -450,7 +470,7 @@ runtime_unix2dos: dosrt_unix2dos
450470 cd dist/vim/$(VIMRTDIR ) ; tar cf - * \
451471 | (cd ../../../runtime/dos; tar xf -)
452472
453- dosbin : prepare dosbin_gvim dosbin_w32 dosbin_d32 dosbin_ole $(DOSBIN_S ) $(DOSBIN_D16 )
473+ dosbin : prepare dosbin_gvim dosbin_w32 $( DOSBIN_D32 ) $(DOSBIN_S ) $(DOSBIN_D16 )
454474
455475# make Win32 gvim
456476dosbin_gvim : dist no_title.vim dist/$(COMMENT_GVIM )
0 commit comments