To: vim_dev@googlegroups.com
Subject: Patch 8.1.1942
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.1.1942
Problem:    Shadow directory gets outdated when files are added.
Solution:   Add the "shadowupdate" target and add a few comments.
Files:	    src/Makefile


*** ../vim-8.1.1941/src/Makefile	2019-08-27 22:48:12.737480696 +0200
--- src/Makefile	2019-08-30 13:57:52.671038119 +0200
***************
*** 2828,2839 ****
  	fi
  
  # Make a shadow directory for compilation on another system or with different
! # features.
  SHADOWDIR = shadow
  
  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 .
  	mkdir $(SHADOWDIR)/auto
  	cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
  	$(MKDIR_P) $(SHADOWDIR)/po
--- 2828,2858 ----
  	fi
  
  # Make a shadow directory for compilation on another system or with different
! # 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 $(LINKEDFILES) .
  	mkdir $(SHADOWDIR)/auto
  	cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
  	$(MKDIR_P) $(SHADOWDIR)/po
***************
*** 2867,2872 ****
--- 2886,2897 ----
  				 ../../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 .
*** ../vim-8.1.1941/src/version.c	2019-08-30 13:12:21.799590494 +0200
--- src/version.c	2019-08-30 13:59:03.670472063 +0200
***************
*** 763,764 ****
--- 763,766 ----
  {   /* Add new patch number below this line */
+ /**/
+     1942,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
137. You decide to stay in college for an additional year or two,
     just so you can have the free Internet access.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///