Skip to content
Browse files

Bug 971087 - Remove OS/2 support from comm-central: config. r=jcranmer

  • Loading branch information...
1 parent 8916fdc commit 320d70ea64a1ec72657fc1349ea8fb6db2c1b207 Sebastian Hengst committed Feb 25, 2014
Showing with 4 additions and 68 deletions.
  1. +2 −24 config/config.mk
  2. +2 −44 config/rules.mk
View
26 config/config.mk
@@ -396,10 +396,6 @@ endif
TAR_CREATE_FLAGS = -chf
-ifeq ($(OS_ARCH),OS2)
-TAR_CREATE_FLAGS = -cf
-endif
-
#
# Personal makefile customizations go in these optional make include files.
#
@@ -544,11 +540,7 @@ ifeq (xpconnect, $(findstring xpconnect, $(BUILD_MODULES)))
DEFINES += -DXPCONNECT_STANDALONE
endif
-ifeq ($(OS_ARCH),OS2)
-ELF_DYNSTR_GC = echo
-else
ELF_DYNSTR_GC = :
-endif
ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
OS_LIBS += $(MOZ_QT_LIBS)
@@ -595,9 +587,6 @@ endif # OS_ARCH=Darwin
# Set link flags according to whether we want a console.
ifdef MOZ_WINCONSOLE
ifeq ($(MOZ_WINCONSOLE),1)
-ifeq ($(OS_ARCH),OS2)
-BIN_FLAGS += -Zlinker -PM:VIO
-endif
ifeq ($(OS_ARCH),WINNT)
ifdef GNU_CC
WIN32_EXE_LDFLAGS += -mconsole
@@ -606,9 +595,6 @@ WIN32_EXE_LDFLAGS += -SUBSYSTEM:CONSOLE
endif
endif
else # MOZ_WINCONSOLE
-ifeq ($(OS_ARCH),OS2)
-BIN_FLAGS += -Zlinker -PM:PM
-endif
ifeq ($(OS_ARCH),WINNT)
ifdef GNU_CC
WIN32_EXE_LDFLAGS += -mwindows
@@ -662,19 +648,15 @@ NSINSTALL_NATIVECMD := %nsinstall nsinstall
ifdef NSINSTALL_BIN
NSINSTALL = $(NSINSTALL_BIN)
else
-ifeq (OS2,$(CROSS_COMPILE)$(OS_ARCH))
-NSINSTALL = $(MOZ_TOOLS_DIR)/nsinstall
-else
ifeq ($(HOST_OS_ARCH),WINNT)
NSINSTALL = $(NSINSTALL_PY)
else
NSINSTALL = $(CONFIG_TOOLS)/nsinstall$(HOST_BIN_SUFFIX)
endif # WINNT
-endif # OS2
endif # NSINSTALL_BIN
-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT OS2, $(OS_ARCH)))
+ifeq (,$(CROSS_COMPILE)$(filter-out WINNT, $(OS_ARCH)))
INSTALL = $(NSINSTALL) -t
ifdef .PYMAKE
install_cmd = $(NSINSTALL_NATIVECMD) -t $(1)
@@ -686,7 +668,7 @@ else
# target-specific.
INSTALL = $(if $(filter copy, $(NSDISTMODE)), $(NSINSTALL) -t, $(if $(filter absolute_symlink, $(NSDISTMODE)), $(NSINSTALL) -L $(PWD), $(NSINSTALL) -R))
-endif # WINNT/OS2
+endif # WINNT
# The default for install_cmd is simply INSTALL
install_cmd ?= $(INSTALL) $(1)
@@ -748,13 +730,9 @@ MERGE_FILE = $(LOCALE_SRCDIR)/$(1)
endif
MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
-ifeq (OS2,$(OS_ARCH))
-RUN_TEST_PROGRAM = $(MOZILLA_SRCDIR)/build/os2/test_os2.cmd "$(DIST)"
-else
ifneq (WINNT,$(OS_ARCH))
RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
endif # ! WINNT
-endif # ! OS2
CREATE_PRECOMPLETE_CMD = $(PYTHON) $(abspath $(MOZILLA_SRCDIR)/config/createprecomplete.py)
View
46 config/rules.mk
@@ -45,11 +45,7 @@ endif
REPORT_BUILD = $(info $(notdir $<))
-ifeq ($(OS_ARCH),OS2)
-EXEC =
-else
EXEC = exec
-endif
# Don't copy xulrunner files at install time, when using system xulrunner
ifdef SYSTEM_LIBXUL
@@ -142,26 +138,16 @@ ifdef LIB_IS_C_ONLY
MKSHLIB = $(MKCSHLIB)
endif
-ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+ifneq (,$(filter WINNT,$(OS_ARCH)))
IMPORT_LIBRARY := $(LIB_PREFIX)$(SHARED_LIBRARY_NAME).$(IMPORT_LIB_SUFFIX)
endif
-ifeq (OS2,$(OS_ARCH))
-ifdef SHORT_LIBNAME
-SHARED_LIBRARY_NAME := $(SHORT_LIBNAME)
-endif
-endif
-
ifdef MAKE_FRAMEWORK
SHARED_LIBRARY := $(SHARED_LIBRARY_NAME)
else
SHARED_LIBRARY := $(DLL_PREFIX)$(SHARED_LIBRARY_NAME)$(DLL_SUFFIX)
endif
-ifeq ($(OS_ARCH),OS2)
-DEF_FILE := $(SHARED_LIBRARY:.dll=.def)
-endif
-
EMBED_MANIFEST_AT=2
endif # MKSHLIB
@@ -637,7 +623,7 @@ ifndef NO_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)))
+ifneq (,$(filter WINNT,$(OS_ARCH)))
ifndef NO_INSTALL_IMPORT_LIBRARY
$(call install_cmd,$(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib)
endif
@@ -717,9 +703,6 @@ distclean::
$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) $(wildcard host_*.o*) \
$(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX)) \
$(wildcard *.$(IMPORT_LIB_SUFFIX))
-ifeq ($(OS_ARCH),OS2)
- -$(RM) $(PROGRAM:.exe=.map)
-endif
alltags:
$(RM) TAGS
@@ -845,27 +828,6 @@ ifeq ($(OS_ARCH),WINNT)
$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
endif
-ifeq ($(OS_ARCH),OS2)
-$(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS)
- $(RM) $@
- echo LIBRARY $(SHARED_LIBRARY_NAME) INITINSTANCE TERMINSTANCE > $@
- echo PROTMODE >> $@
- echo CODE LOADONCALL MOVEABLE DISCARDABLE >> $@
- echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@
- echo EXPORTS >> $@
-
- $(ADD_TO_DEF_FILE)
-
-ifdef MOZ_OS2_USE_DECLSPEC
-$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
-else
-$(IMPORT_LIBRARY): $(DEF_FILE)
-endif
- $(RM) $@
- $(IMPLIB) $@ $^
- $(RANLIB) $@
-endif # OS/2
-
$(HOST_LIBRARY): $(HOST_OBJS) Makefile
$(RM) $@
$(HOST_AR) $(HOST_AR_FLAGS) $(HOST_OBJS)
@@ -1038,15 +1000,11 @@ $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.m $(GLOBAL_DEPS)
%.res: %.rc
@echo Creating Resource file: $@
-ifeq ($(OS_ARCH),OS2)
- $(RC) $(RCFLAGS:-D%=-d %) -i $(subst /,\,$(srcdir)) -r $< $@
-else
ifdef GNU_CC
$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) $(OUTOPTION)$@ $(_VPATH_SRCS)
else
$(RC) $(RCFLAGS) -r $(DEFINES) $(INCLUDES) $(OUTOPTION)$@ $(_VPATH_SRCS)
endif
-endif
# need 3 separate lines for OS/2
%:: %.pl

0 comments on commit 320d70e

Please sign in to comment.
Something went wrong with that request. Please try again.