To: vim-dev@vim.org Subject: Patch 6.1.401 (extra) Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.401 (extra) Problem: Building the Win16 version with Borland 5.01 doesn't work. "make test" doesn't work with Make_dos.mak. (Walter Briscoe) Solution: Various fixes to the w16 makefile. (Walter Briscoe) Don't use deltree. Use "mkdir \tmp" instead of "mkdir /tmp". Files: src/Make_w16.mak, src/testdir/Make_dos.mak *** ../vim61.400/src/Make_w16.mak Mon Apr 2 12:05:03 2001 --- src/Make_w16.mak Thu Mar 13 13:10:48 2003 *************** *** 1,5 **** # ! # Borland C++ 5.02 makefile for vim, 16-bit windows gui version # By Vince Negri # ************************************************************* # * WARNING! --- 1,5 ---- # ! # Borland C++ 5.0[12] makefile for vim, 16-bit windows gui version # By Vince Negri # ************************************************************* # * WARNING! *************** *** 9,19 **** # * unless you are a guru. # ************************************************************* # ! # Look for ctl3dv2.lib below and adjust the paths as required. .AUTODEPEND - # # Borland C++ tools # --- 9,28 ---- # * unless you are a guru. # ************************************************************* # ! # Look for BOR below and either pass a different value or ! # adjust the path as required. For example ! # make -fMake_w16.mak -DBOR=C:\PF\Borland\BC5.01 -B BccW16.cfg ! # make -fMake_w16.mak ! # Note: $(BOR) is effectively ignored unless BccW16.cfg is rebuilt. ! # ! # Does not compile with Borland C++ 4.51 Walter Briscoe 2003-02-24 ! # "out of memory" from compiler if gvim16 wildly wrong. WFB 2003-03-04 ! # ! # vim16.def must be a DOS-formatted file. (\r\n line endings.) ! # It is a UNIX-formatted file (\n line endings) in vim-*-extra.tar.gz .AUTODEPEND # # Borland C++ tools # *************** *** 27,45 **** # IDE macros # - # # Options # ! IDE_ResFLAGS = ! LinkerLocalOptsAtW16_gvim16dexe = /Twe/x/l/c/C/k/Orcai /P=65535 /V3.10 /LD:\BC5\LIB ! ResLocalOptsAtW16_gvim16dexe = -k- ! BLocalOptsAtW16_gvim16dexe = ! CompInheritOptsAt_gvim16dexe = -ID:\BC5\INCLUDE;PROTO;. -DFEAT_GUI;FEAT_GUI_MSWIN;FEAT_GUI_W16;MSWIN;WIN16;MSWIN16_FASTTEXT;FEAT_TOOLBAR;WIN16_3DLOOK ! LinkerInheritOptsAt_gvim16dexe = -x ! LinkerOptsAt_gvim16dexe = $(LinkerLocalOptsAtW16_gvim16dexe) ! ResOptsAt_gvim16dexe = $(ResLocalOptsAtW16_gvim16dexe) ! BOptsAt_gvim16dexe = $(BLocalOptsAtW16_gvim16dexe) # # Dependency List --- 36,70 ---- # IDE macros # # # Options # ! !ifndef BOR ! BOR = D:\BC5 ! !endif ! ! # !ifndef INTDIR is lethal considering CLEAN below. WFB 2003-03-13 ! INTDIR=w16 ! ! # /Twe Make the target a Windows .EXE with explicit functions exportable + ! # /x Map file off ! # /l Include source line numbers in object map files` ! # /c case sensitive link ! # /C Case-sensitive exports and imports (16-bit only) ! # /k Produce "No Stack" warning. ! # /Oa Minimise segment alignment ! # /Oc Minimise Chain fixes ! # /Oi Minimise Iterated data ! # /Or Minimise resource alignment ! # /P -P=x Code pack size ! # /V Windows version for application ! # /L Folder to search for library files ! LinkerLocalOptsAtW16_gvim16dexe =/Twe/x/l/c/C/k/Or/Oc/Oa/Oi/P=65535/V3.10 ! ! CompInheritOptsAt_gvim16dexe = \ ! -I$(BOR)\INCLUDE;PROTO;. \ ! -DFEAT_GUI;FEAT_GUI_MSWIN;FEAT_GUI_W16;MSWIN;WIN16;MSWIN16_FASTTEXT \ ! -DFEAT_TOOLBAR;WIN16_3DLOOK # # Dependency List *************** *** 47,403 **** Dep_Gvim16 = \ gvim16.exe ! Gvim16 : BccW16.cfg $(Dep_Gvim16) ! echo MakeNode Dep_gvim16dexe = \ - fold.obj\ - D:\bc5\lib\ctl3dv2.lib\ vimtbar.lib\ vim16.def\ ! vim16.res\ ! getchar.obj\ ! gui.obj\ ! gui_w16.obj\ ! main.obj\ ! mark.obj\ ! mbyte.obj\ ! memfile.obj\ ! memline.obj\ ! menu.obj\ ! message.obj\ ! misc1.obj\ ! misc2.obj\ ! move.obj\ ! normal.obj\ ! ops.obj\ ! option.obj\ ! os_win16.obj\ ! os_mswin.obj\ ! quickfix.obj\ ! regexp.obj\ ! screen.obj\ ! search.obj\ ! syntax.obj\ ! tag.obj\ ! term.obj\ ! ui.obj\ ! undo.obj\ ! version.obj\ ! window.obj\ ! buffer.obj\ ! charset.obj\ ! diff.obj\ ! digraph.obj\ ! edit.obj\ ! eval.obj\ ! ex_cmds.obj\ ! ex_cmds2.obj\ ! ex_docmd.obj\ ! ex_getln.obj\ ! fileio.obj gvim16.exe : $(Dep_gvim16dexe) ! $(TLINK) @&&| ! $(LinkerOptsAt_gvim16dexe) + ! D:\BC5\LIB\c0wl.obj+ ! fold.obj+ ! getchar.obj+ ! gui.obj+ ! gui_w16.obj+ ! main.obj+ ! mark.obj+ ! mbyte.obj+ ! memfile.obj+ ! memline.obj+ ! menu.obj+ ! message.obj+ ! misc1.obj+ ! misc2.obj+ ! move.obj+ ! normal.obj+ ! ops.obj+ ! option.obj+ ! os_win16.obj+ ! os_mswin.obj+ ! quickfix.obj+ ! regexp.obj+ ! screen.obj+ ! search.obj+ ! syntax.obj+ ! tag.obj+ ! term.obj+ ! ui.obj+ ! undo.obj+ ! version.obj+ ! window.obj+ ! buffer.obj+ ! charset.obj+ ! diff.obj+ ! digraph.obj+ ! edit.obj+ ! eval.obj+ ! ex_cmds.obj+ ! ex_cmds2.obj+ ! ex_docmd.obj+ ! ex_getln.obj+ ! fileio.obj ! $< ! ! D:\bc5\lib\ctl3dv2.lib+ ! vimtbar.lib+ ! D:\BC5\LIB\import.lib+ ! D:\BC5\LIB\mathwl.lib+ ! D:\BC5\LIB\cwl.lib ! vim16.def ! vim16.res ! ! | ! fold.obj : fold.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ fold.c ! | ! ! vim16.res : vim16.rc ! $(BRC) -R @&&| ! $(IDE_ResFLAGS) $(ROptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -FO$@ vim16.rc ! | ! getchar.obj : getchar.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ getchar.c ! | ! ! gui.obj : gui.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ gui.c ! | ! ! gui_w16.obj : gui_w16.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ gui_w16.c ! | ! ! main.obj : main.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ main.c ! | ! ! mark.obj : mark.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ mark.c ! | ! ! mbyte.obj : mbyte.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ mbyte.c ! | ! ! memfile.obj : memfile.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ memfile.c ! | ! ! memline.obj : memline.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ memline.c ! | ! ! menu.obj : menu.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ menu.c ! | ! ! message.obj : message.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ message.c ! | ! ! misc1.obj : misc1.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ misc1.c ! | ! ! misc2.obj : misc2.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ misc2.c ! | ! ! move.obj : move.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ move.c ! | ! ! normal.obj : normal.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ normal.c ! | ! ! ops.obj : ops.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ ops.c ! | ! ! option.obj : option.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ option.c ! | ! ! os_win16.obj : os_win16.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ os_win16.c ! | ! ! os_mswin.obj : os_mswin.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ os_mswin.c ! | ! ! quickfix.obj : quickfix.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ quickfix.c ! | ! ! regexp.obj : regexp.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ regexp.c ! | ! ! screen.obj : screen.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ screen.c ! | ! ! search.obj : search.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ search.c ! | ! ! syntax.obj : syntax.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ syntax.c ! | ! ! tag.obj : tag.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ tag.c ! | ! ! term.obj : term.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ term.c ! | ! ! ui.obj : ui.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ ui.c ! | ! ! undo.obj : undo.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ undo.c ! | ! ! version.obj : version.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ version.c ! | ! ! window.obj : window.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ window.c ! | ! ! buffer.obj : buffer.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ buffer.c ! | ! ! charset.obj : charset.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ charset.c ! | ! ! diff.obj : diff.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ diff.c ! | ! ! digraph.obj : digraph.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ digraph.c ! | ! ! edit.obj : edit.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ edit.c ! | ! ! eval.obj : eval.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ eval.c ! | ! ! ex_cmds.obj : ex_cmds.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ ex_cmds.c ! | ! ! ex_cmds2.obj : ex_cmds2.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ ex_cmds2.c ! | ! ! ex_docmd.obj : ex_docmd.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ ex_docmd.c ! | ! ! ex_getln.obj : ex_getln.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ ex_getln.c ! | ! ! fileio.obj : fileio.c ! $(BCC) -P- -c @&&| ! $(CompOptsAt_gvim16dexe) $(CompInheritOptsAt_gvim16dexe) -o$@ fileio.c ! | # Compiler configuration file BccW16.cfg : Copy &&| ! -w ! -R ! -v ! -vi ! -H ! -H=gvim16.csm ! -ml ! -WE ! -f- ! -ff ! -v- ! -R- ! -k- ! -3 ! -a ! -pr ! -dc ! -Og ! -Ot ! -Z ! -O ! -Oe ! -Ol ! -Ob ! -OW ! -Ov ! -O2 ! -Op ! -w-par ! -wuse ! -w-sig ! -w-ucp ! -H | $@ ! --- 72,191 ---- Dep_Gvim16 = \ gvim16.exe ! ObjFiles = \ ! $(INTDIR)\buffer.obj\ ! $(INTDIR)\charset.obj\ ! $(INTDIR)\diff.obj\ ! $(INTDIR)\digraph.obj\ ! $(INTDIR)\edit.obj\ ! $(INTDIR)\eval.obj\ ! $(INTDIR)\ex_cmds.obj\ ! $(INTDIR)\ex_cmds2.obj\ ! $(INTDIR)\ex_docmd.obj\ ! $(INTDIR)\ex_getln.obj\ ! $(INTDIR)\fileio.obj\ ! $(INTDIR)\fold.obj\ ! $(INTDIR)\getchar.obj\ ! $(INTDIR)\gui.obj\ ! $(INTDIR)\gui_w16.obj\ ! $(INTDIR)\main.obj\ ! $(INTDIR)\mark.obj\ ! $(INTDIR)\mbyte.obj\ ! $(INTDIR)\memfile.obj\ ! $(INTDIR)\memline.obj\ ! $(INTDIR)\menu.obj\ ! $(INTDIR)\message.obj\ ! $(INTDIR)\misc1.obj\ ! $(INTDIR)\misc2.obj\ ! $(INTDIR)\move.obj\ ! $(INTDIR)\normal.obj\ ! $(INTDIR)\ops.obj\ ! $(INTDIR)\option.obj\ ! $(INTDIR)\os_win16.obj\ ! $(INTDIR)\os_mswin.obj\ ! $(INTDIR)\quickfix.obj\ ! $(INTDIR)\regexp.obj\ ! $(INTDIR)\screen.obj\ ! $(INTDIR)\search.obj\ ! $(INTDIR)\syntax.obj\ ! $(INTDIR)\tag.obj\ ! $(INTDIR)\term.obj\ ! $(INTDIR)\ui.obj\ ! $(INTDIR)\undo.obj\ ! $(INTDIR)\version.obj\ ! $(INTDIR)\window.obj Dep_gvim16dexe = \ vimtbar.lib\ vim16.def\ ! $(INTDIR)\vim16.res\ ! $(ObjFiles) ! ! # Without the following, the implicit rule in BUILTINS.MAK is picked up ! # for a rule for .c.obj rather than the local implicit rule ! .SUFFIXES ! .SUFFIXES .c .obj ! .path.c = . ! ! # -P- Force C++ compilation off ! # -c Compilation only ! # -n Place .OBJ files ! {.}.c{$(INTDIR)}.obj: ! $(BCC) -P- -c -n$(INTDIR)\ {$< } ! ! Gvim16 : BccW16.cfg $(Dep_Gvim16) ! echo MakeNode gvim16.exe : $(Dep_gvim16dexe) ! $(TLINK) $(LinkerLocalOptsAtW16_gvim16dexe) @&&| ! c0wl.obj $(ObjFiles) ! |,$*,,vimtbar ctl3dv2 import cwl,vim16,$(INTDIR)\vim16 ! ! # Force objects to be built if $(BOR) changes ! $(ObjFiles) : Make_w16.mak BccW16.cfg ! ! $(INTDIR)\vim16.res : vim16.rc ! $(BRC) -R -fo$* $? # Compiler configuration file + # There is no rule for $(INTDIR) as make always says it does not exist BccW16.cfg : + -@if not exist $(INTDIR)\$(NULL) mkdir $(INTDIR) Copy &&| ! -3 ; Generate 80386 protected-mode compatible instructions ! -a ; Byte alignment ! -dc ; Move string literals from data segment to code segment ! -ff ; Fast floating point ! -H ; Generate and use precompiled headers ! -H=$(INTDIR)\gvim16.csm ; gvim16.csm is the precompiled header filename ! -k- ; No standard stack frame ! -ml ; Large memory model ! -OW ; Suppress the inc bp/dec bp on windows far functions ! -O1 ; Generate smallest possible code ! -O2 ; Generate fastest possible code (overrides prior -O1 control) ! -pr ; Fastcall calling convention passing parameters in registers ! -R- ; Exclude browser information in generated .OBJ files ! -v- ; Turn off source debugging ! -vi ; Turn inline function expansion on ! -WE ; Only __far _export functions are exported ! -w ; Display warnings ! -w-par ; Suppress: Parameter 'parameter' is never used ! -w-pch ; Cannot create pre-compiled header: initialized data in header ! -w-sig ; identifier' declared but never used ! -w-ucp ; Mixing pointers to different 'char' types ! -wuse ; 'identifier' declared but never used ! $(CompInheritOptsAt_gvim16dexe) | $@ ! !IF "$(OS)" == "Windows_NT" ! NULL= ! DEL_TREE = rmdir /s /q ! !ELSE ! NULL=nul ! DEL_TREE = deltree /y ! !ENDIF ! ! CLEAN: ! -@if exist $(INTDIR)\$(NULL) $(DEL_TREE) $(INTDIR) ! -@if exist BccW16.cfg erase BccW16.cfg ! -@if exist gvim16.exe erase gvim16.exe *** ../vim61.400/src/testdir/Make_dos.mak Tue May 15 12:01:17 2001 --- src/testdir/Make_dos.mak Thu Mar 13 19:41:29 2003 *************** *** 45,61 **** -del small.vim -del tiny.vim -del mbyte.vim ! -deltree /y X* .in.out: copy $*.ok test.ok $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in diff test.out $*.ok rename test.out $*.out ! -deltree /y X* -del test.ok # Create a directory for temp files /tmp: ! -mkdir /tmp --- 45,61 ---- -del small.vim -del tiny.vim -del mbyte.vim ! -del X* .in.out: copy $*.ok test.ok $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in diff test.out $*.ok rename test.out $*.out ! -del X* -del test.ok # Create a directory for temp files /tmp: ! -mkdir \tmp *** ../vim61.400/src/version.c Sat Mar 15 16:39:04 2003 --- src/version.c Sat Mar 15 16:41:24 2003 *************** *** 613,614 **** --- 613,616 ---- { /* Add new patch number below this line */ + /**/ + 401, /**/ -- From "know your smileys": :-H Is missing teeth /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///