Port |Bug 485409 - Substitute windows-style paths in configure when building with pymake| to comm-central

RESOLVED FIXED in Thunderbird 3.1b2

Status

defect
RESOLVED FIXED
9 years ago
9 years ago

People

(Reporter: Callek, Assigned: Callek)

Tracking

Trunk
Thunderbird 3.1b2
x86
Windows 2000
Dependency tree / graph
Bug Flags:
in-testsuite -

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments, 1 obsolete attachment)

Assignee

Description

9 years ago
No description provided.
Assignee

Comment 1

9 years ago
Posted patch v1, just copy it (obsolete) — Splinter Review
Ok, there seemed to be only one part of this worth ifdef-ing to 1_9_2. I did touch mail/ and calendar/ so sr of Mark. It is good to have two eyes on this though anyway.
Attachment #430804 - Flags: superreview?(bugzilla)
Attachment #430804 - Flags: review?(kairo)
Attachment #430804 - Flags: feedback?(sgautherie.bz)
Depends on: 521523
Flags: in-testsuite-
OS: Linux → Windows 2000
Attachment #430804 - Flags: feedback?(sgautherie.bz) → feedback-
Comment on attachment 430804 [details] [diff] [review]
v1, just copy it

>diff --git a/aclocal.m4 b/aclocal.m4
>+builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl

Won't this break with m-1.9.2?

>diff --git a/config/rules.mk b/config/rules.mk
> PWD := $(CURDIR)

Do we need to keep this?
http://mxr.mozilla.org/comm-central/search?string=PWD+%3A%5C%3D+%5C%24%5C%28CURDIR%5C%29&regexp=on&case=1

>-_VPATH_SRCS = $(if $(filter /%,$<),$<,$(PWD)/$<)
>+_VPATH_SRCS = $(abspath $<)

(I've no idea if it's safe for 1.9.2. Your call.)

>diff --git a/configure.in b/configure.in
>+        endif

'fi'!


Ftr, suite/installer/Makefile.in was already updated in bug 521523.
Assignee

Comment 3

9 years ago
(In reply to comment #2)
> (From update of attachment 430804 [details] [diff] [review])

aiui, the main changes here are safe for 1.9.2 but since this was a pymake compat change, we never updated for it.

Have not tested it in that config yet though.
Depends on: 518401
Comment on attachment 430804 [details] [diff] [review]
v1, just copy it

>diff --git a/configure.in b/configure.in
>+            PERL="/bin/sh ${MOZILLA_SRCDIR}/build/msys-perl-wrapper"

Use |${_topsrcdir}/mozilla| to port bug 518401 too.

Comment 5

9 years ago
Comment on attachment 430804 [details] [diff] [review]
v1, just copy it

>diff --git a/aclocal.m4 b/aclocal.m4
>+builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl

As Serge mentioned, this will not work on 1.9.2, unfortunately. The file doesn't exist there.

r- for that.


The preprocessor.pl -> Preprocessor.py changes are a good idea in any case and work everywhere, btw.
Attachment #430804 - Flags: review?(kairo) → review-
Assignee

Comment 6

9 years ago
This should actually do it right, this patch copies the two needed files to c-c (with relevant comments to make them findable once we branch)

Propose adding them to the build-port-tracker [for now] if this is acceptable.
Attachment #430804 - Attachment is obsolete: true
Attachment #431562 - Flags: superreview?(bugzilla)
Attachment #431562 - Flags: review?(kairo)
Attachment #430804 - Flags: superreview?(bugzilla)

Updated

9 years ago
Attachment #431562 - Flags: review?(kairo) → review+

Comment 7

9 years ago
Comment on attachment 431562 [details] [diff] [review]
v2, copy it right (no branch ifs)
[Checkin: Comment 14]

Hrm, not ideal, but as long as we can get rid of it after branching, I guess we can swallow it.
I'll add it to the tool as well.
Comment on attachment 431562 [details] [diff] [review]
v2, copy it right (no branch ifs)
[Checkin: Comment 14]

Whilst I don't quite like branching those files, it seems to work and doesn't break 1.9.2. sr=Standard8.
Attachment #431562 - Flags: superreview?(bugzilla) → superreview+
Assignee

Comment 9

9 years ago
Pushed as: http://hg.mozilla.org/comm-central/rev/f29f7dfd4b5a
Status: NEW → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
Assignee

Comment 10

9 years ago
(In reply to comment #8)
> (From update of attachment 431562 [details] [diff] [review])
> Whilst I don't quite like branching those files, it seems to work and doesn't
> break 1.9.2. sr=Standard8.

It seems to have broken 1.9.2; Mark any suggestions here; I'd like to get this back in for pymake compat.

backout: 

WINNT 5.2 comm-1.9.2 bloat on 2010/03/29 20:01:41:

make.exe[5]: Entering directory `/e/buildbot/comm-1.9.2-bloat-win32/build/objdir-tb/mail/test/mozmill'
echo /e/buildbot/comm-1.9.2-bloat-win32/build/mail/test/mozmill/runtest.py /e/buildbot/comm-1.9.2-bloat-win32/build/mail/test/mozmill/runtestlist.py /e/buildbot/comm-1.9.2-bloat-win32/build/mail/test/mozmill/mozmilltests.list automation.py /e/buildbot/comm-1.9.2-bloat-win32/build/mozilla/build/automationutils.py 
/e/buildbot/comm-1.9.2-bloat-win32/build/mail/test/mozmill/runtest.py /e/buildbot/comm-1.9.2-bloat-win32/build/mail/test/mozmill/runtestlist.py /e/buildbot/comm-1.9.2-bloat-win32/build/mail/test/mozmill/mozmilltests.list automation.py /e/buildbot/comm-1.9.2-bloat-win32/build/mozilla/build/automationutils.py
e:/buildbot/comm-1.9.2-bloat-win32/build/objdir-tb/mozilla/config/nsinstall.exe -D ../../../mozilla/_tests/mozmill
d:/mozilla-build/python25/python2.5.exe /e/buildbot/comm-1.9.2-bloat-win32/build/mozilla/config/Preprocessor.py \
	-DBROWSER_PATH=\"../../dist/bin/thunderbird.exe\" -DXPC_BIN_PATH=\"e:/buildbot/comm-1.9.2-bloat-win32/build/objdir-tb/mozilla/dist/bin\" -DBIN_SUFFIX=\".exe\" -DPROFILE_DIR=\"../../_profile/pgo\" -DCERTS_SRC_DIR=\"/e/buildbot/comm-1.9.2-bloat-win32/build/mozilla/build/pgo/certs\" -DSYMBOLS_PATH=\"../../dist/crashreporter-symbols\" -DPERL=\"/bin/sh /e/buildbot/comm-1.9.2-bloat-win32/build/build/msys-perl-wrapper\"  -DIS_MAC=0 -DIS_LINUX=0 -DIS_CAMINO=0 -DIS_TEST_BUILD=1 -DIS_DEBUG_BUILD=1 -DMOZ_THUNDERBIRD=1 -DOSTYPE=\"WINNT5.2\" -DOSARCH=WINNT -DMOZILLA_1_9_2_BRANCH=1 -D_CRT_SECURE_NO_DEPRECATE=1 -D_CRT_NONSTDC_NO_DEPRECATE=1 -DHAVE_WINSDKVER_H=1 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x0500 -DMOZ_WINSDK_TARGETVER=0x06010000 -DMOZ_NTDDI_WS03=0x05020000 -DMOZ_NTDDI_LONGHORN=0x06000000 -DMOZ_NTDDI_WIN7=0x06010000 -DX_DISPLAY_MISSING=1 -DMOZILLA_VERSION=\"1.9.2.2pre\" -DMOZILLA_VERSION_U=1.9.2.2pre -DHAVE_SNPRINTF=1 -D_WINDOWS=1 -DWIN32=1 -DXP_WIN=1 -DXP_WIN32=1 -DHW_THREADS=1 -DSTDC_HEADERS=1 -DWIN32_LEAN_AND_MEAN=1 -DNO_X11=1 -DHAVE_MMINTRIN_H=1 -D_X86_=1 -DD_INO=d_ino -DNS_ALWAYS_INLINE= -DNS_ATTR_MALLOC= -DNS_WARN_UNUSED_RESULT= -DNS_NORETURN= -DMALLOC_H=\<malloc.h\> -DHAVE_FORCEINLINE=1 -DMOZ_THUNDERBIRD=1 -DMOZ_BUILD_APP=mail -DMOZ_DISTRIBUTION_ID=\"org.mozilla\" -DIBMBIDI=1 -DMOZ_VIEW_SOURCE=1 -DACCESSIBILITY=1 -DMOZ_XPINSTALL=1 -DMOZ_JSLOADER=1 -DNS_PRINTING=1 -DMOZ_XTF=1 -DMOZ_CRASHREPORTER=1 -DMOZ_UPDATE_CHANNEL=default -DMOZ_FEEDS=1 -DMOZ_STORAGE=1 -DMOZ_SAFE_BROWSING=1 -DMOZ_URL_CLASSIFIER=1 -DMOZ_LOGGING=1 -DNS_TRACE_MALLOC=1 -DMOZ_USER_DIR=\"Mozilla\" -DMOZ_STATIC_MAIL_BUILD=1 -DMOZ_XUL=1 -DMOZ_PROFILELOCKING=1 -DMOZ_RDF=1 -DBUILD_CTYPES=1 -DMOZ_MORK=1 -DMOZ_DLL_SUFFIX=\".dll\"  /e/buildbot/comm-1.9.2-bloat-win32/build/mozilla/build/automation.py.in > automation.py
make.exe[5]: Leaving directory `/e/buildbot/comm-1.9.2-bloat-win32/build/objdir-tb/mail/test/mozmill'
make.exe[4]: Leaving directory `/e/buildbot/comm-1.9.2-bloat-win32/build/objdir-tb/mail'
Traceback (most recent call last):
  File "e:/buildbot/comm-1.9.2-bloat-win32/build/mozilla/config/Preprocessor.py", line 477, in <module>
    main()
  File "e:/buildbot/comm-1.9.2-bloat-win32/build/mozilla/config/Preprocessor.py", line 462, in main
    pp.handleCommandLine(None, True)
  File "e:/buildbot/comm-1.9.2-bloat-win32/build/mozilla/config/Preprocessor.py", line 168, in handleCommandLine
    self.do_include(f)
  File "e:/buildbot/comm-1.9.2-bloat-win32/build/mozilla/config/Preprocessor.py", line 430, in do_include
    raise Preprocessor.Error(self, 'FILE_NOT_FOUND', str(args))
__main__.Error: ('', 0, 'FILE_NOT_FOUND', 'e:/buildbot/comm-1.9.2-bloat-win32/build/build/msys-perl-wrapper"')
make.exe[5]: *** [automation.py] Error 1
make.exe[5]: *** Deleting file `automation.py'
make.exe[4]: *** [libs] Error 2
make.exe[3]: Leaving directory `/e/buildbot/comm-1.9.2-bloat-win32/build/objdir-tb'
make.exe[2]: Leaving directory `/e/buildbot/comm-1.9.2-bloat-win32/build/objdir-tb'
make.exe[3]: *** [libs_tier_app] Error 2
make.exe[2]: *** [tier_app] Error 2
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Assignee

Comment 13

9 years ago
(In reply to comment #12)
> see-also: https://bugzilla.mozilla.org/show_bug.cgi?id=485409#c11

That is the fix we need, but I also *just* noticed Bug 518401 has a change to the syntax I used here that we'll also need; I'll feel safe with KaiRo reviewing just that one change, and I'll attach here tomorrow. (While I wait for the approval from Bug 485409)
Assignee

Comment 14

9 years ago
Pushed dependant fix from Bug 485409
Re-Pushed this as: http://hg.mozilla.org/comm-central/rev/bb54eb43ff45
Assignee

Comment 15

9 years ago
(In reply to comment #13)
> ..., but I also *just* noticed Bug 518401 has a change to the syntax I used here that we'll also need;

Whops, forgot about this.

> ... and I'll attach here tomorrow.

Famous last words. (If this turns out to be needed; I'm going to land without review; and get post-landing review though; full disclosure)
Attachment #436839 - Flags: review?(kairo)

Updated

9 years ago
Attachment #436839 - Flags: review?(kairo) → review+
Yep, it's needed. A build without the patch fails because {srcdir} is relative.
Assignee

Updated

9 years ago
Attachment #430804 - Flags: feedback-
Assignee

Comment 17

9 years ago
(In reply to comment #16)
> Yep, it's needed. A build without the patch fails because {srcdir} is relative.

Thanks for the poke on this.
Pushed as: http://hg.mozilla.org/comm-central/rev/2e2ea98b2f71
Assignee

Updated

9 years ago
Status: REOPENED → RESOLVED
Closed: 9 years ago9 years ago
Resolution: --- → FIXED
Attachment #436839 - Attachment description: That additional patch. → That additional patch [Checkin: Comment 17]
Attachment #431562 - Attachment description: v2, copy it right (no branch ifs) → v2, copy it right (no branch ifs) [Checkin: Comment 14]
Target Milestone: --- → Thunderbird 3.1b2
Assignee

Updated

9 years ago
Blocks: 566167
You need to log in before you can comment on or make changes to this bug.