i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed vimrc from the repository as per #5699

Browse Source 
* Updated vim & KeymapSwitcher optional packages, provided by siarzhuk.
To note, I did not remove the 'vi' symlink creation as I'm uncertain as
to whether or not any unknown applications are hardcoded to use it.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36753 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-08 19:11:45 +00:00
parent b513501fe4
commit 75d1bce8d7
2 changed files with 11 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+11 -17
View File
@@ -39,7 +39,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# GetText - a framework to help produce multi-lingual messages. # GetText - a framework to help produce multi-lingual messages.
# Git - the distributed version control system # Git - the distributed version control system
# ICU-devel - the headers for ICU (for development) # ICU-devel - the headers for ICU (for development)
# KeymapSwitcher - Desktop utility # KeymapSwitcher - Easy to use keymap switcher
# LibEvent - An event notification library # LibEvent - An event notification library
# LibIconv - text encoding conversion library # LibIconv - text encoding conversion library
# LibLayout - GCC2 package needed by some BeOS apps to compile # LibLayout - GCC2 package needed by some BeOS apps to compile
@@ -68,7 +68,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# TrackerNewTemplates - template files for Tracker's New menu # TrackerNewTemplates - template files for Tracker's New menu
# Transmission - A fast, easy, and free BitTorrent Client # Transmission - A fast, easy, and free BitTorrent Client
# UserlandFS - aids native file system development (like FUSE) # UserlandFS - aids native file system development (like FUSE)
# Vim - the command line text editor # Vim - Vi IMproved. Highly configurable text editor
# Vision - powerful native IRC client # Vision - powerful native IRC client
# VLC - the multi media player with native interface # VLC - the multi media player with native interface
# WebPositive - native, WebKit-based web browser # WebPositive - native, WebKit-based web browser
@@ -731,16 +731,16 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ; Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip KeymapSwitcher-1.2.5-r1a2-x86-gcc4-2010-05-08.zip
: $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip : $(baseURL)/KeymapSwitcher-1.2.5-r1a2-x86-gcc4-2010-05-08.zip
: :
; ;
AddSymlinkToHaikuImage home config be Desktop\ applets AddSymlinkToHaikuImage home config be Desktop\ applets
: /boot/common/bin/KeymapSwitcher ; : /boot/common/bin/KeymapSwitcher ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.4-r1a1-x86-gcc2-2009-09-06.zip KeymapSwitcher-1.2.5-r1a2-x86-gcc2-2010-05-08.zip
: $(baseURL)/KeymapSwitcher-1.2.4-r1a1-x86-gcc2-2009-09-06.zip : $(baseURL)/KeymapSwitcher-1.2.5-r1a2-x86-gcc2-2010-05-08.zip
: :
; ;
AddSymlinkToHaikuImage home config be Desktop\ applets AddSymlinkToHaikuImage home config be Desktop\ applets
@@ -1052,7 +1052,7 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
Echo "No optional package P7zip available for $(TARGET_ARCH)" ; Echo "No optional package P7zip available for $(TARGET_ARCH)" ;
} else { } else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip
: $(baseURL)/p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip : $(baseURL)/p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip
: :
@@ -1329,29 +1329,23 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
Echo "No optional package Vim available for $(TARGET_ARCH)" ; Echo "No optional package Vim available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 { } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage vim-7.2-x86-gcc4-2009-05-31.zip InstallOptionalHaikuImagePackage vim-7.2-r1a2-x86-gcc4-2010-05-07.zip
: $(baseURL)/vim-7.2-x86-gcc4-2009-05-31.zip : $(baseURL)/vim-7.2-r1a2-x86-gcc4-2010-05-07.zip
: :
; ;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config be Applications
: /boot/common/bin/gvim ; : /boot/common/bin/gvim ;
# TODO: move this symlink to the archive # TODO: move this symlink to the archive
AddSymlinkToHaikuImage common bin : vim : vi ; AddSymlinkToHaikuImage common bin : vim : vi ;
# TODO: remove vimrc from the repository and add it to the archive
SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
AddFilesToHaikuImage common etc vim : <etc>vimrc ;
} else { } else {
InstallOptionalHaikuImagePackage vim-7.2-r1a1-x86-gcc2-2009-09-06.zip InstallOptionalHaikuImagePackage vim-7.2-r1a2-x86-gcc2-2010-05-07.zip
: $(baseURL)/vim-7.2-r1a1-x86-gcc2-2009-09-06.zip : $(baseURL)/vim-7.2-r1a2-x86-gcc2-2010-05-07.zip
: :
; ;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config be Applications
: /boot/common/bin/gvim ; : /boot/common/bin/gvim ;
# TODO: move this symlink to the archive # TODO: move this symlink to the archive
AddSymlinkToHaikuImage common bin : vim : vi ; AddSymlinkToHaikuImage common bin : vim : vi ;
# TODO: remove vimrc from the repository and add it to the archive
SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
AddFilesToHaikuImage common etc vim : <etc>vimrc ;
} }
} }
data/etc/vim/vimrc
-29
View File
@@ -1,29 +0,0 @@
" highlight matching brackets
set showmatch
" status line: show line/column and current mode
set ruler
set showmode
" required to be able to use keypad keys and map missed escape sequences
set esckeys
" be user-friendly instead of compatible
set nocompatible
" backspace shall remove anything in insert mode
set backspace=indent,eol,start
" keys in insert mode
map! <Esc>OA <Up>
map! <Esc>OB <Down>
map! <Esc>OC <Right>
map! <Esc>OD <Left>
map! <Esc>OH <Home>
map! <Esc>OF <End>
map! <Esc>[5~ <PageUp>
map! <Esc>[6~ <PageDown>
map!  <BS>
" keys in command mode
map  X