Closed Bug 971087 Opened 7 years ago Closed 7 years ago

Remove OS/2 support from comm-central

Categories

(MailNews Core :: Build Config, enhancement)

All
OS/2
enhancement
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird 30.0

People

(Reporter: aryx, Assigned: aryx)

References

Details

Attachments

(8 files, 7 obsolete files)

8.76 KB, patch
Details | Diff | Splinter Review
2.86 KB, patch
Details | Diff | Splinter Review
26.95 KB, patch
Details | Diff | Splinter Review
13.79 KB, patch
Details | Diff | Splinter Review
5.74 KB, patch
Details | Diff | Splinter Review
1.57 KB, patch
Details | Diff | Splinter Review
31.64 KB, patch
Details | Diff | Splinter Review
1.31 KB, patch
Details | Diff | Splinter Review
In bug 969757, the code which should support OS/2 has been removed from mozilla-central. It also mentioned that the OS/2 port people don't want to upgrade to mozilla-central and that the people responsible likely won't accept patches to add it again to the tree.

Third-party libraries should remain untouched.
Attached patch im, v1 (obsolete) — Splinter Review
Attachment #8377445 - Flags: review?(florian)
Attached patch mailnews, v1 (obsolete) — Splinter Review
Attachment #8377446 - Flags: review?(mnyromyr)
Attachment #8377446 - Flags: review?(mbanner)
Attached patch mail, v1 (obsolete) — Splinter Review
Attachment #8377447 - Flags: review?(Pidgeot18)
Attached patch mork, v1 (obsolete) — Splinter Review
Attachment #8377448 - Flags: review?(Pidgeot18)
Attached patch otherlicenses, v1 (obsolete) — Splinter Review
Attachment #8377449 - Flags: review?(mbanner)
Attached patch suite, v1 (obsolete) — Splinter Review
Attachment #8377450 - Flags: review?(neil)
Comment on attachment 8377450 [details] [diff] [review]
suite, v1

r=me if this doesn't cause any packaging errors (I don't know whether the packager will complain about DOM Inspector having an unpackaged icon).
Attachment #8377450 - Flags: review?(neil) → review+
Comment on attachment 8377448 [details] [diff] [review]
mork, v1

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

So... much... cruft...
Attachment #8377448 - Flags: review?(Pidgeot18) → review+
Comment on attachment 8377445 [details] [diff] [review]
im, v1

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

Looks good, thanks!

::: im/app/Makefile.in
@@ +41,5 @@
>      $(srcdir)/profile/all-instantbird.js \
>      $(srcdir)/profile/channel-prefs.js \
>      $(NULL)
>  
> +ifeq ($(OS_ARCH),WINNT)

Warning: We will likely touch this same code when fixing bug 973385, so we may bitrot each other.
Attachment #8377445 - Flags: review?(florian) → review+
Comment on attachment 8377447 [details] [diff] [review]
mail, v1

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

::: mail/app/Makefile.in
@@ +144,5 @@
>  libs::
>  	cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
>  
>  GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js)
>  endif # ! OS 2 or WinNT

I think you want to change this comment.
Comment on attachment 8377445 [details] [diff] [review]
im, v1

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

::: im/app/Makefile.in
@@ +172,5 @@
>  libs::
>  	cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
>  
>  GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-instantbird.js channel-prefs.js chat-prefs.js)
>  endif # ! OS 2 or WinNT

This comment should be edited.
Comment on attachment 8377447 [details] [diff] [review]
mail, v1

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

I'm going to punt this patch to Standard8 instead.
Attachment #8377447 - Flags: review?(Pidgeot18) → review?(mbanner)
Comment on attachment 8377444 [details] [diff] [review]
config, v1

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

::: config/config.mk
@@ -674,4 @@
>  endif # NSINSTALL_BIN
>  
>  
> -ifeq (,$(CROSS_COMPILE)$(filter-out WINNT OS2, $(OS_ARCH)))

Please just remove the OS2 bit here, minimal changes are better. (This aligns with m-c's config/config.mk better too).

::: config/rules.mk
@@ -141,5 @@
>  ifdef LIB_IS_C_ONLY
>  MKSHLIB			= $(MKCSHLIB)
>  endif
>  
> -ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))

Similarly, just drop the OS2 here.

@@ -636,5 @@
>  	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest "manifest components/components.manifest")
>  	$(call py_action,buildlist,$(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)")
>  endif
>  else # ! IS_COMPONENT
> -ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))

ditto.
Attachment #8377444 - Flags: review?(Pidgeot18) → review+
Attachment #8377446 - Flags: review?(mnyromyr)
Attachment #8377446 - Flags: review?(mbanner)
Attachment #8377446 - Flags: review+
Attachment #8377447 - Flags: review?(mbanner) → review+
Attachment #8377449 - Flags: review?(mbanner) → review+
Attachment #8377448 - Attachment is obsolete: true
Attachment #8377449 - Attachment is obsolete: true
Status: RESOLVED → REOPENED
Keywords: checkin-needed
Resolution: FIXED → ---
Whiteboard: [please check in followup patch]
https://hg.mozilla.org/comm-central/rev/44bf03090cf6
Status: REOPENED → RESOLVED
Closed: 7 years ago7 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
Whiteboard: [please check in followup patch]
(In reply to neil@parkwaycc.co.uk from comment #8)
> Comment on attachment 8377450 [details] [diff] [review]
> suite, v1
> 
> r=me if this doesn't cause any packaging errors (I don't know whether the
> packager will complain about DOM Inspector having an unpackaged icon).
Something tells me you didn't test make package and/or make installer

mozmake[2]: Entering directory 'c:/t1/hg/objdir-sm/suite/installer'
C:/DEV/mozilla-build/msys/local/bin/mozmake make-package-internal
mozmake[3]: Entering directory 'c:/t1/hg/objdir-sm/suite/installer'
OMNIJAR_NAME=omni.ja \
c:/t1/hg/objdir-sm/mozilla/_virtualenv/Scripts/python.exe c:/t1/hg/comm-central/mozilla/toolkit/mozapps/instal
ler/packager.py -DOSTYPE=\"WINNT6.1\" -DOSARCH=WINNT -DNO_NSPR_10_SUPPORT -DAB_CD=en-US -DMOZ_APP_NAME=seamonk
ey -DPREF_DIR=defaults/pref -DJAREXT= -DENABLE_TESTS=1 -DMOZ_ANGLE_RENDERER=1 -DMOZ_D3DCOMPILER_DLL=D3DCompile
r_43.dll -DMOZ_PACKAGE_DEBUGQA=1 -D_MSC_VER=1600 -DMOZ_URL_CLASSIFIER=1 -DMOZ_UPDATER=1 -DNECKO_WIFI=1 -DMOZ_S
HARED_MOZGLUE=1 -DMOZ_CHILD_PROCESS_NAME=plugin-container.exe -DDLL_PREFIX= -DDLL_SUFFIX=.dll -DBIN_SUFFIX=.ex
e -DMOZ_FOLD_LIBS=1 -DBINPATH=bin \
        --format omni \
        --removals c:/t1/hg/comm-central/suite/installer/removed-files.in \
         \
         \
         \
        --optimizejars \
         \
        package-manifest ../../mozilla/dist ../../mozilla/dist/seamonkey \
        --non-resource defaults/messenger/mailViews.dat defaults/profile/localstore.rdf defaults/profile/panel
s.rdf
Traceback (most recent call last):
  File "c:/t1/hg/comm-central/mozilla/toolkit/mozapps/installer/packager.py", line 375, in <module>
    main()
  File "c:/t1/hg/comm-central/mozilla/toolkit/mozapps/installer/packager.py", line 327, in main
    preprocess(removals_in, removals, defines)
  File "c:\t1\hg\comm-central\mozilla\python\mozbuild\mozpack\packager\__init__.py", line 190, in preprocess
    pp.do_include(input)
  File "c:\t1\hg\comm-central\mozilla\python\mozbuild\mozbuild\preprocessor.py", line 774, in do_include
    self.handleLine(l)
  File "c:\t1\hg\comm-central\mozilla\python\mozbuild\mozbuild\preprocessor.py", line 548, in handleLine
    cmd(args)
  File "c:\t1\hg\comm-central\mozilla\python\mozbuild\mozbuild\preprocessor.py", line 664, in do_endif
    self.ifStates.pop()
IndexError: pop from empty list
c:/t1/hg/comm-central/mozilla/toolkit/mozapps/installer/packager.mk:706: recipe for target 'stage-package' failed
mozmake[3]: *** [stage-package] Error 1
mozmake[3]: Leaving directory 'c:/t1/hg/objdir-sm/suite/installer'
c:/t1/hg/comm-central/mozilla/toolkit/mozapps/installer/packager.mk:735: recipe for target 'make-package' failed
mozmake[2]: *** [make-package] Error 2
mozmake[2]: Leaving directory 'c:/t1/hg/objdir-sm/suite/installer'
c:/t1/hg/comm-central/config/rules.mk:512: recipe for target 'all' failed
mozmake[1]: *** [all] Error 2
mozmake[1]: Leaving directory 'c:/t1/hg/objdir-sm/suite/installer'
c:/t1/hg/comm-central/suite/build.mk:16: recipe for target 'package' failed
mozmake: *** [package] Error 2
Depends on: 977626
You need to log in before you can comment on or make changes to this bug.