Bug 571989 part 2: Fold gfx/public and gfx/idl into gfx/src.
authorZack Weinberg <zweinberg@mozilla.com>
Mon, 28 Jun 2010 10:36:20 -0700
changeset 46351 6a6fbf66e1e01b945cfa1b59d2a9e7717504b8b1
parent 46350 72b5eccbe07c8a83b17b1c5e97f3b7fb8fe115a2
child 46352 0e46aa941e64fa28b27c749685c0cd14f3573c52
push idunknown
push userunknown
push dateunknown
bugs571989
milestone1.9.3a6pre
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 571989 part 2: Fold gfx/public and gfx/idl into gfx/src.
gfx/Makefile.in
gfx/idl/Makefile.in
gfx/idl/geniid.pl
gfx/idl/gfxIFormats.idl
gfx/idl/gfxidltypes.idl
gfx/idl/nsIFontEnumerator.idl
gfx/idl/nsIScriptableRegion.idl
gfx/public/Makefile.in
gfx/public/X11Util.h
gfx/public/gfxCore.h
gfx/public/nsColor.h
gfx/public/nsColorNameList.h
gfx/public/nsColorNames.h
gfx/public/nsCoord.h
gfx/public/nsFont.h
gfx/public/nsGfxCIID.h
gfx/public/nsIDeviceContext.h
gfx/public/nsIFontMetrics.h
gfx/public/nsIRegion.h
gfx/public/nsIRenderingContext.h
gfx/public/nsITheme.h
gfx/public/nsMargin.h
gfx/public/nsPoint.h
gfx/public/nsRect.h
gfx/public/nsRegion.h
gfx/public/nsSize.h
gfx/public/nsThemeConstants.h
gfx/public/nsTransform2D.h
gfx/src/Makefile.in
gfx/src/X11Util.h
gfx/src/gfxCore.h
gfx/src/gfxIFormats.idl
gfx/src/gfxidltypes.idl
gfx/src/nsColor.h
gfx/src/nsColorNameList.h
gfx/src/nsColorNames.h
gfx/src/nsCoord.h
gfx/src/nsFont.h
gfx/src/nsGfxCIID.h
gfx/src/nsIDeviceContext.h
gfx/src/nsIFontEnumerator.idl
gfx/src/nsIFontMetrics.h
gfx/src/nsIRegion.h
gfx/src/nsIRenderingContext.h
gfx/src/nsIScriptableRegion.idl
gfx/src/nsITheme.h
gfx/src/nsMargin.h
gfx/src/nsPoint.h
gfx/src/nsRect.h
gfx/src/nsRegion.h
gfx/src/nsSize.h
gfx/src/nsThemeConstants.h
gfx/src/nsTransform2D.h
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -51,17 +51,17 @@ endif
 # In static builds, ycbcr must appear after layers in
 # the link line on linux. This order is defined by the
 # order listed in DIRS. On shared builds ycbcr must
 # be built first so the order is reversed.
 ifndef BUILD_STATIC_LIBS
 DIRS		+= ycbcr
 endif
 
-DIRS		+= public idl src qcms layers harfbuzz/src thebes src/thebes
+DIRS		+= src qcms layers harfbuzz/src thebes src/thebes
 
 ifdef BUILD_STATIC_LIBS
 DIRS		+= ycbcr
 endif
 
 ifdef MOZ_IPC
 DIRS		+= ipc
 endif
deleted file mode 100644
--- a/gfx/idl/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= gfx
-XPIDL_MODULE	= gfx
-GRE_MODULE	= 1
-
-XPIDLSRCS	= \
-		nsIFontEnumerator.idl \
-		nsIScriptableRegion.idl \
-		gfxIFormats.idl \
-		gfxidltypes.idl \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/gfx/idl/geniid.pl
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/local/bin/perl
-
-require "find.pl";
-
-$uuid = 0x6f7652e0;
-$format = "{ 0x%x,  0xee43, 0x11d1, \\\
- { 0x9c, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }";
-$pattern = "--- IID GOES HERE ---";
-$mydir = cwd();
-
-sub replaceText {
-    local ($oldname) = $_;
-    local ($newname) = $_;
-    local ($found) = 0;
-    local ($tempname) = $oldname.'.orig';
-    local ($replacement);
-
-    if (-T $oldname && -s $oldname) {
-        open(FILE, "<$oldname")
-            || die "Unable to open $oldname\n";
-        while (<FILE>) {
-            if (/$pattern/) {
-                $found = 1;
-                last;
-            }
-        }
-        close(FILE);
-
-        if ($found) {
-	    print "Setting IID for file: ", $oldname, "\n";
-            rename($oldname, $tempname)
-                || die "Unable to rename $oldname as $tempname";
-            open(REPLACEFILE, ">$newname")
-                || die "Unable to open $newname for writing\n";
-
-            open(SEARCHFILE, "<$tempname")
-                || die "Unable to open $tempname\n";
-
-	    while (<SEARCHFILE>) { 
-		if (/$pattern/) {
-		    $replacement = sprintf($format, $uuid++);
-		    s/$pattern/$replacement /g;
-		}
-		print REPLACEFILE;
-	    }
-            close(SEARCHFILE);
-            close(REPLACEFILE);
-            if (-z $newname) {
-                die "$newname has zero size\n."
-                    ."Restore manually from $tempname\n";
-            } else {
-                unlink($tempname);
-            }
-
-            warn "$name: Renaming as $newname\n" if $newname ne $oldname;
-
-            $_ = $oldname;
-            return;
-        }
-    }
-    if ($newname ne $oldname) {
-        warn "$name: Renaming as $newname\n";
-        rename($oldname, $newname) || warn "Unable to rename $oldname\n";
-    }
-    $_ = $oldname;
-}
-
-eval 'exec /usr/local/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
-
-# Traverse desired filesystems
-$dont_use_nlink = 1;
-
-if (!$ARGV[0]) {
-    &find('.');
-}
-else {
-    foreach $file (@ARGV) {
-	chdir $mydir
-        &find($file);
-    }
-}
-
-exit;
-
-sub wanted {
-    /^nsIDOM.*\.h$/ &&
-    &replaceText($name);
-}
deleted file mode 100644
--- a/gfx/public/Makefile.in
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= gfx
-
-EXPORTS		= \
-		gfxCore.h \
-		nsColor.h \
-		nsColorNames.h \
-		nsColorNameList.h \
-		nsCoord.h \
-		nsFont.h \
-		nsRect.h \
-		nsRegion.h \
-		nsPoint.h \
-		nsSize.h \
-		nsMargin.h \
-		nsTransform2D.h \
-		nsIRenderingContext.h \
-		nsIFontMetrics.h \
-		nsIDeviceContext.h \
-		nsGfxCIID.h \
-		nsIRegion.h \
-		nsITheme.h \
-		nsThemeConstants.h \
-		$(NULL)
-
-ifdef MOZ_X11
-EXPORTS_NAMESPACES	= mozilla
-EXPORTS_mozilla		= X11Util.h
-endif
-
-include $(topsrcdir)/config/rules.mk
-
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -37,33 +37,65 @@
 
 DEPTH       = ../..
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE      = gfx
-LIBRARY_NAME    = gkgfx
+MODULE         = gfx
+LIBRARY_NAME   = gkgfx
 EXPORT_LIBRARY = 1
-GRE_MODULE	= 1
+GRE_MODULE     = 1
 LIBXUL_LIBRARY = 1
 
+XPIDLSRCS = \
+	nsIFontEnumerator.idl \
+	nsIScriptableRegion.idl \
+	gfxIFormats.idl \
+	gfxidltypes.idl \
+	$(NULL)
+
+EXPORTS	= \
+	gfxCore.h \
+	nsColor.h \
+	nsColorNames.h \
+	nsColorNameList.h \
+	nsCoord.h \
+	nsFont.h \
+	nsRect.h \
+	nsRegion.h \
+	nsPoint.h \
+	nsSize.h \
+	nsMargin.h \
+	nsTransform2D.h \
+	nsIRenderingContext.h \
+	nsIFontMetrics.h \
+	nsIDeviceContext.h \
+	nsGfxCIID.h \
+	nsIRegion.h \
+	nsITheme.h \
+	nsThemeConstants.h \
+	$(NULL)
+
+ifdef MOZ_X11
+EXPORTS_NAMESPACES	= mozilla
+EXPORTS_mozilla		= X11Util.h
+endif
 
 CPPSRCS = \
         nsColor.cpp \
         nsFont.cpp \
         nsRect.cpp \
         nsRegion.cpp \
         nsTransform2D.cpp \
         nsScriptableRegion.cpp \
         $(NULL)
 
-
 EXTRA_DSO_LDOPTS = \
         $(MOZ_UNICHARUTIL_LIBS) \
         $(MOZ_COMPONENT_LIBS) \
         $(MOZ_JS_LIBS) \
         $(NULL)
 
 ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += \
rename from gfx/public/X11Util.h
rename to gfx/src/X11Util.h
rename from gfx/public/gfxCore.h
rename to gfx/src/gfxCore.h
rename from gfx/idl/gfxIFormats.idl
rename to gfx/src/gfxIFormats.idl
rename from gfx/idl/gfxidltypes.idl
rename to gfx/src/gfxidltypes.idl
rename from gfx/public/nsColor.h
rename to gfx/src/nsColor.h
rename from gfx/public/nsColorNameList.h
rename to gfx/src/nsColorNameList.h
rename from gfx/public/nsColorNames.h
rename to gfx/src/nsColorNames.h
rename from gfx/public/nsCoord.h
rename to gfx/src/nsCoord.h
rename from gfx/public/nsFont.h
rename to gfx/src/nsFont.h
rename from gfx/public/nsGfxCIID.h
rename to gfx/src/nsGfxCIID.h
rename from gfx/public/nsIDeviceContext.h
rename to gfx/src/nsIDeviceContext.h
rename from gfx/idl/nsIFontEnumerator.idl
rename to gfx/src/nsIFontEnumerator.idl
rename from gfx/public/nsIFontMetrics.h
rename to gfx/src/nsIFontMetrics.h
rename from gfx/public/nsIRegion.h
rename to gfx/src/nsIRegion.h
rename from gfx/public/nsIRenderingContext.h
rename to gfx/src/nsIRenderingContext.h
rename from gfx/idl/nsIScriptableRegion.idl
rename to gfx/src/nsIScriptableRegion.idl
rename from gfx/public/nsITheme.h
rename to gfx/src/nsITheme.h
rename from gfx/public/nsMargin.h
rename to gfx/src/nsMargin.h
rename from gfx/public/nsPoint.h
rename to gfx/src/nsPoint.h
rename from gfx/public/nsRect.h
rename to gfx/src/nsRect.h
rename from gfx/public/nsRegion.h
rename to gfx/src/nsRegion.h
rename from gfx/public/nsSize.h
rename to gfx/src/nsSize.h
rename from gfx/public/nsThemeConstants.h
rename to gfx/src/nsThemeConstants.h
rename from gfx/public/nsTransform2D.h
rename to gfx/src/nsTransform2D.h