Menu
▾
▴
[MinGW-cvs] msys/packages/vim/5.8/src Makefile,1.1.1.1,1.2 buffer.c,1.1.1.1,1.2 ex_docmd.c,1.1.1.1,1.2 os_unix.c,1.2,1.3 pty.c,1.2,1.3 vim.h,1.1.1.1,1.2
|
From: <ea...@us...> - 2002-12-06 22:42:23
|
Update of /cvsroot/mingw/msys/packages/vim/5.8/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21174/src
Modified Files:
Makefile buffer.c ex_docmd.c os_unix.c pty.c vim.h
Log Message:
* ChangeLog.MSYS: New file.
* src/Makefile: Changes for the MSYS host.
* src/buffer.c: CPP Filters for __MSYS__.
* src/ex_docmd.c: Ditto.
* src/os_unix.c: Ditto.
* src/pty.c: Ditto.
* src/vim.h: Ditto.
* src/xxd/xxd.c: Ditto.
Index: Makefile
===================================================================
RCS file: /cvsroot/mingw/msys/packages/vim/5.8/src/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile 6 Dec 2002 19:07:42 -0000 1.1.1.1
--- Makefile 6 Dec 2002 22:42:20 -0000 1.2
***************
*** 289,293 ****
# the current choice doesn't work, try the other one.
! include config.mk
#.include "config.mk"
--- 289,293 ----
# the current choice doesn't work, try the other one.
! include ../config.mk
#.include "config.mk"
***************
*** 680,684 ****
### For GCC on MSDOS, the ".exe" suffix will be added.
! #SUFFIX = .exe
### (O) For LynxOS 2.5.0, tested on PC.
--- 680,684 ----
### For GCC on MSDOS, the ".exe" suffix will be added.
! SUFFIX = .exe
### (O) For LynxOS 2.5.0, tested on PC.
***************
*** 700,719 ****
VIMNAME = vim
VIMTARGET = $(VIMNAME)$(SUFFIX)
EXNAME = ex
! EXTARGET = $(EXNAME)$(SUFFIX)
VIEWNAME = view
! VIEWTARGET = $(VIEWNAME)$(SUFFIX)
GVIMNAME = g$(VIMNAME)
! GVIMTARGET = $(GVIMNAME)$(SUFFIX)
GVIEWNAME = g$(VIEWNAME)
! GVIEWTARGET = $(GVIEWNAME)$(SUFFIX)
RVIMNAME = r$(VIMNAME)
! RVIMTARGET = $(RVIMNAME)$(SUFFIX)
RVIEWNAME = r$(VIEWNAME)
! RVIEWTARGET = $(RVIEWNAME)$(SUFFIX)
RGVIMNAME = r$(GVIMNAME)
! RGVIMTARGET = $(RGVIMNAME)$(SUFFIX)
RGVIEWNAME = r$(GVIEWNAME)
! RGVIEWTARGET = $(RGVIEWNAME)$(SUFFIX)
### Names of the tools that are also made
--- 700,723 ----
VIMNAME = vim
VIMTARGET = $(VIMNAME)$(SUFFIX)
+ VINAME = vi
+ VITARGET = $(VINAME)
+ RVINAME = r$(VINAME)
+ RVITARGET = $(RVINAME)
EXNAME = ex
! EXTARGET = $(EXNAME)
VIEWNAME = view
! VIEWTARGET = $(VIEWNAME)
GVIMNAME = g$(VIMNAME)
! GVIMTARGET = $(GVIMNAME)
GVIEWNAME = g$(VIEWNAME)
! GVIEWTARGET = $(GVIEWNAME)
RVIMNAME = r$(VIMNAME)
! RVIMTARGET = $(RVIMNAME)
RVIEWNAME = r$(VIEWNAME)
! RVIEWTARGET = $(RVIEWNAME)
RGVIMNAME = r$(GVIMNAME)
! RGVIMTARGET = $(RGVIMNAME)
RGVIEWNAME = r$(GVIEWNAME)
! RGVIEWTARGET = $(RGVIEWNAME)
### Names of the tools that are also made
***************
*** 771,777 ****
### You can override these if you want to install them somewhere else.
### Edit feature.h for compile-time settings.
! VIMLOC = $(DATADIR)$(VIMDIR)
! VIMRTLOC = $(DATADIR)$(VIMDIR)$(VIMRTDIR)
! VIMRCLOC = $(VIMLOC)
HELPSUBLOC = $(VIMRTLOC)$(HELPSUBDIR)
SYNSUBLOC = $(VIMRTLOC)$(SYNSUBDIR)
--- 775,781 ----
### You can override these if you want to install them somewhere else.
### Edit feature.h for compile-time settings.
! VIMLOC = $(DATADIR)$(VIMDIR)$(VIMRTDIR)
! VIMRTLOC = $(VIMLOC)
! VIMRCLOC = $(DATADIR)$(VIMDIR)
HELPSUBLOC = $(VIMRTLOC)$(HELPSUBDIR)
SYNSUBLOC = $(VIMRTLOC)$(SYNSUBDIR)
***************
*** 1375,1380 ****
$(HELPSOURCE)/vimtutor.1 > $(MANSUBDIR)/$(VIMNAME)tutor.1
chmod $(MANMOD) $(MANSUBDIR)/$(VIMNAME)tutor.1
! cd $(HELPSOURCE); $(INSTALL_DATA) *.txt tags $(HELPSUBLOC)
! cd $(HELPSUBLOC); chmod $(HELPMOD) *.txt tags
$(INSTALL_DATA) $(HELPSOURCE)/*.pl $(HELPSUBLOC)
chmod $(SCRIPTMOD) $(HELPSUBLOC)/*.pl
--- 1379,1384 ----
$(HELPSOURCE)/vimtutor.1 > $(MANSUBDIR)/$(VIMNAME)tutor.1
chmod $(MANMOD) $(MANSUBDIR)/$(VIMNAME)tutor.1
! cd $(HELPSOURCE); $(INSTALL_DATA) *.txt $(HELPSUBLOC)
! cd $(HELPSUBLOC); chmod $(HELPMOD) *.txt
$(INSTALL_DATA) $(HELPSOURCE)/*.pl $(HELPSUBLOC)
chmod $(SCRIPTMOD) $(HELPSUBLOC)/*.pl
***************
*** 1444,1448 ****
# create links from various names to vim. This is only done when the links
# (or executables with the same name) don't exist yet.
! installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
$(BINDIR)/$(EXTARGET):
--- 1448,1458 ----
# create links from various names to vim. This is only done when the links
# (or executables with the same name) don't exist yet.
! installlinks: $(GUI_TARGETS) $(BINDIR)/$(VITARGET) $(BINDIR)/$(RVITARGET) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
!
! $(BINDIR)/$(VITARGET):
! cd $(BINDIR); ln -s $(VIMTARGET) $(VITARGET)
!
! $(BINDIR)/$(RVITARGET):
! cd $(BINDIR); ln -s $(VIMTARGET) $(RVITARGET)
$(BINDIR)/$(EXTARGET):
***************
*** 1472,1476 ****
# create links for the manual pages with various names to vim. This is only
# done when the links (or manpages with the same name) don't exist yet.
! installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
$(MANSUBDIR)/$(EXNAME).1:
--- 1482,1492 ----
# create links for the manual pages with various names to vim. This is only
# done when the links (or manpages with the same name) don't exist yet.
! installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(VINAME).1 $(MANSUBDIR)/$(RVINAME).1 $(MANSUBDIR)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
!
! $(MANSUBDIR)/$(VINAME).1:
! cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VINAME).1
!
! $(MANSUBDIR)/$(RVINAME).1:
! cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVINAME).1
$(MANSUBDIR)/$(EXNAME).1:
***************
*** 1503,1510 ****
--- 1519,1528 ----
-rm -f $(BINDIR)/vimtutor
-rm -f $(BINDIR)/xxd$(SUFFIX) $(MANSUBDIR)/xxd.1
+ -rm -f $(BINDIR)/$(VITARGET) $(BINDIR)/$(RVITARGET)
-rm -f $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET)
-rm -f $(BINDIR)/$(GVIMTARGET) $(BINDIR)/$(GVIEWTARGET)
-rm -f $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
-rm -f $(BINDIR)/$(RGVIMTARGET) $(BINDIR)/$(RGVIEWTARGET)
+ -rm -f $(MANSUBDIR)/$(VINAME).1 $(MANSUBDIR)/$(RVINAME).1
-rm -f $(MANSUBDIR)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1
-rm -f $(MANSUBDIR)/$(GVIMNAME).1 $(MANSUBDIR)/$(GVIEWNAME).1
Index: buffer.c
===================================================================
RCS file: /cvsroot/mingw/msys/packages/vim/5.8/src/buffer.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buffer.c 6 Dec 2002 19:07:32 -0000 1.1.1.1
--- buffer.c 6 Dec 2002 22:42:20 -0000 1.2
***************
*** 801,805 ****
--- 801,809 ----
#ifdef UNIX
if (sfname == NULL || mch_stat((char *)sfname, &st) < 0)
+ #if defined (__MSYS__)
+ st.st_dev = -1;
+ #else /* ! __MSYS__ */
st.st_dev = (unsigned)-1;
+ #endif /* ! __MSYS__ */
#endif
***************
*** 1108,1112 ****
--- 1112,1120 ----
if (mch_stat((char *)ffname, &st) < 0)
+ #if defined (__MSYS__)
+ st.st_dev = -1;
+ #else /* ! __MSYS__ */
st.st_dev = (unsigned)-1;
+ #endif /* ! __MSYS__ */
return buflist_findname_stat(ffname, &st);
}
***************
*** 1571,1575 ****
--- 1579,1587 ----
curbuf->b_sfname = NULL;
#ifdef UNIX
+ #if defined (__MSYS__)
+ st.st_dev = -1;
+ #else /* ! __MSYS__ */
st.st_dev = (unsigned)-1;
+ #endif /* ! __MSYS__ */
#endif
}
***************
*** 1593,1597 ****
--- 1605,1613 ----
#ifdef UNIX
if (mch_stat((char *)ffname, &st) < 0)
+ #if defined (__MSYS__)
+ st.st_dev = -1;
+ #else /* ! __MSYS__ */
st.st_dev = (unsigned)-1;
+ #endif /* ! __MSYS__ */
buf = buflist_findname_stat(ffname, &st);
#else
***************
*** 1755,1759 ****
--- 1771,1779 ----
{
if (buf->b_dev < 0 || mch_stat((char *)ffname, &st) < 0)
+ #if defined (__MSYS__)
+ st.st_dev = -1;
+ #else /* ! __MSYS__ */
st.st_dev = (unsigned)-1;
+ #endif /* ! __MSYS__ */
stp = &st;
}
Index: ex_docmd.c
===================================================================
RCS file: /cvsroot/mingw/msys/packages/vim/5.8/src/ex_docmd.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ex_docmd.c 6 Dec 2002 19:07:35 -0000 1.1.1.1
--- ex_docmd.c 6 Dec 2002 22:42:20 -0000 1.2
***************
*** 4421,4425 ****
--- 4421,4429 ----
slash_n_colon_adjust(fname_exp);
#endif
+ #if defined (__CYGWIN__) || defined (__MSYS__)
+ cookie.fp = mch_fopen((char *)fname_exp, "rt");
+ #else
cookie.fp = mch_fopen((char *)fname_exp, READBIN);
+ #endif
if (cookie.fp == NULL && check_other)
{
***************
*** 4438,4442 ****
--- 4442,4450 ----
else
*p = '_';
+ #if defined (__CYGWIN__) || defined (__MSYS__)
+ cookie.fp = mch_fopen((char *)fname_exp, "rt");
+ #else
cookie.fp = mch_fopen((char *)fname_exp, READBIN);
+ #endif
}
}
Index: os_unix.c
===================================================================
RCS file: /cvsroot/mingw/msys/packages/vim/5.8/src/os_unix.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** os_unix.c 6 Dec 2002 22:17:04 -0000 1.2
--- os_unix.c 6 Dec 2002 22:42:20 -0000 1.3
***************
*** 2959,2963 ****
FD_ZERO(&efds);
FD_SET(fd, &rfds);
! # if !defined(__QNX__) && !defined(__CYGWIN32__)
/* For QNX select() always returns 1 if this is set. Why? */
FD_SET(fd, &efds);
--- 2959,2963 ----
FD_ZERO(&efds);
FD_SET(fd, &rfds);
! # if !defined(__QNX__) && !defined(__CYGWIN__) && !defined (__MSYS__)
/* For QNX select() always returns 1 if this is set. Why? */
FD_SET(fd, &efds);
Index: pty.c
===================================================================
RCS file: /cvsroot/mingw/msys/packages/vim/5.8/src/pty.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pty.c 6 Dec 2002 22:17:04 -0000 1.2
--- pty.c 6 Dec 2002 22:42:20 -0000 1.3
***************
*** 50,54 ****
#include <signal.h>
! #ifdef __CYGWIN32__
# include <sys/termios.h>
#endif
--- 50,54 ----
#include <signal.h>
! #if defined (__CYGWIN32__) || defined (__MSYS__)
# include <sys/termios.h>
#endif
Index: vim.h
===================================================================
RCS file: /cvsroot/mingw/msys/packages/vim/5.8/src/vim.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** vim.h 6 Dec 2002 19:07:46 -0000 1.1.1.1
--- vim.h 6 Dec 2002 22:42:20 -0000 1.2
***************
*** 728,732 ****
#define MSG_BUF_LEN 80 /* length of buffer for small messages */
! #if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN32__) || defined(_AIX)
# define TBUFSZ 2048 /* buffer size for termcap entry */
#else
--- 728,732 ----
#define MSG_BUF_LEN 80 /* length of buffer for small messages */
! #if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN__) || defined (__MSYS__) || defined(_AIX)
# define TBUFSZ 2048 /* buffer size for termcap entry */
#else
***************
*** 754,758 ****
* Use O_BINARY for all open() calls.
*/
! #if defined(__EMX__) || defined(__CYGWIN32__)
# define O_EXTRA O_BINARY
#else
--- 754,758 ----
* Use O_BINARY for all open() calls.
*/
! #if defined(__EMX__) || defined(__CYGWIN__) || defined(__MSYS__)
# define O_EXTRA O_BINARY
#else
|