bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] vim: add xxd tool

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@32031 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
luka 2012-06-03 10:16:16 +00:00
parent e90d68a9a1
commit d01aae3627
4 changed files with 79 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
utils/vim/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2006-2012 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -50,6 +50,13 @@ define Package/vim-help
TITLE+= (help files) TITLE+= (help files)
endef endef
define Package/xxd
SECTION:=utils
CATEGORY:=Utilities
TITLE:=make a hexdump or do the reverse
URL:=http://www.vim.org/
endef
define Package/vim-full/conffiles define Package/vim-full/conffiles
/usr/share/vim/vimrc /usr/share/vim/vimrc
endef endef
@ -59,25 +66,29 @@ define Package/vim/conffiles
endef endef
define Package/vim/description define Package/vim/description
Vim is an almost compatible version of the UNIX editor Vi. Vim is an almost compatible version of the UNIX editor Vi.
(Tiny build) (Tiny build)
endef endef
define Package/vim-full/description define Package/vim-full/description
Vim is an almost compatible version of the UNIX editor Vi. Vim is an almost compatible version of the UNIX editor Vi.
(Normal build) (Normal build)
endef endef
define Package/vim-runtime/description define Package/vim-runtime/description
Vim is an almost compatible version of the UNIX editor Vi. Vim is an almost compatible version of the UNIX editor Vi.
(Runtime files) (Runtime files)
endef endef
define Package/vim-help/description define Package/vim-help/description
Vim is an almost compatible version of the UNIX editor Vi. Vim is an almost compatible version of the UNIX editor Vi.
(Help files) (Help files)
endef
define Package/xxd/description
xxd creates a hex dump of a given file or standard input, it can also convert
a hex dump back to its original binary form.
endef endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-gui \ --disable-gui \
@ -90,25 +101,24 @@ CONFIGURE_ARGS += \
--with-tlib=ncurses --with-tlib=ncurses
CONFIGURE_VARS += \ CONFIGURE_VARS += \
vim_cv_getcwd_broken=no \ vim_cv_getcwd_broken=no \
vim_cv_memmove_handles_overlap=yes \ vim_cv_memmove_handles_overlap=yes \
vim_cv_stat_ignores_slash=yes \ vim_cv_stat_ignores_slash=yes \
vim_cv_tgetent=zero \ vim_cv_tgetent=zero \
vim_cv_terminfo=yes \ vim_cv_terminfo=yes \
vim_cv_toupper_broken=no \ vim_cv_toupper_broken=no \
vim_cv_tty_group=root \ vim_cv_tty_group=root \
vim_cv_tty_mode=0620 vim_cv_tty_mode=0620
ifneq ($(CONFIG_PACKAGE_vim),) ifneq ($(CONFIG_PACKAGE_vim),)
define Build/Compile/vim define Build/Compile/vim
$(call Build/Configure/Default, \ $(call Build/Configure/Default, \
--with-features=tiny \ --with-features=tiny \
--disable-multibyte \ --disable-multibyte \
) )
$(MAKE) -C $(PKG_BUILD_DIR) clean $(MAKE) -C $(PKG_BUILD_DIR) clean
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" all
all
$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_tiny $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_tiny
endef endef
endif endif
@ -116,13 +126,12 @@ endif
ifneq ($(CONFIG_PACKAGE_vim-full),) ifneq ($(CONFIG_PACKAGE_vim-full),)
define Build/Compile/vim-full define Build/Compile/vim-full
$(call Build/Configure/Default, \ $(call Build/Configure/Default, \
--with-features=normal \ --with-features=normal \
--enable-multibyte \ --enable-multibyte \
) )
$(MAKE) -C $(PKG_BUILD_DIR) clean $(MAKE) -C $(PKG_BUILD_DIR) clean
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" all
all
$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_normal $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_normal
endef endef
endif endif
@ -134,9 +143,6 @@ define Build/Compile/vim-runtime
rm -rf $(PKG_INSTALL_DIR)/usr/man rm -rf $(PKG_INSTALL_DIR)/usr/man
endef endef
define Build/Configure
endef
define Build/Compile define Build/Compile
$(call Build/Compile/vim) $(call Build/Compile/vim)
$(call Build/Compile/vim-full) $(call Build/Compile/vim-full)
@ -167,8 +173,13 @@ define Package/vim-help/install
tar -C $(1) -xf $(PKG_BUILD_DIR)/docs.tar tar -C $(1) -xf $(PKG_BUILD_DIR)/docs.tar
endef endef
define Package/xxd/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/xxd/xxd $(1)/usr/bin
endef
$(eval $(call BuildPackage,vim)) $(eval $(call BuildPackage,vim))
$(eval $(call BuildPackage,vim-full)) $(eval $(call BuildPackage,vim-full))
$(eval $(call BuildPackage,vim-runtime)) $(eval $(call BuildPackage,vim-runtime))
$(eval $(call BuildPackage,vim-help)) $(eval $(call BuildPackage,vim-help))
$(eval $(call BuildPackage,xxd))

23
utils/vim/files/vimrc
View File

@ -1,13 +1,12 @@
set showcmd " Show (partial) command in status line. set showcmd " show (partial) command in status line
set showmatch " Show matching brackets. set showmatch " show matching brackets
set ignorecase " Do case insensitive matching set ignorecase " do case insensitive matching
set incsearch " Incremental search set incsearch " incremental search
set autowrite " Automatically save before commands like :next and :make set autowrite " automatically save before commands like :next and :make
set nocompatible " Use Vim defaults instead of 100% vi compatibility set nocompatible " use vim defaults instead of 100% vi compatibility
set backspace=indent,eol,start " more powerful backspacing set backspace=indent,eol,start " more powerful backspacing
set autoindent " always set autoindenting on set autoindent " always set autoindenting on
set linebreak " Don't wrap words by default set linebreak " don't wrap words by default
set textwidth=0 " Don't wrap lines by default set textwidth=0 " don't wrap lines by default
set ruler " show the cursor position all the time set ruler " show the cursor position all the time

40
utils/vim/files/vimrc.full
View File

@ -1,24 +1,24 @@
set showcmd " Show (partial) command in status line. set showcmd " show (partial) command in status line
set showmatch " Show matching brackets. set showmatch " show matching brackets
set ignorecase " Do case insensitive matching set ignorecase " do case insensitive matching
set incsearch " Incremental search set incsearch " incremental search
set autowrite " Automatically save before commands like :next and :make set autowrite " automatically save before commands like :next and :make
set nocompatible " Use Vim defaults instead of 100% vi compatibility set nocompatible " use Vim defaults instead of 100% vi compatibility
set backspace=indent,eol,start " more powerful backspacing set backspace=indent,eol,start " more powerful backspacing
set autoindent " always set autoindenting on set autoindent " always set autoindenting on
set linebreak " Don't wrap words by default set linebreak " don't wrap words by default
set textwidth=0 " Don't wrap lines by default set textwidth=0 " don't wrap lines by default
set ruler " show the cursor position all the time set ruler " show the cursor position all the time
if filereadable(expand("$VIMRUNTIME/syntax/synload.vim")) if filereadable(expand("$VIMRUNTIME/syntax/synload.vim"))
syntax on syntax on
endif endif
if has("syntax") && &term =~ "xterm" if has("syntax") && &term =~ "xterm"
set t_Co=8 set t_Co=8
if has("terminfo") if has("terminfo")
set t_Sf=<Esc>[3%p1%dm set t_Sf=<Esc>[3%p1%dm
set t_Sb=<Esc>[4%p1%dm set t_Sb=<Esc>[4%p1%dm
else else
set t_Sf=<Esc>[3%dm set t_Sf=<Esc>[3%dm
set t_Sb=<Esc>[4%dm set t_Sb=<Esc>[4%dm
endif endif
endif endif

9
utils/vim/patches/001-cross_compile.patch
View File

@ -1,6 +1,6 @@
--- vim73.org/src/auto/configure 2010-11-29 10:47:27.396117333 +0000 --- a/src/auto/configure
+++ vim73/src/auto/configure 2010-11-29 10:48:52.301117332 +0000 +++ b/src/auto/configure
@@ -11641,34 +11641,8 @@ @@ -11641,34 +11641,8 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
$as_echo_n "checking uint32_t is 32 bits... " >&6; } $as_echo_n "checking uint32_t is 32 bits... " >&6; }
@ -33,3 +33,6 @@
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext - conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi -fi