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

Moves the following to Vim's code block in OptionalPackages:

Browse Source 
* addition of common/etc/vimrc
 * creation of symlink vi --> vim
Improves but not a final fix for #5699


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36082 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-04-08 14:22:16 +00:00
parent 6ed212bd43
commit 0660612cdb
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
-5
View File
@@ -376,8 +376,6 @@ AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
AddSymlinkToHaikuImage system bin : gawk : awk ; AddSymlinkToHaikuImage system bin : gawk : awk ;
AddSymlinkToHaikuImage system bin : grep : egrep ; AddSymlinkToHaikuImage system bin : grep : egrep ;
AddSymlinkToHaikuImage system bin : grep : fgrep ; AddSymlinkToHaikuImage system bin : grep : fgrep ;
AddSymlinkToHaikuImage system bin : vim : vi ;
AddSymlinkToHaikuImage system bin : vim : view ;
# scripts and data files # scripts and data files
@@ -427,9 +425,6 @@ SEARCH on <bash_completion>subversion =
AddFilesToHaikuImage common etc bash_completion.d : AddFilesToHaikuImage common etc bash_completion.d :
<bash_completion>subversion ; <bash_completion>subversion ;
SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
AddFilesToHaikuImage common etc vim : <etc>vimrc ;
local dataFiles = teapot.data ; local dataFiles = teapot.data ;
dataFiles = $(dataFiles:G=data) ; dataFiles = $(dataFiles:G=data) ;
SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data system data ] ; SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data system data ] ;
build/jam/OptionalPackages
+10
View File
@@ -1083,6 +1083,11 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
; ;
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
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-r1a1-x86-gcc2-2009-09-06.zip
: $(baseURL)/vim-7.2-r1a1-x86-gcc2-2009-09-06.zip : $(baseURL)/vim-7.2-r1a1-x86-gcc2-2009-09-06.zip
@@ -1090,6 +1095,11 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
; ;
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
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 ;
} }
} }