Closed Bug 924615 Opened 6 years ago Closed 6 years ago

Move JarMaker.py into mozbuild package

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla27

People

(Reporter: gps, Assigned: gps)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

Let's package JarMaker.py into the mozbuild package and make it a native pymake command!
Assignee: nobody → gps
Blocks: 924617
Comment on attachment 814552 [details] [diff] [review]
Move JarMaker.py into mozbuild

>diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in
>--- a/mobile/locales/Makefile.in
>+++ b/mobile/locales/Makefile.in
>@@ -15,22 +15,16 @@
> include $(topsrcdir)/config/config.mk
> 
> USE_AUTOTARGETS_MK=1
> include $(topsrcdir)/config/makefiles/makeutils.mk
> 
> # Separate items of contention
> tgt-gendir = .deps/generated_$(AB_CD)
> 
>-jar-maker = \
>-  $(firstword \
>-    $(wildcard $(MOZILLA_DIR)/config/JarMaker.py) \
>-    $(topsrcdir)/config/JarMaker.py \
>-  )

joey: Any idea why this is here? Looks like it was added in bug 751167, though I don't know why we'd try to find JarMaker.py in MOZILLA_DIR and topsrcdir. Is this something needed in l10n land somewhere?

>+++ b/python/mozbuild/mozbuild/action/jar_maker.py
>@@ -0,0 +1,15 @@
>+# This Source Code Form is subject to the terms of the Mozilla Public
>+# License, v. 2.0. If a copy of the MPL was not distributed with this
>+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+
>+import sys
>+
>+import mozbuild.jar
>+
>+
>+def main(args):
>+    return mozbuild.jar.main(args)
>+
>+
>+if __name__ == '__main__':
>+    sys.exit(main(sys.argv[1:]))

nit: Why all the extra newlines (between imports, 2 double-newlines)?
Attachment #814552 - Flags: feedback?(joey)
(In reply to Michael Shal [:mshal] from comment #2)
> Comment on attachment 814552 [details] [diff] [review]
> Move JarMaker.py into mozbuild
> 
> >diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in
> >--- a/mobile/locales/Makefile.in
> >+++ b/mobile/locales/Makefile.in
> >@@ -15,22 +15,16 @@
> > include $(topsrcdir)/config/config.mk
> > 
> > USE_AUTOTARGETS_MK=1
> > include $(topsrcdir)/config/makefiles/makeutils.mk
> > 
> > # Separate items of contention
> > tgt-gendir = .deps/generated_$(AB_CD)
> > 
> >-jar-maker = \
> >-  $(firstword \
> >-    $(wildcard $(MOZILLA_DIR)/config/JarMaker.py) \
> >-    $(topsrcdir)/config/JarMaker.py \
> >-  )
> 
> joey: Any idea why this is here? Looks like it was added in bug 751167,
> though I don't know why we'd try to find JarMaker.py in MOZILLA_DIR and
> topsrcdir. Is this something needed in l10n land somewhere?

If I remember correctly MOZILLA_DIR may have been used by c-c to access JarMaker.py.  topsrcdir provides the path if/when MOZILLA_DIR is not set.
Comment on attachment 814552 [details] [diff] [review]
Move JarMaker.py into mozbuild

Ok, up to gps if he wants to double-check c-c first or not.
Attachment #814552 - Flags: review?(mshal)
Attachment #814552 - Flags: review+
Attachment #814552 - Flags: feedback?(joey)
https://hg.mozilla.org/integration/mozilla-inbound/rev/a83e068892bb

Let's roll the dice. I'm pretty confident $(py_action) will just work on c-c. If it didn't the build would be very busted.
Status: NEW → ASSIGNED
Flags: in-testsuite-
https://hg.mozilla.org/mozilla-central/rev/a83e068892bb
Status: ASSIGNED → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla27
Blocks: 926043
Blocks: 926278
Depends on: 926279
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.