781138 - Empty .mkdir.done files are bundled with packages

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Takanori MATSUURA]

Maybe after checking in bug 773202, there are many empty .mkdir.done files are bundled with packages.


firefox-17.0a1.en-US.linux-x86_64.tar.bz2:firefox/omni.ja
  modules/services-notifications/.mkdir.done

firefox-17.0a1.en-US.linux-x86_64.tests.zip
  mochitest/extensions/.mkdir.done  
  mochitest/extensions/specialpowers/chrome/.mkdir.done  
  mochitest/mochijar/chrome/.mkdir.done  
  modules/.mkdir.done  
  modules/services-common/.mkdir.done  
  reftest/reftest/chrome/.mkdir.done  

thunderbird-17.0a1.en-US.linux-x86_64.tests.zip
  mochitest/extensions/.mkdir.done  
  mochitest/extensions/specialpowers/chrome/.mkdir.done  
  mochitest/mochijar/chrome/.mkdir.done  
  modules/.mkdir.done  
  reftest/reftest/chrome/.mkdir.done  

xulrunner-17.0a1.en-US.linux-x86_64.sdk.tar.bz2
  xulrunner-sdk/bin/chrome/.mkdir.done
  xulrunner-sdk/idl/.mkdir.done
  xulrunner-sdk/include/.mkdir.done

xulrunner-17.0a1.en-US.linux-x86_64.tar.bz2:xulrunner/omni.ja
  chrome/.mkdir.done

Comment 1

[(not currently active) Ted Mielczarek]

I'm not particularly worried about the test package or the xulrunner package, but we should make sure we skip these when creating the omnijar archive.

Comment 2

[Takanori MATSUURA]

Attachment: Possible fix

For omni.ja archive:
Add \*/.mkdir.done to NON_OMNIJAR_FILES

For packages:
Add --exclude=".mkdir.done" to CREATE_FINAL_TAR (for tar archive) or \*/.mkdir.done to INNER_MAKE_PACKAGE (for zip archive)

https://tbpl.mozilla.org/?tree=Try&rev=6e207bec61ca

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Green on Try:
https://tbpl.mozilla.org/?tree=Try&rev=1d57b70df30c

https://hg.mozilla.org/integration/mozilla-inbound/rev/79e57b09177b

Comment 4

[Takanori MATSUURA]

https://hg.mozilla.org/mozilla-central/rev/79e57b09177b