Project

General

Profile

« Previous | Next » 

Revision 12920

Added by Aaron Marcuse-Kubitza almost 11 years ago

bugfix: lib/common.Makefile: $(add*): need to wrap w/ $(wildcard) to prevent "targets don't exist" error, because svn 1.7 does not suppress this error even with --force

View differences:

trunk/inputs/input.Makefile
149 149 
	$(if $(wildcard _MySQL/),$(call addDirWithIgnore,_MySQL,'*'))
150 150 
	$(if $(wildcard _src/),$(call addDirWithIgnore,_src,'*'))
151 151 
	$(if $(wildcard _archive/),$(call addDirWithIgnore,_archive,'*'))
152 
	-$(call add*,$(svnFiles))
153 
# ignore error "Could not add all targets because some targets don't exist"
152 
	$(call add*,$(svnFiles))
154 153 

  		




  155
  154
  
    
# Adds a new table subdir


  		




  156
  155
  
    
%/add: _always


  		












  

    
      trunk/lib/common.Makefile
    
  





  70
  70
  
    

  		




  71
  71
  
    
addFile = $(if $(wildcard $(1)),,touch $(1) && )svn add --force $(1)


  		




  72
  72
  
    
addDir = $(if $(wildcard $(1)/),svn add --force --depth=empty $(1),svn mkdir $(1))


  		




  73
  
  
    
add* = $(if $(1),svn add --force --depth=empty $(1))


  		




  
  73
  
    
add* = $(if $(1),svn add --force --depth=empty $(wildcard $(1)))


  		




  
  74
  
    
	# $(wildcard __): prevent error "Could not add all targets because some


  		




  
  75
  
    
	# targets don't exist"


  		




  74
  76
  
    

  		




  75
  77
  
    
# Revisions


  		




  76
  78
  
    
revision = $(shell svn info $(1)|$(sed) -n 's/^Last Changed Rev: (.*)$$/\1/p')


  		












Also available in:  Unified diff