[Box Backup-commit] COMMIT r2666 - box/RELEASE/0.11rc7/infrastructure

subversion at boxbackup.org subversion at boxbackup.org
Mon Mar 8 22:03:42 GMT 2010


Author: chris
Date: 2010-03-08 22:03:42 +0000 (Mon, 08 Mar 2010)
New Revision: 2666

Modified:
   box/RELEASE/0.11rc7/infrastructure/makeparcels.pl.in
Log:
Merge [2608] from trunk into 0.11rc7. Fix the default and clean targets 
by moving cleaning lines back where they belong, re-adding dependencies.


Modified: box/RELEASE/0.11rc7/infrastructure/makeparcels.pl.in
===================================================================
--- box/RELEASE/0.11rc7/infrastructure/makeparcels.pl.in	2010-03-08 22:02:59 UTC (rev 2665)
+++ box/RELEASE/0.11rc7/infrastructure/makeparcels.pl.in	2010-03-08 22:03:42 UTC (rev 2666)
@@ -115,25 +115,7 @@
 
 print MAKE "all:\t",join(' ',map {"build-".$_} @parcels),"\n\n";
 
-print MAKE "clean:\n";
-for my $parcel (@parcels)
-{
-	print MAKE "\trm -rf ", BoxPlatform::parcel_dir($parcel),    "\n";
-	print MAKE "\trm -f ",  BoxPlatform::parcel_target($parcel), "\n";
-}
-
-if ($build_os eq 'CYGWIN')
-{
-	print MAKE "\tfind release debug -type f | xargs -r rm -f\n";
-}
-else
-{
-	print MAKE "\tfind release debug -type f -exec rm -f {} \\;\n";
-}
-
 print MAKE <<__END_OF_FRAGMENT;
-	\$(MAKE) -C docs clean
-
 test:	release/common/test
 
 release/common/test:
@@ -146,6 +128,7 @@
 __END_OF_FRAGMENT
 
 my $release_flag = BoxPlatform::make_flag('RELEASE');
+my @clean_deps;
 
 for my $parcel (@parcels)
 {
@@ -259,6 +242,20 @@
 EOF
 			push @parcel_deps, "$dir/docs/${name}.html";
 		}
+		elsif ($type eq 'subdir')
+		{
+			print MAKE <<EOF;
+.PHONY: $name-build $name-clean
+
+$name-build:
+	\$(MAKE) -C $name
+
+$name-clean:
+	\$(MAKE) -C $name clean
+EOF
+			push @parcel_deps, "$name-build";
+			push @clean_deps,  "$name-clean";
+		}
 	}
 
 	print MAKE <<EOF;
@@ -351,12 +348,29 @@
 	}
 }
 
-print MAKE <<__E;
+print MAKE <<EOF;
 install:
 	cat local/install.msg
 
-__E
+clean: @clean_deps
+	\$(MAKE) -C docs clean
+EOF
 
+if ($build_os eq 'CYGWIN')
+{
+	print MAKE "\tfind release debug -type f | xargs -r rm -f\n";
+}
+else
+{
+	print MAKE "\tfind release debug -type f -exec rm -f {} \\;\n";
+}
+
+for my $parcel (@parcels)
+{
+	print MAKE "\trm -rf ", BoxPlatform::parcel_dir($parcel),    "\n";
+	print MAKE "\trm -f ",  BoxPlatform::parcel_target($parcel), "\n";
+}
+
 close MAKE;
 
 open INSTALLMSG,">local/install.msg" or die "Can't open install message file for writing";




More information about the Boxbackup-commit mailing list