375828 - RUN_AUTOCONF_LOCALLY doesn't regenerate configures after a CVS checkout conflict

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[[e-mail]]

Steps to reproduce problem:
1. Turn on RUN_AUTOCONF_LOCALLY
2. Make a change in your tree that will make a merge conflict
3. make -s -f client.mk checkout
4. Fix the conflict
5. make -s -f client.mk build

Expected results: configures are regenerated

Actual result: configures are not regenerated

Comment 1

[[e-mail]]

Attachment: Proposed patch

Because the configure.in could be conflicting we can only delete the configures and then regenerate them later on demand. This has the added benefit that make -s -f client.mk build will regenerate the other configures.

Comment 2

[Benjamin Smedberg]

Comment on attachment 260004 [details] [diff] [review]
Proposed patch

How is this going to work, since the ldap code uses autoconf2.5x, while mozilla/nspr use autoconf 2.13? and... configure should conditionally depend on directory/c-sdk, because that directory is only pulled when we pull mailnews.

Comment 3

[[e-mail]]

Comment on attachment 260004 [details] [diff] [review]
Proposed patch

(In reply to comment #2)
>How is this going to work, since the ldap code uses autoconf2.5x, while
>mozilla/nspr use autoconf 2.13?

>-ifdef RUN_AUTOCONF_LOCALLY
>-       @echo Generating configures using $(AUTOCONF) ; \
>-       cd $(TOPSRCDIR) && $(AUTOCONF) && \
>-       cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
>-       cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
>-endif
I'm just copying what this does. If client.mk shouldn't remove and regenerate the directory/c-sdk configure then that's hardly within the scope of this bug.

>and... configure should conditionally depend on
>directory/c-sdk, because that directory is only pulled when we pull mailnews.
No, it's pulled unconditionally. My fault for not showing enough context.

Comment 4

[[e-mail]]

Fix checked in.

Comment 5

[Jeremy Lea]

This broke my local build because /directory/c-sdk/configure is not pulled unconditionally.  The LDAPSDK_CVSCO command is cleared if /directory/xpcom/ is not in the build.

Comment 6

[Axel Hecht [:Pike]]

Yep, this broke the remaining l10n tinderboxens on trunk, see http://tinderbox.mozilla.org/Mozilla-l10n/.

Comment 7

[[e-mail]]

Attachment: Bustage fix

Thanks for pointing that out. I checked this in to fix the l10n bustage.

Comment 8

[[e-mail]]

OK, l10n is turning green.