diff options
| author | Matt Madia <mattmadia@gmail.com> | 2010-04-08 14:22:16 (GMT) |
|---|---|---|
| committer | Matt Madia <mattmadia@gmail.com> | 2010-04-08 14:22:16 (GMT) |
| commit | 0660612cdb18770c590ec6e2c9f3a6fe99c7dc6a (patch) | |
| tree | 0c384a29fd85641372d7e2ce516eda199d3f9ebf | |
| parent | 6ed212bd4393c9bd1edfd235d7030a2f7e99ec6b (diff) | |
Moves the following to Vim's code block in OptionalPackages:hrev36082
* 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
| -rw-r--r-- | build/jam/HaikuImage | 5 | ||||
| -rw-r--r-- | build/jam/OptionalPackages | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 5d8bc51..1df0559 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -376,8 +376,6 @@ AddSymlinkToHaikuImage system bin : unzip : zipinfo ; AddSymlinkToHaikuImage system bin : gawk : awk ; AddSymlinkToHaikuImage system bin : grep : egrep ; AddSymlinkToHaikuImage system bin : grep : fgrep ; -AddSymlinkToHaikuImage system bin : vim : vi ; -AddSymlinkToHaikuImage system bin : vim : view ; # scripts and data files @@ -427,9 +425,6 @@ SEARCH on <bash_completion>subversion = AddFilesToHaikuImage common etc bash_completion.d : <bash_completion>subversion ; -SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ; -AddFilesToHaikuImage common etc vim : <etc>vimrc ; - local dataFiles = teapot.data ; dataFiles = $(dataFiles:G=data) ; SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data system data ] ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 93d6bd2..0b3ee99 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -1083,6 +1083,11 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] { ; AddSymlinkToHaikuImage home config be Applications : /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 { InstallOptionalHaikuImagePackage 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 : /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 ; } } |