Permalink
Browse files

Rename bin/ to lib/

  • Loading branch information...
1 parent 77de162 commit f92fb4e36003e5243e6153965a0816f87d58ef0a @Shougo committed Oct 10, 2015
View
@@ -1,10 +1,10 @@
-bin/vimproc_*.so
-bin/vimproc_*.dll
-bin/vimproc_*.dll.old
-bin/vimproc_*.dll.manifest
-bin/vimproc_*.exp
-bin/vimproc_*.lib
-bin/*.pdb
+lib/vimproc_*.so
+lib/vimproc_*.dll
+lib/vimproc_*.dll.old
+lib/vimproc_*.dll.manifest
+lib/vimproc_*.exp
+lib/vimproc_*.lib
+lib/*.pdb
doc/tags
*.obj
*.o
View
@@ -25,7 +25,7 @@ Not supported platforms:
* Clone this repo
* Build vimproc's native extensions (see Building for details)
-* Copy `autoload/*`, `bin/*` and `plugin/*` files to your 'runtimepath'
+* Copy `autoload/*`, `lib/*` and `plugin/*` files to your 'runtimepath'
directory (see `:help runtimepath`).
### NeoBundle
View
@@ -24,7 +24,7 @@ build_script:
test_script:
- '%APPVEYOR_BUILD_FOLDER%\tools\appveyor.bat test'
artifacts:
- - path: bin/vimproc_*.dll
+ - path: lib/vimproc_*.dll
name: vimproc.dll
deploy:
provider: GitHub
@@ -71,7 +71,7 @@ endif
call vimproc#util#set_default(
\ 'g:vimproc#dll_path',
- \ expand('<sfile>:p:h:h') . '/bin/' . s:vimproc_dll_basename,
+ \ expand('<sfile>:p:h:h') . '/lib/' . s:vimproc_dll_basename,
\ 'g:vimproc_dll_path')
unlet s:vimproc_dll_basename
View
@@ -380,13 +380,13 @@ VARIABLES *vimproc-variables*
*g:vimproc#dll_path*
g:vimproc#dll_path (default
- Win32: "$VIMRUNTIME/bin/vimproc_win32.dll"
- Win64: "$VIMRUNTIME/bin/vimproc_win64.dll"
- Cygwin: "$VIMRUNTIME/bin/vimproc_cygwin.dll"
- Mac: "$VIMRUNTIME/bin/vimproc_mac.so"
- Linux32: "$VIMRUNTIME/bin/vimproc_linux32.so"
- Linux64: "$VIMRUNTIME/bin/vimproc_linux64.so"
- Others: "$VIMRUNTIME/bin/vimproc_unix.so")
+ Win32: "$VIMRUNTIME/lib/vimproc_win32.dll"
+ Win64: "$VIMRUNTIME/lib/vimproc_win64.dll"
+ Cygwin: "$VIMRUNTIME/lib/vimproc_cygwin.dll"
+ Mac: "$VIMRUNTIME/lib/vimproc_mac.so"
+ Linux32: "$VIMRUNTIME/lib/vimproc_linux32.so"
+ Linux64: "$VIMRUNTIME/lib/vimproc_linux64.so"
+ Others: "$VIMRUNTIME/lib/vimproc_unix.so")
This variable stores a dll name used by vimproc. You must
compile this dll file. If this dll does not exist, vimproc
will echo error.
File renamed without changes.
View
@@ -8,7 +8,7 @@
CFLAGS+=-W -Wall -Wno-unused -Wno-unused-parameter -std=c99 -O2 -fPIC -pedantic
LDFLAGS+=-shared
-TARGET=bin/vimproc_unix.so
+TARGET=lib/vimproc_unix.so
SRC=src/proc.c src/ptytty.c
INC=src/vimstack.c src/ptytty.h
View
@@ -2,7 +2,7 @@
SUFFIX!=uname -sm | tr '[:upper:]' '[:lower:]' | sed -e 's/ /_/'
-TARGET=bin/vimproc_$(SUFFIX).so
+TARGET=lib/vimproc_$(SUFFIX).so
SRC=src/proc.c
CFLAGS+=-W -O2 -Wall -Wno-unused -Wno-unused-parameter -std=gnu99 -pedantic -shared -fPIC
View
@@ -1,5 +1,5 @@
CFLAGS+=-O2 -W -Wall -Wno-unused -Wno-unused-parameter -use=gnu99 -shared
-TARGET=bin/vimproc_cygwin.dll
+TARGET=lib/vimproc_cygwin.dll
SRC=src/proc.c
LDFLAGS+=-lutil
View
@@ -10,7 +10,7 @@ CC=gcc
endif
endif
-TARGET=bin/vimproc_mac.so
+TARGET=lib/vimproc_mac.so
SRC=src/proc.c
ARCHS=
CFLAGS+=-O2 -W -Wall -Wno-unused -Wno-unused-parameter -bundle -fPIC $(foreach ARCH,$(ARCHS),-arch $(ARCH))
View
@@ -1,6 +1,6 @@
# for MinGW.
-TARGET=bin/vimproc_win32.dll
+TARGET=lib/vimproc_win32.dll
SRC=src/proc_w32.c
CC=gcc
CFLAGS+=-O2 -Wall -shared -m32
View
@@ -1,6 +1,6 @@
# for MinGW.
-TARGET=bin/vimproc_win64.dll
+TARGET=lib/vimproc_win64.dll
SRC=src/proc_w32.c
CC=x86_64-w64-mingw32-gcc
CFLAGS+=-O2 -Wall -shared -m64
View
@@ -43,7 +43,7 @@ VIMPROC=vimproc_win32
!endif
SRCDIR = src
-BINDIR = bin
+LIBDIR = lib
OUTDIR = $(SRCDIR)\obj$(CPU)
OBJS = $(OUTDIR)/proc_w32.obj
@@ -53,16 +53,16 @@ CFLAGS = $(CFLAGS) $(DEFINES) /wd4100 /wd4127 /O2
# RULES
-build: $(BINDIR)\$(VIMPROC).dll
+build: $(LIBDIR)\$(VIMPROC).dll
clean:
-IF EXIST $(OUTDIR)/nul RMDIR /s /q $(OUTDIR)
- -DEL /F /Q $(BINDIR)\vimproc_win32.*
- -DEL /F /Q $(BINDIR)\vimproc_win64.*
+ -DEL /F /Q $(LIBDIR)\vimproc_win32.*
+ -DEL /F /Q $(LIBDIR)\vimproc_win64.*
-DEL /F /Q $(SRCDIR)\*.obj
-DEL /F /Q $(SRCDIR)\*.pdb
-$(BINDIR)\$(VIMPROC).dll: $(OBJS)
+$(LIBDIR)\$(VIMPROC).dll: $(OBJS)
$(link) /NOLOGO $(ldebug) $(dlllflags) $(conlibsdll) $(LFLAGS) \
/OUT:$@ $(OBJS) shell32.lib
IF EXIST $@.manifest \
View
@@ -11,7 +11,7 @@ LDFLAGS+=-shared
endif
CPPFLAGS+=-D_XPG6 -D__EXTENSIONS__
-TARGET=bin/vimproc_unix.so
+TARGET=lib/vimproc_unix.so
SRC=src/proc.c src/ptytty.c
INC=src/vimstack.c src/ptytty.h
View
@@ -5,7 +5,7 @@ ifneq (,$(wildcard /lib*/ld-linux*.so.2))
else
SUFFIX=unix
endif
-TARGET=bin/vimproc_$(SUFFIX).so
+TARGET=lib/vimproc_$(SUFFIX).so
SRC=src/proc.c
CFLAGS+=-W -O2 -Wall -Wno-unused -Wno-unused-parameter -std=gnu99 -pedantic -shared -fPIC
@@ -47,10 +47,10 @@ if ERRORLEVEL 1 (
rem Build failed.
rem Try to delete old DLLs.
- if exist bin\%vimproc_dllname%.old del bin\%vimproc_dllname%.old
- if exist bin\%vimproc_dllname% del bin\%vimproc_dllname%
+ if exist lib\%vimproc_dllname%.old del lib\%vimproc_dllname%.old
+ if exist lib\%vimproc_dllname% del lib\%vimproc_dllname%
rem If the DLL couldn't delete (may be it is in use), rename it.
- if exist bin\%vimproc_dllname% ren bin\%vimproc_dllname% %vimproc_dllname%.old
+ if exist lib\%vimproc_dllname% ren lib\%vimproc_dllname% %vimproc_dllname%.old
mingw32-make -f make_mingw%vimproc_arch%.mak %1 %2 %3 %4 %5 %6 %7 %8 %9
)

0 comments on commit f92fb4e

Please sign in to comment.