diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-08-30 13:59:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-08-30 13:59:29 +0200 |
| commit | 58a297b28d2a8127c72bd860c4a7175a5e9c97f3 (patch) | |
| tree | 163dddaa6c5d1dccbf1a8494c8d103bdff7225d8 | |
| parent | ad5db44c0165b6254199e7af5962b42caf8b857c (diff) | |
| download | vim-git-8.1.1942.tar.gz | |
patch 8.1.1942: shadow directory gets outdated when files are addedv8.1.1942
Problem: Shadow directory gets outdated when files are added.
Solution: Add the "shadowupdate" target and add a few comments.
| -rw-r--r-- | src/Makefile | 29 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 29 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 0f724621a..e1cb4859d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2828,12 +2828,31 @@ clean celan: testclean fi # Make a shadow directory for compilation on another system or with different -# features. +# features: +# % make shadow +# % cd shadow +# edit configuration in src/shadow/Makefile +# % make +# +# Alternatively use a link for the Makefile and run configure with flags in +# another way. When new source files are added use "shadowupdate": +# % cd shadow +# % rm Makefile +# % ln -s ../Makefile . +# % ./configure {options} +# % make +# And later: +# % git pull +# % make distclean shadowupdate +# % ./configure {options} +# % make SHADOWDIR = shadow +LINKEDFILES = ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor ../install-sh ../Make_all.mak + shadow: runtime pixmaps $(MKDIR_P) $(SHADOWDIR) - cd $(SHADOWDIR); ln -s ../*.[chm] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../libvterm ../vimtutor ../gvimtutor ../install-sh ../Make_all.mak . + cd $(SHADOWDIR); ln -s $(LINKEDFILES) . mkdir $(SHADOWDIR)/auto cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . $(MKDIR_P) $(SHADOWDIR)/po @@ -2867,6 +2886,12 @@ shadow: runtime pixmaps ../../testdir/test83-tags? \ ../../testdir/*.ok . +# After updating Vim new files may have been created, use this to refresh the +# symbolic links in the shadow directory. This isn't guaranteed to catch all +# changes, running "make shadow" again might sometimes be needed. +shadowupdate: + ln -sf $(LINKEDFILES) . + # Link needed for doing "make install" in a shadow directory. runtime: -ln -s ../runtime . diff --git a/src/version.c b/src/version.c index e6f7d141b..64735b2ed 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1942, +/**/ 1941, /**/ 1940, |