[lucy-commits] svn commit: r1139581 - in /incubator/lucy/trunk: charmonizer/Makefile.win devel/bin/gen_charmonizer_makefiles.pl

[ma...@apache.org]

Author: marvin
Date: Sat Jun 25 18:38:02 2011
New Revision: 1139581

URL: http://svn.apache.org/viewvc?rev=1139581&view=rev
Log:
Improve Windows "clean" target for Charmonizer.

The DEL builtin in cmd.exe returns failure when any one of the file arguments
passed to it  do not exist.  NMake ignores this failure, but DMake aborts.  To
solve the problem, use a FOR loop and an IF EXIST test so that DEL is only
invoked for files that exist.

Modified:
    incubator/lucy/trunk/charmonizer/Makefile.win
    incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl

Modified: incubator/lucy/trunk/charmonizer/Makefile.win
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/Makefile.win?rev=1139581&r1=1139580&r2=1139581&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/Makefile.win (original)
+++ incubator/lucy/trunk/charmonizer/Makefile.win Sat Jun 25 18:38:02 2011
@@ -67,4 +67,4 @@ TestVariadicMacros.exe: src\Charmonizer\
 
 
 clean:
-	del $(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core
+	CMD /c FOR %i IN ($(OBJS) $(PROGNAME) $(TEST_OBJS) $(TESTS) core) DO IF EXIST %i DEL /F %i

Modified: incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl?rev=1139581&r1=1139580&r2=1139581&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl (original)
+++ incubator/lucy/trunk/devel/bin/gen_charmonizer_makefiles.pl Sat Jun 25 18:38:02 2011
@@ -163,7 +163,7 @@ tests: \$(TESTS)
 $args{test_blocks}
 
 clean:
-	del \$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) core
+	CMD /c FOR %i IN (\$(OBJS) \$(PROGNAME) \$(TEST_OBJS) \$(TESTS) core) DO IF EXIST %i DEL /F %i
 EOT
     print $fh $content;
 }