1172925 - Remove 'if test "$OS_TARGET" != "WINNT"; then...fi' in b2g/confvars.sh referred to by Bug 1171082

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[kdavis]

Bug 1171082 referred to code of the form

# Bug 1171082 - Broken on Windows B2G Desktop
if test "$OS_TARGET" != "WINNT"; then
# Other build code
fi

in b2g/confvars.sh used to protect windows B2G builds
as a result of a problem in Bug 1051146.

When Bug 1171082 was resolved Bug 1171082 indicated that
this code that protected windows B2G builds needed to be
removed.

So, the task of this bug is to remove this code leaving

# Other build code

Comment 1

[kdavis]

Attachment: Part 1 of 1: Patch re-enables pocketsphinx, sphinxbase, and models on Windows B2G builds

Part 1 of 1:  Patch re-enables pocketsphinx, sphinxbase, and models on Windows B2G builds

This patch is part 1 of 1 for this bug.

This patch removes the if/fi code from Bug 1171082 that prevented Pocketsphinx
and Sphinxbase from being built in a Windows B2G build. So, for the try the
only really important thing is that the B2G Windows builds work.

The try for this patch is running here https://treeherder.mozilla.org/#/jobs?repo=try&revision=1bacd5a9f082

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 8617743 [details] [diff] [review]
Part 1 of 1:  Patch re-enables pocketsphinx, sphinxbase, and models on Windows B2G builds

Review of attachment 8617743 [details] [diff] [review]:
-----------------------------------------------------------------

Sure.

Comment 3

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/c7aac47b78db

Comment 4

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/c7aac47b78db