Skip to content
Browse files

Bug 717372 - The clobber information should live in the tree; r=khuey

  • Loading branch information...
1 parent f7447b2 commit af51ad464fccd75a3a1134fef56b6debf9a67a14 @bgirard bgirard committed
Showing with 35 additions and 0 deletions.
  1. +18 −0 CLOBBER
  2. +1 −0 client.mk
  3. +16 −0 configure.in
View
18 CLOBBER
@@ -0,0 +1,18 @@
+# To Trigger a clobber replace ALL of the textual description below,
+# giving a bug number and a one line description of why a clobber is
+# required. Modifying this file will make configure check that a
+# clobber has been performed before the build can continue.
+#
+# MERGE NOTE: When merging two branches that require a CLOBBER, you should
+# merge both CLOBBER descriptions, to ensure that users on
+# both branches correctly see the clobber warning.
+#
+# O <-- Users coming from both parents need to Clobber
+# / \
+# O O
+# | |
+# O <-- Clobber O <-- Clobber
+#
+# Note: The description below will be part of the error message shown to users.
+#
+Bug 717372 - The clobber information should live in the tree
View
1 client.mk
@@ -279,6 +279,7 @@ CONFIG_STATUS_DEPS := \
$(wildcard $(TOPSRCDIR)/*/confvars.sh) \
$(CONFIGURES) \
$(TOPSRCDIR)/allmakefiles.sh \
+ $(TOPSRCDIR)/CLOBBER \
$(TOPSRCDIR)/nsprpub/configure \
$(TOPSRCDIR)/config/milestone.txt \
$(TOPSRCDIR)/js/src/config/milestone.txt \
View
16 configure.in
@@ -123,6 +123,22 @@ then
fi
MOZ_BUILD_ROOT=`pwd`
+dnl Do not allow building if a clobber is required
+dnl ==============================================================
+dnl TODO Make this better, ideally this would clobber automaticially
+if test -e $_objdir/CLOBBER; then
+ if test $_topsrcdir/CLOBBER -nt $_objdir/CLOBBER; then
+ echo " ***"
+ echo " * CLOBBER has been modified indicating a clobber is required:"
+ cat $_topsrcdir/CLOBBER | sed '/^#/d' | sed 's/^/ * /'
+ echo " ***"
+ exit 1
+ break;
+ fi
+else
+ touch $_objdir/CLOBBER
+fi
+
MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python)
if test -z "$PYTHON"; then
AC_MSG_ERROR([python was not found in \$PATH])

0 comments on commit af51ad4

Please sign in to comment.
Something went wrong with that request. Please try again.