[packages/vim.git] / 6.3.084

To: vim-dev@vim.org
Subject: Patch 6.3.084 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.3.084 (extra)
Problem:    Cygwin: compiling with DEBUG doesn't work.  Perl path was ignored.
	    Failure when $(OUTDIR) already exists.  "po" makefile is missing.
Solution:   Use changes tested in Vim 7. (Tony Mechelynck)
Files:	    src/Make_cyg.mak, src/po/Make_cyg.mak


*** ../vim-6.3.083/src/Make_cyg.mak	Wed Jun  9 14:56:27 2004
--- src/Make_cyg.mak	Thu Jul 21 13:48:38 2005
***************
*** 1,6 ****
  #
  # Makefile for VIM on Win32, using Cygnus gcc
! # Last updated by Dan Sharp.  Last Change: 2004 Apr 23
  #
  # This compiles Vim as a Windows application.  If you want Vim to run as a
  # Cygwin application use the Makefile (just like on Unix).
--- 1,7 ----
  #
  # Makefile for VIM on Win32, using Cygnus gcc
! # Updated by Dan Sharp and Bram Moolenaar.
! # Last Change: 2005 Jul 21
  #
  # This compiles Vim as a Windows application.  If you want Vim to run as a
  # Cygwin application use the Makefile (just like on Unix).
***************
*** 298,304 ****
  EXTRA_OBJS += $(OUTDIR)/netbeans.o $(OUTDIR)/gui_beval.o
  EXTRA_LIBS += -lwsock32
  
! ifeq (yes, $(DEBUG))
  DEFINES += -DNBDEBUG
  NBDEBUG_DEP = nbdebug.h nbdebug.c
  endif
--- 299,305 ----
  EXTRA_OBJS += $(OUTDIR)/netbeans.o $(OUTDIR)/gui_beval.o
  EXTRA_LIBS += -lwsock32
  
! ifeq (yes, $(NBDEBUG))
  DEFINES += -DNBDEBUG
  NBDEBUG_DEP = nbdebug.h nbdebug.c
  endif
***************
*** 336,344 ****
--- 337,347 ----
  ##############################
  ifneq (sh.exe, $(SHELL))
  DEL = rm
+ MKDIR = mkdir -p
  DIRSLASH = /
  else
  DEL = del
+ MKDIR = mkdir
  DIRSLASH = \\
  endif
  
***************
*** 421,427 ****
  	$(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIBS)
  
  $(OUTDIR):
! 	mkdir $(OUTDIR)
  
  tags:
  	command /c ctags *.c $(INCL)
--- 424,430 ----
  	$(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIBS)
  
  $(OUTDIR):
! 	$(MKDIR) $(OUTDIR)
  
  tags:
  	command /c ctags *.c $(INCL)
***************
*** 429,435 ****
  clean:
  	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
  	-rmdir $(OUTDIR)
! 	-$(DEL) *.exe
  ifdef PERL
  	-$(DEL) if_perl.c
  endif
--- 432,438 ----
  clean:
  	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
  	-rmdir $(OUTDIR)
! 	-$(DEL) $(EXE) vimrun.exe install.exe uninstal.exe
  ifdef PERL
  	-$(DEL) if_perl.c
  endif
***************
*** 455,462 ****
  	$(CC) -c $(CFLAGS) -D__IID_DEFINED__ if_ole.cpp -o $(OUTDIR)/if_ole.o
  
  if_perl.c: if_perl.xs typemap
! 	perl $(PERL)/lib/ExtUtils/xsubpp -prototypes -typemap \
! 	     $(PERL)/lib/ExtUtils/typemap if_perl.xs > $@
  
  $(OUTDIR)/if_perl.o:	if_perl.c $(INCL)
  ifeq (yes, $(USEDLL))
--- 458,466 ----
  	$(CC) -c $(CFLAGS) -D__IID_DEFINED__ if_ole.cpp -o $(OUTDIR)/if_ole.o
  
  if_perl.c: if_perl.xs typemap
! 	$(PERL)/bin/perl `cygpath -d $(PERL)/lib/ExtUtils/xsubpp` \
! 		-prototypes -typemap \
! 		`cygpath -d $(PERL)/lib/ExtUtils/typemap` if_perl.xs > $@
  
  $(OUTDIR)/if_perl.o:	if_perl.c $(INCL)
  ifeq (yes, $(USEDLL))
*** ../vim-6.3.083/src/po/Make_cyg.mak	Thu Jul 21 13:47:58 2005
--- src/po/Make_cyg.mak	Thu Jul 21 13:46:39 2005
***************
*** 0 ****
--- 1,128 ----
+ # Makefile for the Vim message translations for Cygwin
+ # by Tony Mechelynck <antoine.mechelynck@skynet.be>
+ # after Make_ming.mak by
+ # Eduardo F. Amatria <eferna1@platea.pntic.mec.es>
+ #
+ # Read the README_ming.txt file before using it.
+ #
+ # Use at your own risk but with care, it could even kill your canary.
+ #
+ 
+ ifndef VIMRUNTIME
+ VIMRUNTIME = ../../runtime
+ endif
+ 
+ LANGUAGES =	af \
+ 		ca \
+ 		cs \
+ 		cs.cp1250 \
+ 		de \
+ 		en_GB \
+ 		es \
+ 		fr \
+ 		it \
+ 		ja \
+ 		ja.sjis \
+ 		ko \
+ 		no \
+ 		pl \
+ 		pl.cp1250 \
+ 		ru \
+ 		ru.cp1251 \
+ 		sk \
+ 		sk.cp1250 \
+ 		sv \
+ 		uk \
+ 		zh_CN \
+ 		zh_CN.UTF-8 \
+ 		zh_CN.cp936 \
+ 		zh_TW \
+ 		zh_TW.UTF-8 \
+ 
+ MOFILES =	af.mo \
+ 		ca.mo \
+ 		cs.cp1250.mo \
+ 		cs.mo \
+ 		de.mo \
+ 		en_GB.mo \
+ 		es.mo \
+ 		fr.mo \
+ 		it.mo \
+ 		ja.mo \
+ 		ja.sjis.mo \
+ 		ko.mo \
+ 		no.mo \
+ 		pl.cp1250.mo \
+ 		pl.mo \
+ 		ru.cp1251.mo \
+ 		ru.mo \
+ 		sk.cp1250.mo \
+ 		sk.mo \
+ 		sv.mo \
+ 		uk.mo \
+ 		zh_CN.UTF-8.mo \
+ 		zh_CN.cp936.mo \
+ 		zh_CN.mo \
+ 		zh_TW.UTF-8.mo \
+ 		zh_TW.mo \
+ 
+ PACKAGE = vim
+ 
+ # Uncomment one of the lines below or modify it to put the path to your
+ # gettext binaries
+ ifndef GETTEXT_PATH
+ #GETTEXT_PATH = C:/gettext.win32/bin/
+ #GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
+ GETTEXT_PATH = /bin/
+ endif
+ 
+ # The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext
+ # tools 0.10.37, which use a slightly different .po file format that is not
+ # compatible with Solaris (and old gettext implementations) unless these are
+ # set.  gettext 0.10.36 will not work!
+ MSGFMT = OLD_PO_FILE_INPUT=yes $(GETTEXT_PATH)msgfmt -v
+ XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)xgettext
+ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)msgmerge
+ 
+ # MV = move
+ # CP = copy
+ # RM = del
+ # MKD = mkdir
+ MV = mv -f
+ CP = cp -f
+ RM = rm -f
+ MKD = mkdir -p
+ 
+ .SUFFIXES:
+ .SUFFIXES: .po .mo .pot
+ .PHONY: first_time all install clean $(LANGUAGES)
+ 
+ .po.mo:
+ 	$(MSGFMT) -o $@ $<
+ 
+ all: $(MOFILES)
+ 
+ first_time:
+ 	$(XGETTEXT) --default-domain=$(LANGUAGE) \
+ 		--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
+ 
+ $(LANGUAGES):
+ 	$(XGETTEXT) --default-domain=$(PACKAGE) \
+ 		--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
+ 	$(MV) $(PACKAGE).po $(PACKAGE).pot
+ 	$(CP) $@.po $@.po.orig
+ 	$(MV) $@.po $@.po.old
+ 	$(MSGMERGE) $@.po.old $(PACKAGE).pot -o $@.po
+ 	$(RM) $@.po.old
+ 
+ install: $(MOFILES)
+ 	for TARGET in $(LANGUAGES); do \
+ 		$(MKD) $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES ; \
+ 		$(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \
+ 	done
+ 
+ clean:
+ 	$(RM) *.mo
+ 	$(RM) *.pot
+ 
+ 
*** ../vim-6.3.083/src/version.c	Thu Jul 21 13:02:06 2005
--- src/version.c	Thu Jul 21 13:47:15 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     84,
  /**/

-- 
Michael: There is no such thing as a dump question.
Bernard: Sure there is.  For example "what is a core dump?"

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///
Commit	Line	Data
63868179 AG	1	To: vim-dev@vim.org
	2	Subject: Patch 6.3.084 (extra)
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 6.3.084 (extra)
	11	Problem: Cygwin: compiling with DEBUG doesn't work. Perl path was ignored.
	12	Failure when $(OUTDIR) already exists. "po" makefile is missing.
	13	Solution: Use changes tested in Vim 7. (Tony Mechelynck)
	14	Files: src/Make_cyg.mak, src/po/Make_cyg.mak
	15
	16
	17	*** ../vim-6.3.083/src/Make_cyg.mak Wed Jun 9 14:56:27 2004
	18	--- src/Make_cyg.mak Thu Jul 21 13:48:38 2005
	19	***************
	20	* 1,6 **
	21	#
	22	# Makefile for VIM on Win32, using Cygnus gcc
	23	! # Last updated by Dan Sharp. Last Change: 2004 Apr 23
	24	#
	25	# This compiles Vim as a Windows application. If you want Vim to run as a
	26	# Cygwin application use the Makefile (just like on Unix).
	27	--- 1,7 ----
	28	#
	29	# Makefile for VIM on Win32, using Cygnus gcc
	30	! # Updated by Dan Sharp and Bram Moolenaar.
	31	! # Last Change: 2005 Jul 21
	32	#
	33	# This compiles Vim as a Windows application. If you want Vim to run as a
	34	# Cygwin application use the Makefile (just like on Unix).
	35	***************
	36	* 298,304 **
	37	EXTRA_OBJS += $(OUTDIR)/netbeans.o $(OUTDIR)/gui_beval.o
	38	EXTRA_LIBS += -lwsock32
	39
	40	! ifeq (yes, $(DEBUG))
	41	DEFINES += -DNBDEBUG
	42	NBDEBUG_DEP = nbdebug.h nbdebug.c
	43	endif
	44	--- 299,305 ----
	45	EXTRA_OBJS += $(OUTDIR)/netbeans.o $(OUTDIR)/gui_beval.o
	46	EXTRA_LIBS += -lwsock32
	47
	48	! ifeq (yes, $(NBDEBUG))
	49	DEFINES += -DNBDEBUG
	50	NBDEBUG_DEP = nbdebug.h nbdebug.c
	51	endif
	52	***************
	53	* 336,344 **
	54	--- 337,347 ----
	55	##############################
	56	ifneq (sh.exe, $(SHELL))
	57	DEL = rm
	58	+ MKDIR = mkdir -p
	59	DIRSLASH = /
	60	else
	61	DEL = del
	62	+ MKDIR = mkdir
	63	DIRSLASH = \\
	64	endif
65
66	***************
67	* 421,427 **
68	$(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIBS)
69
70	$(OUTDIR):
71	! mkdir $(OUTDIR)
72
73	tags:
74	command /c ctags *.c $(INCL)
75	--- 424,430 ----
76	$(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIBS)
77
78	$(OUTDIR):
79	! $(MKDIR) $(OUTDIR)
80
81	tags:
82	command /c ctags *.c $(INCL)
83	***************
84	* 429,435 **
85	clean:
86	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
87	-rmdir $(OUTDIR)
88	! -$(DEL) *.exe
89	ifdef PERL
90	-$(DEL) if_perl.c
91	endif
92	--- 432,438 ----
93	clean:
94	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
95	-rmdir $(OUTDIR)
96	! -$(DEL) $(EXE) vimrun.exe install.exe uninstal.exe
97	ifdef PERL
98	-$(DEL) if_perl.c
99	endif
100	***************
101	* 455,462 **
102	$(CC) -c $(CFLAGS) -D__IID_DEFINED__ if_ole.cpp -o $(OUTDIR)/if_ole.o
103
104	if_perl.c: if_perl.xs typemap
105	! perl $(PERL)/lib/ExtUtils/xsubpp -prototypes -typemap \
106	! $(PERL)/lib/ExtUtils/typemap if_perl.xs > $@
107
108	$(OUTDIR)/if_perl.o: if_perl.c $(INCL)
109	ifeq (yes, $(USEDLL))
110	--- 458,466 ----
111	$(CC) -c $(CFLAGS) -D__IID_DEFINED__ if_ole.cpp -o $(OUTDIR)/if_ole.o
112
113	if_perl.c: if_perl.xs typemap
114	! $(PERL)/bin/perl `cygpath -d $(PERL)/lib/ExtUtils/xsubpp` \
115	! -prototypes -typemap \
116	! `cygpath -d $(PERL)/lib/ExtUtils/typemap` if_perl.xs > $@
117
118	$(OUTDIR)/if_perl.o: if_perl.c $(INCL)
119	ifeq (yes, $(USEDLL))
120	*** ../vim-6.3.083/src/po/Make_cyg.mak Thu Jul 21 13:47:58 2005
121	--- src/po/Make_cyg.mak Thu Jul 21 13:46:39 2005
122	***************
123	* 0 **
124	--- 1,128 ----
125	+ # Makefile for the Vim message translations for Cygwin
126	+ # by Tony Mechelynck <antoine.mechelynck@skynet.be>
127	+ # after Make_ming.mak by
128	+ # Eduardo F. Amatria <eferna1@platea.pntic.mec.es>
129	+ #
130	+ # Read the README_ming.txt file before using it.
131	+ #
132	+ # Use at your own risk but with care, it could even kill your canary.
133	+ #
134	+
135	+ ifndef VIMRUNTIME
136	+ VIMRUNTIME = ../../runtime
137	+ endif
138	+
139	+ LANGUAGES = af \
140	+ ca \
141	+ cs \
142	+ cs.cp1250 \
143	+ de \
144	+ en_GB \
145	+ es \
146	+ fr \
147	+ it \
148	+ ja \
149	+ ja.sjis \
150	+ ko \
151	+ no \
152	+ pl \
153	+ pl.cp1250 \
154	+ ru \
155	+ ru.cp1251 \
156	+ sk \
157	+ sk.cp1250 \
158	+ sv \
159	+ uk \
160	+ zh_CN \
161	+ zh_CN.UTF-8 \
162	+ zh_CN.cp936 \
163	+ zh_TW \
164	+ zh_TW.UTF-8 \
165	+
166	+ MOFILES = af.mo \
167	+ ca.mo \
168	+ cs.cp1250.mo \
169	+ cs.mo \
170	+ de.mo \
171	+ en_GB.mo \
172	+ es.mo \
173	+ fr.mo \
174	+ it.mo \
175	+ ja.mo \
176	+ ja.sjis.mo \
177	+ ko.mo \
178	+ no.mo \
179	+ pl.cp1250.mo \
180	+ pl.mo \
181	+ ru.cp1251.mo \
182	+ ru.mo \
183	+ sk.cp1250.mo \
184	+ sk.mo \
185	+ sv.mo \
186	+ uk.mo \
187	+ zh_CN.UTF-8.mo \
188	+ zh_CN.cp936.mo \
189	+ zh_CN.mo \
190	+ zh_TW.UTF-8.mo \
191	+ zh_TW.mo \
192	+
193	+ PACKAGE = vim
194	+
195	+ # Uncomment one of the lines below or modify it to put the path to your
196	+ # gettext binaries
197	+ ifndef GETTEXT_PATH
198	+ #GETTEXT_PATH = C:/gettext.win32/bin/
199	+ #GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
200	+ GETTEXT_PATH = /bin/
201	+ endif
202	+
203	+ # The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext
204	+ # tools 0.10.37, which use a slightly different .po file format that is not
205	+ # compatible with Solaris (and old gettext implementations) unless these are
206	+ # set. gettext 0.10.36 will not work!
207	+ MSGFMT = OLD_PO_FILE_INPUT=yes $(GETTEXT_PATH)msgfmt -v
208	+ XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)xgettext
209	+ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)msgmerge
210	+
211	+ # MV = move
212	+ # CP = copy
213	+ # RM = del
214	+ # MKD = mkdir
215	+ MV = mv -f
216	+ CP = cp -f
217	+ RM = rm -f
218	+ MKD = mkdir -p
219	+
220	+ .SUFFIXES:
221	+ .SUFFIXES: .po .mo .pot
222	+ .PHONY: first_time all install clean $(LANGUAGES)
223	+
224	+ .po.mo:
225	+ $(MSGFMT) -o $@ $<
226	+
227	+ all: $(MOFILES)
228	+
229	+ first_time:
230	+ $(XGETTEXT) --default-domain=$(LANGUAGE) \
231	+ --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
232	+
233	+ $(LANGUAGES):
234	+ $(XGETTEXT) --default-domain=$(PACKAGE) \
235	+ --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
236	+ $(MV) $(PACKAGE).po $(PACKAGE).pot
237	+ $(CP) $@.po $@.po.orig
238	+ $(MV) $@.po $@.po.old
239	+ $(MSGMERGE) $@.po.old $(PACKAGE).pot -o $@.po
240	+ $(RM) $@.po.old
241	+
242	+ install: $(MOFILES)
243	+ for TARGET in $(LANGUAGES); do \
244	+ $(MKD) $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES ; \
245	+ $(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \
246	+ done
247	+
248	+ clean:
249	+ $(RM) *.mo
250	+ $(RM) *.pot
251	+
252	+
253	*** ../vim-6.3.083/src/version.c Thu Jul 21 13:02:06 2005
254	--- src/version.c Thu Jul 21 13:47:15 2005
255	***************
256	* 643,644 **
257	--- 643,646 ----
258	{ /* Add new patch number below this line */
259	+ /**/
260	+ 84,
261	/**/
262
263	--
264	Michael: There is no such thing as a dump question.
265	Bernard: Sure there is. For example "what is a core dump?"
266
267	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
268	/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
269	\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
270	\\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html ///