← Back to branch summary

~ubuntu-branches/ubuntu/natty/lightning-extension/natty-security

« back to all changes in this revision

Viewing changes to mozilla/config/JarMaker.py

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-09-03 14:00:01 UTC
  • mfrom: (1.1.24)
  • Revision ID: package-import@ubuntu.com-20120903140001-iee9509f51oz7pqs
Tags: 1.8+build1-0ubuntu0.11.04.1
https://launchpad.net/bugs/1062587
* New upstream stable release to support Thunderbird 16 (CALENDAR_1_8_BUILD1)
  - LP: #1062587

* Add extra Makefiles that are needed for the build
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/config/JarMaker.py
278
278
    # chromebasepath is used for chrome registration manifests
279
279
    # %s is getting replaced with chrome/ for chrome.manifest, and with
280
280
    # an empty string for jarfile.manifest
281
 
    chromebasepath = '%s' + jarfile
 
281
    chromebasepath = '%s' + os.path.basename(jarfile)
282
282
    if self.outputFormat == 'jar':
283
283
      chromebasepath = 'jar:' + chromebasepath + '.jar!'
284
284
    chromebasepath += '/'
370
370
          pp.setMarker('%')
371
371
        pp.out = outf
372
372
        pp.do_include(inf)
 
373
        pp.warnUnused(realsrc)
373
374
        outf.close()
374
375
        inf.close()
375
376
        return