645356 - Use pymake builtins

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mitchell Field [:Mitch]]

pymake has its own built-in mkdir, rm, sleep and touch implementations. We should make use of them where we can, and remove any redundant/default parameters while we're at it.

Comment 1

[Mitchell Field [:Mitch]]

Attachment: Patch

Comment 2

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 522117 [details] [diff] [review]
Patch

> export:: $(TARGETS) $(HEADERS)
> 	$(INSTALL) $(IFLAGS1) $(HEADERS) $(DIST)/include
>-	-rm -f $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
>-	-rm -f $(DIST)/bin/chrome/chromelist.txt
>+	-$(RM) $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
>+	-$(RM) $(DIST)/bin/chrome/chromelist.txt

I think you can drop the chromelist.txt thing entirely.  That's been gone for a while.

Also, do builtins work right with -?  Not sure if that's tested or not.

> ifdef MKDEPEND_DIR
> clean clobber realclean clobber_all::
>-	cd $(MKDEPEND_DIR); $(MAKE) $@
>+	cd $(MKDEPEND_DIR)
>+	$(MAKE) $@

Er, this is completely wrong, no?


>@@ -1580,18 +1582,18 @@ export:: FORCE
> endif
> 
> $(IDL_DIR)::
> 	$(NSINSTALL) -D $@
> 
> # generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include;
> # warn against overriding existing .h file. 
> $(XPIDL_GEN_DIR)/.done:
>-	@if test ! -d $(XPIDL_GEN_DIR); then echo Creating $(XPIDL_GEN_DIR)/.done; rm -rf $(XPIDL_GEN_DIR); mkdir $(XPIDL_GEN_DIR); fi
>-	@touch $@
>+	$(MKDIR) -p $(XPIDL_GEN_DIR)
>+	@$(TOUCH) $@

> $(CURDIR)/$(MDDEPDIR):
>-	@if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi
>+	$(MKDIR) -p $@

This shell killing warms my heart.

r=me with the stuff mentioned fixed.  I'm assuming you've tested this well.

Comment 3

[Mitchell Field [:Mitch]]

http://hg.mozilla.org/projects/build-system/rev/f066b09198b3

Comment 4

[[e-mail]]

(In reply to comment #2)
>(From update of attachment 522117 [details] [diff] [review])
>> ifdef MKDEPEND_DIR
>> clean clobber realclean clobber_all::
>>-	cd $(MKDEPEND_DIR); $(MAKE) $@
>>+	cd $(MKDEPEND_DIR)
>>+	$(MAKE) $@
>Er, this is completely wrong, no?
How about $(MAKE) -C $(MKDEPEND_DIR) $@

Comment 5

[Mitchell Field [:Mitch]]

http://hg.mozilla.org/mozilla-central/rev/f066b09198b3