Bug 917270 - Rename widget/gtk2 to widget/gtk. r=karlt
authorMartin Stransky <stransky@redhat.com>
Mon, 23 Sep 2013 09:21:57 -0400
changeset 162107 4aa7d035c1af860bb6d7926877b84f5075624d6f
parent 162106 7af33dde6db7181ed41dfd37fd91d463100fd6e5
child 162108 bcf0a8ffb8e8091532295e44dd81b5e98929ca00
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
bugs917270
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 917270 - Rename widget/gtk2 to widget/gtk. r=karlt
config/config.mk
js/src/config/config.mk
testing/crashtest/crashtests.list
widget/gtk/Makefile.in
widget/gtk/WidgetTraceEvent.cpp
widget/gtk/compat/gdk/gdkdnd.h
widget/gtk/compat/gdk/gdkkeysyms.h
widget/gtk/compat/gdk/gdkvisual.h
widget/gtk/compat/gdk/gdkwindow.h
widget/gtk/compat/gdk/gdkx.h
widget/gtk/compat/glib/gmem.h
widget/gtk/compat/gtk/gtkcolorseldialog.h
widget/gtk/compat/gtk/gtkdialog.h
widget/gtk/compat/gtk/gtkplug.h
widget/gtk/compat/gtk/gtkselection.h
widget/gtk/compat/gtk/gtkwidget.h
widget/gtk/compat/gtk/gtkwindow.h
widget/gtk/crashtests/673390-1.html
widget/gtk/crashtests/crashtests.list
widget/gtk/gtk2drawing.c
widget/gtk/gtk3drawing.c
widget/gtk/gtkdrawing.h
widget/gtk/maiRedundantObjectFactory.c
widget/gtk/maiRedundantObjectFactory.h
widget/gtk/moz.build
widget/gtk/mozcontainer.c
widget/gtk/mozcontainer.h
widget/gtk/nsAppShell.cpp
widget/gtk/nsAppShell.h
widget/gtk/nsBidiKeyboard.cpp
widget/gtk/nsBidiKeyboard.h
widget/gtk/nsCUPSShim.cpp
widget/gtk/nsCUPSShim.h
widget/gtk/nsClipboard.cpp
widget/gtk/nsClipboard.h
widget/gtk/nsColorPicker.cpp
widget/gtk/nsColorPicker.h
widget/gtk/nsDeviceContextSpecG.cpp
widget/gtk/nsDeviceContextSpecG.h
widget/gtk/nsDragService.cpp
widget/gtk/nsDragService.h
widget/gtk/nsFilePicker.cpp
widget/gtk/nsFilePicker.h
widget/gtk/nsGTKToolkit.h
widget/gtk/nsGtkCursors.h
widget/gtk/nsGtkIMModule.cpp
widget/gtk/nsGtkIMModule.h
widget/gtk/nsGtkKeyUtils.cpp
widget/gtk/nsGtkKeyUtils.h
widget/gtk/nsGtkUtils.h
widget/gtk/nsIImageToPixbuf.h
widget/gtk/nsIdleServiceGTK.cpp
widget/gtk/nsIdleServiceGTK.h
widget/gtk/nsImageToPixbuf.cpp
widget/gtk/nsImageToPixbuf.h
widget/gtk/nsLookAndFeel.cpp
widget/gtk/nsLookAndFeel.h
widget/gtk/nsNativeKeyBindings.cpp
widget/gtk/nsNativeKeyBindings.h
widget/gtk/nsNativeThemeGTK.cpp
widget/gtk/nsNativeThemeGTK.h
widget/gtk/nsPSPrinters.cpp
widget/gtk/nsPSPrinters.h
widget/gtk/nsPaperPS.cpp
widget/gtk/nsPaperPS.h
widget/gtk/nsPrintDialogGTK.cpp
widget/gtk/nsPrintDialogGTK.h
widget/gtk/nsPrintOptionsGTK.cpp
widget/gtk/nsPrintOptionsGTK.h
widget/gtk/nsPrintSettingsGTK.cpp
widget/gtk/nsPrintSettingsGTK.h
widget/gtk/nsScreenGtk.cpp
widget/gtk/nsScreenGtk.h
widget/gtk/nsScreenManagerGtk.cpp
widget/gtk/nsScreenManagerGtk.h
widget/gtk/nsSound.cpp
widget/gtk/nsSound.h
widget/gtk/nsToolkit.cpp
widget/gtk/nsWidgetFactory.cpp
widget/gtk/nsWindow.cpp
widget/gtk/nsWindow.h
widget/gtk2/Makefile.in
widget/gtk2/WidgetTraceEvent.cpp
widget/gtk2/compat/gdk/gdkdnd.h
widget/gtk2/compat/gdk/gdkkeysyms.h
widget/gtk2/compat/gdk/gdkvisual.h
widget/gtk2/compat/gdk/gdkwindow.h
widget/gtk2/compat/gdk/gdkx.h
widget/gtk2/compat/glib/gmem.h
widget/gtk2/compat/gtk/gtkcolorseldialog.h
widget/gtk2/compat/gtk/gtkdialog.h
widget/gtk2/compat/gtk/gtkplug.h
widget/gtk2/compat/gtk/gtkselection.h
widget/gtk2/compat/gtk/gtkwidget.h
widget/gtk2/compat/gtk/gtkwindow.h
widget/gtk2/crashtests/673390-1.html
widget/gtk2/crashtests/crashtests.list
widget/gtk2/gtk2drawing.c
widget/gtk2/gtk3drawing.c
widget/gtk2/gtkdrawing.h
widget/gtk2/maiRedundantObjectFactory.c
widget/gtk2/maiRedundantObjectFactory.h
widget/gtk2/moz.build
widget/gtk2/mozcontainer.c
widget/gtk2/mozcontainer.h
widget/gtk2/nsAppShell.cpp
widget/gtk2/nsAppShell.h
widget/gtk2/nsBidiKeyboard.cpp
widget/gtk2/nsBidiKeyboard.h
widget/gtk2/nsCUPSShim.cpp
widget/gtk2/nsCUPSShim.h
widget/gtk2/nsClipboard.cpp
widget/gtk2/nsClipboard.h
widget/gtk2/nsColorPicker.cpp
widget/gtk2/nsColorPicker.h
widget/gtk2/nsDeviceContextSpecG.cpp
widget/gtk2/nsDeviceContextSpecG.h
widget/gtk2/nsDragService.cpp
widget/gtk2/nsDragService.h
widget/gtk2/nsFilePicker.cpp
widget/gtk2/nsFilePicker.h
widget/gtk2/nsGTKToolkit.h
widget/gtk2/nsGtkCursors.h
widget/gtk2/nsGtkIMModule.cpp
widget/gtk2/nsGtkIMModule.h
widget/gtk2/nsGtkKeyUtils.cpp
widget/gtk2/nsGtkKeyUtils.h
widget/gtk2/nsGtkUtils.h
widget/gtk2/nsIImageToPixbuf.h
widget/gtk2/nsIdleServiceGTK.cpp
widget/gtk2/nsIdleServiceGTK.h
widget/gtk2/nsImageToPixbuf.cpp
widget/gtk2/nsImageToPixbuf.h
widget/gtk2/nsLookAndFeel.cpp
widget/gtk2/nsLookAndFeel.h
widget/gtk2/nsNativeKeyBindings.cpp
widget/gtk2/nsNativeKeyBindings.h
widget/gtk2/nsNativeThemeGTK.cpp
widget/gtk2/nsNativeThemeGTK.h
widget/gtk2/nsPSPrinters.cpp
widget/gtk2/nsPSPrinters.h
widget/gtk2/nsPaperPS.cpp
widget/gtk2/nsPaperPS.h
widget/gtk2/nsPrintDialogGTK.cpp
widget/gtk2/nsPrintDialogGTK.h
widget/gtk2/nsPrintOptionsGTK.cpp
widget/gtk2/nsPrintOptionsGTK.h
widget/gtk2/nsPrintSettingsGTK.cpp
widget/gtk2/nsPrintSettingsGTK.h
widget/gtk2/nsScreenGtk.cpp
widget/gtk2/nsScreenGtk.h
widget/gtk2/nsScreenManagerGtk.cpp
widget/gtk2/nsScreenManagerGtk.h
widget/gtk2/nsSound.cpp
widget/gtk2/nsSound.h
widget/gtk2/nsToolkit.cpp
widget/gtk2/nsWidgetFactory.cpp
widget/gtk2/nsWindow.cpp
widget/gtk2/nsWindow.h
widget/moz.build
widget/xpwidgets/Makefile.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -792,18 +792,18 @@ EXPAND_LIBNAME = $(foreach lib,$(1),$(LI
 endif
 EXPAND_LIBNAME_PATH = $(foreach lib,$(1),$(2)/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
 EXPAND_MOZLIBNAME = $(foreach lib,$(1),$(DIST)/lib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
 
 PLY_INCLUDE = -I$(topsrcdir)/other-licenses/ply
 
 export CL_INCLUDES_PREFIX
 
-ifeq ($(MOZ_WIDGET_GTK),2)
-MOZ_GTK2_CFLAGS := -I$(topsrcdir)/widget/gtk2/compat $(MOZ_GTK2_CFLAGS)
+ifdef MOZ_GTK2_CFLAGS
+MOZ_GTK2_CFLAGS := -I$(topsrcdir)/widget/gtk/compat $(MOZ_GTK2_CFLAGS)
 endif
 
 DEFINES += -DNO_NSPR_10_SUPPORT
 
 # Run a named Python build action. The first argument is the name of the build
 # action. The second argument are the arguments to pass to the action (space
 # delimited arguments). e.g.
 #
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -792,18 +792,18 @@ EXPAND_LIBNAME = $(foreach lib,$(1),$(LI
 endif
 EXPAND_LIBNAME_PATH = $(foreach lib,$(1),$(2)/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
 EXPAND_MOZLIBNAME = $(foreach lib,$(1),$(DIST)/lib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
 
 PLY_INCLUDE = -I$(topsrcdir)/other-licenses/ply
 
 export CL_INCLUDES_PREFIX
 
-ifeq ($(MOZ_WIDGET_GTK),2)
-MOZ_GTK2_CFLAGS := -I$(topsrcdir)/widget/gtk2/compat $(MOZ_GTK2_CFLAGS)
+ifdef MOZ_GTK2_CFLAGS
+MOZ_GTK2_CFLAGS := -I$(topsrcdir)/widget/gtk/compat $(MOZ_GTK2_CFLAGS)
 endif
 
 DEFINES += -DNO_NSPR_10_SUPPORT
 
 # Run a named Python build action. The first argument is the name of the build
 # action. The second argument are the arguments to pass to the action (space
 # delimited arguments). e.g.
 #
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -60,14 +60,14 @@ include ../../dom/plugins/test/crashtest
 
 include ../../parser/htmlparser/tests/crashtests/crashtests.list
 
 include ../../security/manager/ssl/crashtests/crashtests.list
 
 include ../../view/crashtests/crashtests.list
 
 include ../../widget/cocoa/crashtests/crashtests.list
-include ../../widget/gtk2/crashtests/crashtests.list
+include ../../widget/gtk/crashtests/crashtests.list
 include ../../widget/crashtests/crashtests.list
 
 include ../../media/libpng/crashtests/crashtests.list
 
 include ../../xpcom/string/crashtests/crashtests.list
rename from widget/gtk2/Makefile.in
rename to widget/gtk/Makefile.in
rename from widget/gtk2/WidgetTraceEvent.cpp
rename to widget/gtk/WidgetTraceEvent.cpp
rename from widget/gtk2/compat/gdk/gdkdnd.h
rename to widget/gtk/compat/gdk/gdkdnd.h
rename from widget/gtk2/compat/gdk/gdkkeysyms.h
rename to widget/gtk/compat/gdk/gdkkeysyms.h
rename from widget/gtk2/compat/gdk/gdkvisual.h
rename to widget/gtk/compat/gdk/gdkvisual.h
rename from widget/gtk2/compat/gdk/gdkwindow.h
rename to widget/gtk/compat/gdk/gdkwindow.h
rename from widget/gtk2/compat/gdk/gdkx.h
rename to widget/gtk/compat/gdk/gdkx.h
rename from widget/gtk2/compat/glib/gmem.h
rename to widget/gtk/compat/glib/gmem.h
rename from widget/gtk2/compat/gtk/gtkcolorseldialog.h
rename to widget/gtk/compat/gtk/gtkcolorseldialog.h
rename from widget/gtk2/compat/gtk/gtkdialog.h
rename to widget/gtk/compat/gtk/gtkdialog.h
rename from widget/gtk2/compat/gtk/gtkplug.h
rename to widget/gtk/compat/gtk/gtkplug.h
rename from widget/gtk2/compat/gtk/gtkselection.h
rename to widget/gtk/compat/gtk/gtkselection.h
rename from widget/gtk2/compat/gtk/gtkwidget.h
rename to widget/gtk/compat/gtk/gtkwidget.h
rename from widget/gtk2/compat/gtk/gtkwindow.h
rename to widget/gtk/compat/gtk/gtkwindow.h
rename from widget/gtk2/crashtests/673390-1.html
rename to widget/gtk/crashtests/673390-1.html
rename from widget/gtk2/crashtests/crashtests.list
rename to widget/gtk/crashtests/crashtests.list
rename from widget/gtk2/gtk2drawing.c
rename to widget/gtk/gtk2drawing.c
rename from widget/gtk2/gtk3drawing.c
rename to widget/gtk/gtk3drawing.c
rename from widget/gtk2/gtkdrawing.h
rename to widget/gtk/gtkdrawing.h
rename from widget/gtk2/maiRedundantObjectFactory.c
rename to widget/gtk/maiRedundantObjectFactory.c
rename from widget/gtk2/maiRedundantObjectFactory.h
rename to widget/gtk/maiRedundantObjectFactory.h
rename from widget/gtk2/moz.build
rename to widget/gtk/moz.build
rename from widget/gtk2/mozcontainer.c
rename to widget/gtk/mozcontainer.c
rename from widget/gtk2/mozcontainer.h
rename to widget/gtk/mozcontainer.h
rename from widget/gtk2/nsAppShell.cpp
rename to widget/gtk/nsAppShell.cpp
rename from widget/gtk2/nsAppShell.h
rename to widget/gtk/nsAppShell.h
rename from widget/gtk2/nsBidiKeyboard.cpp
rename to widget/gtk/nsBidiKeyboard.cpp
rename from widget/gtk2/nsBidiKeyboard.h
rename to widget/gtk/nsBidiKeyboard.h
rename from widget/gtk2/nsCUPSShim.cpp
rename to widget/gtk/nsCUPSShim.cpp
rename from widget/gtk2/nsCUPSShim.h
rename to widget/gtk/nsCUPSShim.h
rename from widget/gtk2/nsClipboard.cpp
rename to widget/gtk/nsClipboard.cpp
rename from widget/gtk2/nsClipboard.h
rename to widget/gtk/nsClipboard.h
rename from widget/gtk2/nsColorPicker.cpp
rename to widget/gtk/nsColorPicker.cpp
rename from widget/gtk2/nsColorPicker.h
rename to widget/gtk/nsColorPicker.h
rename from widget/gtk2/nsDeviceContextSpecG.cpp
rename to widget/gtk/nsDeviceContextSpecG.cpp
rename from widget/gtk2/nsDeviceContextSpecG.h
rename to widget/gtk/nsDeviceContextSpecG.h
rename from widget/gtk2/nsDragService.cpp
rename to widget/gtk/nsDragService.cpp
rename from widget/gtk2/nsDragService.h
rename to widget/gtk/nsDragService.h
rename from widget/gtk2/nsFilePicker.cpp
rename to widget/gtk/nsFilePicker.cpp
rename from widget/gtk2/nsFilePicker.h
rename to widget/gtk/nsFilePicker.h
rename from widget/gtk2/nsGTKToolkit.h
rename to widget/gtk/nsGTKToolkit.h
rename from widget/gtk2/nsGtkCursors.h
rename to widget/gtk/nsGtkCursors.h
rename from widget/gtk2/nsGtkIMModule.cpp
rename to widget/gtk/nsGtkIMModule.cpp
rename from widget/gtk2/nsGtkIMModule.h
rename to widget/gtk/nsGtkIMModule.h
rename from widget/gtk2/nsGtkKeyUtils.cpp
rename to widget/gtk/nsGtkKeyUtils.cpp
rename from widget/gtk2/nsGtkKeyUtils.h
rename to widget/gtk/nsGtkKeyUtils.h
rename from widget/gtk2/nsGtkUtils.h
rename to widget/gtk/nsGtkUtils.h
rename from widget/gtk2/nsIImageToPixbuf.h
rename to widget/gtk/nsIImageToPixbuf.h
rename from widget/gtk2/nsIdleServiceGTK.cpp
rename to widget/gtk/nsIdleServiceGTK.cpp
rename from widget/gtk2/nsIdleServiceGTK.h
rename to widget/gtk/nsIdleServiceGTK.h
rename from widget/gtk2/nsImageToPixbuf.cpp
rename to widget/gtk/nsImageToPixbuf.cpp
rename from widget/gtk2/nsImageToPixbuf.h
rename to widget/gtk/nsImageToPixbuf.h
rename from widget/gtk2/nsLookAndFeel.cpp
rename to widget/gtk/nsLookAndFeel.cpp
rename from widget/gtk2/nsLookAndFeel.h
rename to widget/gtk/nsLookAndFeel.h
rename from widget/gtk2/nsNativeKeyBindings.cpp
rename to widget/gtk/nsNativeKeyBindings.cpp
rename from widget/gtk2/nsNativeKeyBindings.h
rename to widget/gtk/nsNativeKeyBindings.h
rename from widget/gtk2/nsNativeThemeGTK.cpp
rename to widget/gtk/nsNativeThemeGTK.cpp
rename from widget/gtk2/nsNativeThemeGTK.h
rename to widget/gtk/nsNativeThemeGTK.h
rename from widget/gtk2/nsPSPrinters.cpp
rename to widget/gtk/nsPSPrinters.cpp
rename from widget/gtk2/nsPSPrinters.h
rename to widget/gtk/nsPSPrinters.h
rename from widget/gtk2/nsPaperPS.cpp
rename to widget/gtk/nsPaperPS.cpp
rename from widget/gtk2/nsPaperPS.h
rename to widget/gtk/nsPaperPS.h
rename from widget/gtk2/nsPrintDialogGTK.cpp
rename to widget/gtk/nsPrintDialogGTK.cpp
rename from widget/gtk2/nsPrintDialogGTK.h
rename to widget/gtk/nsPrintDialogGTK.h
rename from widget/gtk2/nsPrintOptionsGTK.cpp
rename to widget/gtk/nsPrintOptionsGTK.cpp
rename from widget/gtk2/nsPrintOptionsGTK.h
rename to widget/gtk/nsPrintOptionsGTK.h
rename from widget/gtk2/nsPrintSettingsGTK.cpp
rename to widget/gtk/nsPrintSettingsGTK.cpp
rename from widget/gtk2/nsPrintSettingsGTK.h
rename to widget/gtk/nsPrintSettingsGTK.h
rename from widget/gtk2/nsScreenGtk.cpp
rename to widget/gtk/nsScreenGtk.cpp
rename from widget/gtk2/nsScreenGtk.h
rename to widget/gtk/nsScreenGtk.h
rename from widget/gtk2/nsScreenManagerGtk.cpp
rename to widget/gtk/nsScreenManagerGtk.cpp
rename from widget/gtk2/nsScreenManagerGtk.h
rename to widget/gtk/nsScreenManagerGtk.h
rename from widget/gtk2/nsSound.cpp
rename to widget/gtk/nsSound.cpp
rename from widget/gtk2/nsSound.h
rename to widget/gtk/nsSound.h
rename from widget/gtk2/nsToolkit.cpp
rename to widget/gtk/nsToolkit.cpp
rename from widget/gtk2/nsWidgetFactory.cpp
rename to widget/gtk/nsWidgetFactory.cpp
rename from widget/gtk2/nsWindow.cpp
rename to widget/gtk/nsWindow.cpp
rename from widget/gtk2/nsWindow.h
rename to widget/gtk/nsWindow.h
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -50,17 +50,17 @@ TEST_TOOL_DIRS += ['tests']
 
 # Don't build the DSO under the 'build' directory as windows does.
 #
 # The DSOs get built in the toolkit dir itself.  Do this so that
 # multiple implementations of widget can be built on the same
 # source tree.
 #
 if CONFIG['MOZ_ENABLE_GTK']:
-    DIRS += ['gtk2']
+    DIRS += ['gtk']
 
     if CONFIG['MOZ_X11']:
         DIRS += ['gtkxtbin']
 
 XPIDL_SOURCES += [
     'nsIAppShell.idl',
     'nsIBaseWindow.idl',
     'nsIBidiKeyboard.idl',
--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@@ -7,20 +7,20 @@ SHARED_LIBRARY_LIBS = ../shared/$(LIB_PR
 ifdef MOZ_X11
 SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX)
 endif
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES		+= -DMOZ_ENABLE_D3D10_LAYER
 endif
 
-ifneq (,$(filter gtk3,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter gtk3 gtk2,$(MOZ_WIDGET_TOOLKIT)))
 # gtk3 shares includes with gtk2
 LOCAL_INCLUDES	+= \
-		-I$(srcdir)/../gtk2 \
+		-I$(srcdir)/../gtk \
 		$(NULL)
 else
 LOCAL_INCLUDES	+= \
  		-I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \
 		$(NULL)
 endif
 
 LOCAL_INCLUDES	+= \