To: vim-dev@vim.org Subject: Patch 6.1.304 (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.304 (extra, depends on 6.1.292) Problem: Win32: Postscript is always enabled in the MingW Makefile. Pathdef.c isn't generated properly with Make_bc5.mak. (Yasuhiro Matsumoto) Solution: Change an ifdef to an ifeq. (Madoka Machitani) Use the Borland make redirection to generate pathdef.c. (Maurice Barnum) Files: src/Make_bc5.mak, src/Make_ming.mak *** ../vim61.303/src/Make_bc5.mak Sun Jan 19 16:13:04 2003 --- src/Make_bc5.mak Thu Jan 23 20:07:42 2003 *************** *** 824,839 **** $(OBJDIR)\pathdef.obj: auto\pathdef.c auto\pathdef.c:: @echo creating auto/pathdef.c ! @echo "/* pathdef.c */" > auto\pathdef.c ! @echo "#include \"vim.h\" " >> auto\pathdef.c ! @echo "char_u *default_vim_dir = (char_u *)\"$(VIMRCLOC:\=\\)\" "; >> auto\pathdef.c ! @echo "char_u *default_vimruntime_dir = (char_u *)\"$(VIMRUNTIMEDIR:\=\\)\" "; >> auto\pathdef.c ! @echo "char_u *all_cflags = (char_u *)\"$(CC:\=\\\\) $(CFLAGS:\=\\\\) $(DEFINES) $(MBDEFINES) $(INTERP_DEFINES:"=\\") $(OPT) $(EXETYPE) $(CPUARG) $(ALIGNARG) $(DEBUG_FLAG) $(CODEGUARD_FLAG)\" "; >> auto\pathdef.c ! @echo "char_u *all_lflags = (char_u *)\"$(LINK:\=\\\\) $(LFLAGS:\=\\\\)\" "; >> auto\pathdef.c ! @echo "char_u *compiled_user = (char_u *)\"$(USERNAME)\" "; >> auto\pathdef.c ! @echo "char_u *compiled_sys = (char_u *)\"$(USERDOMAIN)\" "; >> auto\pathdef.c perl.lib: $(PERL)\lib\CORE\perl$(PERL_VER).lib coff2omf $(PERL)\lib\CORE\perl$(PERL_VER).lib $@ --- 824,845 ---- $(OBJDIR)\pathdef.obj: auto\pathdef.c + # Note: the silly /*"*/ below are there to trick make into accepting + # the # character as something other than a comment without messing up + # the preprocessor directive. auto\pathdef.c:: @echo creating auto/pathdef.c ! @copy &&| ! /* pathdef.c */ ! /*"*/#include "vim.h"/*"*/ ! ! char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; ! char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; ! char_u *all_cflags = (char_u *)"$(CC:\=\\) $(CFLAGS:\=\\) $(DEFINES) $(MBDEFINES) $(INTERP_DEFINES:"=\\") $(OPT) $(EXETYPE) $(CPUARG) $(ALIGNARG) $(DEBUG_FLAG) $(CODEGUARD_FLAG)"; ! char_u *all_lflags = (char_u *)"$(LINK:\=\\) $(LFLAGS:\=\\)"; ! char_u *compiled_user = (char_u *)"$(USERNAME)"; ! char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; ! | auto\pathdef.c perl.lib: $(PERL)\lib\CORE\perl$(PERL_VER).lib coff2omf $(PERL)\lib\CORE\perl$(PERL_VER).lib $@ *** ../vim61.303/src/Make_ming.mak Sun Jan 19 16:13:04 2003 --- src/Make_ming.mak Mon Jan 20 20:39:20 2003 *************** *** 19,25 **** # http://upx.tsx.org/ # # Maintained by Ron Aaron ! # updated 2000 Oct 16 #>>>>> choose options: # set to '1' for a debug build --- 19,25 ---- # http://upx.tsx.org/ # # Maintained by Ron Aaron ! # updated 2003 Jan 20 #>>>>> choose options: # set to '1' for a debug build *************** *** 206,212 **** endif endif ! ifdef POSTSCRIPT CFLAGS += -DMSWINPS endif --- 206,212 ---- endif endif ! ifeq ($(POSTSCRIPT),1) CFLAGS += -DMSWINPS endif *** ../vim61.303/src/version.c Tue Jan 28 21:22:04 2003 --- src/version.c Tue Jan 28 21:35:10 2003 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 304, /**/ -- hundred-and-one symptoms of being an internet addict: 65. The last time you looked at the clock it was 11:30pm, and in what seems like only a few seconds later, your sister runs past you to catch her 7am school bus. /// 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 ///