Mercurial > vim
changeset 20223:57a69af99e48 v8.2.0667
patch 8.2.0667: cannot install Haiku version from source
Commit: https://github.com/vim/vim/commit/2c5c1638a9fe2ef34f2fd09ed69e10ef2e821f0a
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Apr 30 19:54:38 2020 +0200
patch 8.2.0667: cannot install Haiku version from source
Problem: Cannot install Haiku version from source.
Solution: Update Makefile and rdef file. (Emir Sari, closes https://github.com/vim/vim/issues/6013)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 30 Apr 2020 20:00:04 +0200 |
| parents | fece96aeff70 |
| children | e14b78c299ee |
| files | Filelist READMEdir/README_haiku.txt runtime/doc/os_haiku.txt src/Makefile src/os_haiku.rdef src/os_haiku.rdef.in src/version.c |
| diffstat | 7 files changed, 173 insertions(+), 162 deletions(-) [+] |
line wrap: on
line diff
--- a/Filelist +++ b/Filelist @@ -610,7 +610,7 @@ SRC_AMI = \ SRC_HAIKU = \ README_haiku.txt \ src/os_haiku.h \ - src/os_haiku.rdef \ + src/os_haiku.rdef.in \ src/gui_haiku.cc \ src/gui_haiku.h \ src/proto/gui_haiku.pro \
--- a/READMEdir/README_haiku.txt +++ b/READMEdir/README_haiku.txt @@ -10,4 +10,4 @@ software repository HaikuPorts. To get V - Open a Terminal and type "pkgman install vim", then follow instructions. If you prefer to install Vim from source, follow the instructions on -"runtime/doc/os_haiku.txt", "Compiling Haiku" section. +"runtime/doc/os_haiku.txt", "Compiling Vim" section.
--- a/runtime/doc/os_haiku.txt +++ b/runtime/doc/os_haiku.txt @@ -1,4 +1,4 @@ -*os_haiku.txt* For Vim version 8.2. Last change: 2020 Mar 19 +*os_haiku.txt* For Vim version 8.2. Last change: 2020 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar @@ -46,12 +46,11 @@ features you can enable/disable. Haiku uses "ncurses6" as its terminal library, therefore you need to have "ncurses6_devel" package installed from HaikuDepot in order to configure -the Haiku build. Just append "--with-tlib=ncurses6" to ./configure command -below for the initial build. +the Haiku build. Just append "--with-tlib=ncurses6" to ./configure command Now you should use "make" to compile Vim, then "make install" to install it. For seamless integration into Haiku, the GUI-less vim binary should be -additionally installed over the GUI version. Typical build commands are: > +additionally installed over the GUI version. Typical build commands are: ./configure --prefix=`finddir B_SYSTEM_NONPACKAGED_DIRECTORY` \ --datarootdir=`finddir B_SYSTEM_NONPACKAGED_DATA_DIRECTORY` \ @@ -71,25 +70,28 @@ 3. The Haiku GUI *haiku-gui* Normally Vim starts with the GUI if you start it as gvim or vim -g. The vim version with GUI tries to determine if it was started from the Tracker instead -of the Terminal, and if so, uses the GUI anyway. However, the current detection +of the Terminal, and if so, uses the GUI anyway. However, the current detection scheme is fooled if you use the command "vim - </dev/null". Stuff that does not work yet: -- Mouse up events are not generated when outside the window. This may be a bug in - Haiku. You can notice this when selecting text and moving the cursor outside - the window, then letting go of the mouse button. Another way is when you - drag the scrollbar and do the same thing. Because Vim still thinks you are - still playing with the scrollbar it won't change it itself. I provided a - workaround which kicks in when the window is activated or deactivated (so it - works best with focus- follows-mouse turned on). +- Mouse up events are not generated when outside the window. You can notice + this when selecting text and moving the cursor outside the window, then + letting go of the mouse button. Another way is when you drag the scrollbar + and do the same thing. Because Vim still thinks you are still playing with + the scrollbar it won't change it itself. There is a workaround which kicks + in when the window is activated or deactivated (so it works best with focus- + follows-mouse turned on). - The cursor does not flash. +- Built-in terminal is not available in GUI, and does not work reliably on + console version as well; e.g. it is not possible to exit using the 'exit' + command. If you need to use it, enable at your own risk. 4. The $VIM directory *haiku-vimdir* $VIM is the symbolic name for the place where Vim's support files are stored. -The default value for $VIM is set at compile time and can be determined with > +The default value for $VIM is set at compile time and can be determined with: :version @@ -117,7 +119,7 @@ 6. Drag & Drop *haiku-dragndrop* You can drop files and directories on either the Vim icon (starts a new Vim session, unless you use the File Types application to set Vim to be "Single Launch") or on the Vim window (starts editing the files). Dropping a folder -sets Vim's current working directory. |:cd| |:pwd| If you drop files or +sets Vim's current working directory |:cd| |:pwd|. If you drop files or folders with either SHIFT key pressed, Vim changes directory to the folder that contains the first item dropped. When starting Vim, there is no need to press shift: Vim behaves as if you do. @@ -164,7 +166,7 @@ isn't a dotted-y, then for this font the If the font you specify is unavailable, you get the system fixed font. -GUI Font Selection Dialog is available at giving the > +GUI Font Selection Dialog is available at giving the: :set guifont=*
--- a/src/Makefile +++ b/src/Makefile @@ -2885,7 +2885,7 @@ uninstall_runtime: clean celan: testclean -rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o -rm -rf objects - -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h + -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h auto/os_haiku.rdef -rm -f conftest* *~ auto/link.sed -rm -f testdir/opt_test.vim -rm -f $(UNITTEST_TARGETS) @@ -3042,6 +3042,14 @@ auto/if_perl.c: if_perl.xs auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh +auto/os_haiku.rdef: os_haiku.rdef.in + @echo creating $@ + @echo '/* This file is automatically created by Makefile */' >> $@ + @echo '/* DO NOT EDIT! Change Makefile only. */' >> $@ + @cat $(srcdir)/os_haiku.rdef.in >> auto/os_haiku.rdef + sed -i "s|@MAJOR@|$(VIMMAJOR)|" auto/os_haiku.rdef + sed -i "s|@MINOR@|$(VIMMINOR)|" auto/os_haiku.rdef + auto/pathdef.c: Makefile auto/config.mk -@echo creating $@ -@echo '/* pathdef.c */' > $@ @@ -3384,7 +3392,7 @@ objects/os_beos.o: os_beos.c objects/os_qnx.o: os_qnx.c $(CCC) -o $@ os_qnx.c -objects/os_haiku.rsrc: os_haiku.rdef +objects/os_haiku.rsrc: auto/os_haiku.rdef cat $< | $(CCC) -E - | grep -v '^#' | rc -o "$@" - objects/os_macosx.o: os_macosx.m
rename from src/os_haiku.rdef rename to src/os_haiku.rdef.in --- a/src/os_haiku.rdef +++ b/src/os_haiku.rdef.in @@ -1,12 +1,11 @@ /* - * os_haiku.rdef + * os_haiku.rdef.in: Assets and resources file for Haiku */ resource app_signature "application/x-vnd.Haiku-Vim-8"; resource app_version { major = @MAJOR@, - middle = @MIDDLE@, minor = @MINOR@, variety = B_APPV_FINAL,