Author: mmadia Date: 2010-04-08 16:22:16 +0200 (Thu, 08 Apr 2010) New Revision: 36082 Changeset: http://dev.haiku-os.org/changeset/36082/haiku Ticket: http://dev.haiku-os.org/ticket/5699 Modified: haiku/trunk/build/jam/HaikuImage haiku/trunk/build/jam/OptionalPackages Log: Moves the following to Vim's code block in OptionalPackages: * addition of common/etc/vimrc * creation of symlink vi --> vim Improves but not a final fix for #5699 Modified: haiku/trunk/build/jam/HaikuImage =================================================================== --- haiku/trunk/build/jam/HaikuImage 2010-04-08 10:03:43 UTC (rev 36081) +++ haiku/trunk/build/jam/HaikuImage 2010-04-08 14:22:16 UTC (rev 36082) @@ -376,8 +376,6 @@ 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 @@ 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 ] ; Modified: haiku/trunk/build/jam/OptionalPackages =================================================================== --- haiku/trunk/build/jam/OptionalPackages 2010-04-08 10:03:43 UTC (rev 36081) +++ haiku/trunk/build/jam/OptionalPackages 2010-04-08 14:22:16 UTC (rev 36082) @@ -1083,6 +1083,11 @@ ; 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 @@ ; 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 ; } }