631390 - 'make xpi' is broken on default branch

Status: VERIFIED FIXED

(Firefox :: Sync, defect)

Description

[Jonathan Griffin (:jgriffin)]

Attempting 'make xpi' on tip changeset for fx-sync yields:

/home/cltbld/crossweave/fx-sync/tools/Preprocessor.py  -Dweave_channel="dev"  -Dweave_version="1.7b1pre"  -Dweave_id="{340c2bbc-ce74-4362-90b5-7c26312808ef}" /home/cltbld/crossweave/fx-sync/services/sync/modules/constants.js > /home/cltbld/crossweave/fx-sync/dist/stage/modules/constants.js
/bin/sh: /home/cltbld/crossweave/fx-sync/tools/Preprocessor.py: Permission denied
make: *** [build] Error 126

This breaks Crossweave tests.

Comment 1

[Philipp von Weitershausen [:philikon]]

Looks like bug 574380 broke this. Richard, could you take a look please?

Comment 2

[Philipp von Weitershausen [:philikon]]

This is what I get on Windows 7:

/c/dev/fx-sync-main/tools/Preprocessor.py  -Dweave_channel="dev"  -Dweave_version="1.7b1pre"  -Dweav
e_id="{340c2bbc-ce74-4362-90b5-7c26312808ef}" /c/dev/fx-sync-main/services/sync/modules/constants.js
 > /c/dev/fx-sync-main/dist/stage/modules/constants.js
/c/dev/fx-sync-main/tools/Preprocessor.py: line 4:
This is a very primitive line based preprocessor, for times when using
a C preprocessor isn't an option.
: command not found
/c/dev/fx-sync-main/tools/Preprocessor.py: line 43: import: command not found
/c/dev/fx-sync-main/tools/Preprocessor.py: line 44: import: command not found
/c/dev/fx-sync-main/tools/Preprocessor.py: line 45: import: command not found
/c/dev/fx-sync-main/tools/Preprocessor.py: line 46: import: command not found
/c/dev/fx-sync-main/tools/Preprocessor.py: line 47: from: command not found
/c/dev/fx-sync-main/tools/Preprocessor.py: line 53: syntax error near unexpected token `sys.stdout.f
ileno'
/c/dev/fx-sync-main/tools/Preprocessor.py: line 53: `  msvcrt.setmode(sys.stdout.fileno(), os.O_BINA
RY)'
make: *** [build] Error 2

Comment 3

[Richard Newman [:rnewman]]

Attachment: Proposed patch. v1

We were using $(PYTHON), which is set by the MOZ_OBJDIR makefiles. CW (and Philipp!) didn't have MOZ_OBJDIR set, so not defined.

Patch attached uses "python" instead. Philipp's OK with it, so I am :D

Comment 4

[Philipp von Weitershausen [:philikon]]

Comment on attachment 509630 [details] [diff] [review]
Proposed patch. v1

*rubberstamp*

Comment 5

[Richard Newman [:rnewman]]

Pushed:

http://hg.mozilla.org/services/fx-sync/rev/faaa7d0c08fe

Comment 6

[Tracy Walker [:tracy]]

assumes crosseweave is no longer broken by this.