On 7/2/2014 3:45 PM, Kim Gräsman wrote:
Related question: there are differences between the pymake in
mozilla-central and the master at
http://hg.mozilla.org/users/bsmedberg_mozilla.com/pymake/ on which you
based the GitHub repo.
That's unfortunate. the mozilla-central version was supposed to be a
mirror, but apparently they diverged at some point.
Diff report from Beyond Compare below, I
haven't managed to get a unified diff:
Left base folder: D:\dev\mozilla\pymake
Right base folder: D:\dev\mozilla\mozilla-central\build\pymake
Name Size Modified Name
Size Modified
----------------------------------------------------------------------------------------------------------------
.hg 2014-07-02 17:31:20
build 2014-07-02 17:31:20
pymake 193 451 2014-07-02 17:31:20 pymake
406 240 2014-07-02 21:05:20
\data.py 62 528 2014-07-02 17:31:20 <> \data.py
62 126 2014-07-01 20:23:48
tests 133 513 2014-07-02 17:31:20 tests
133 274 2014-07-02 20:53:25
+empty-rule.mk 188 2014-07-02 17:31:20 >> |
| <<
\foreach-local-variable.mk 230 2014-07-01 20:23:48
+glob1.inc 5 2014-07-02 17:31:20 >>
+glob2.inc 4 2014-07-02 17:31:20 >>
+include-glob.mk 105 2014-07-02 17:31:20 >>
\include-required-fails.mk 167 2014-07-02 17:31:20 >>
make.py 456 2014-07-02 17:31:20 <> make.py
1 023 2014-07-02 20:11:48
----------------------------------------------------------------------------------------------------------------
This raises some questions:
- Is build/ in the main pymake repo unused? If so, can I kill it?
It looks like the tests that are currently in builds/pymake/tests ought
to just be in tests/ and got mis-committed. Sounds like we should just
move them to the right spot.
- empty-rule.mk is consistently failing here, and is gone in
mozilla-central. Remove it?
Is it testing something important? It dates back to
https://bugzilla.mozilla.org/show_bug.cgi?id=755828 and it looks like
the new test just never got added to mozilla-central.
Before removing it we should understand if the test is broken or pymake
itself is broken.
- mozilla-central's make.py has a hack in place to redirect bot builds
to mozmake.exe. That's fine, I guess (in its genre), but shouldn't be
necessary now that mozmake is the default.
Right. We should consider removing build/pymake from mozilla-central
entirely.
--BDS
_______________________________________________
dev-builds mailing list
dev-builds@lists.mozilla.org
https://lists.mozilla.org/listinfo/dev-builds
