[GTK] Move ImageDiff to the Tools directory root
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 31 Dec 2012 13:54:36 +0000 (13:54 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 31 Dec 2012 13:54:36 +0000 (13:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=105421

Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2012-12-31
Reviewed by Kenneth Rohde Christiansen.

.:

* GNUmakefile.am: Remove the old ImageDiff makefile include.

Tools:

* DumpRenderTree/gtk/GNUmakefile.ImageDiff.am: Removed.
* GNUmakefile.am:
* ImageDiff/gtk/ImageDiff.cpp: Renamed from Tools/DumpRenderTree/gtk/ImageDiff.cpp.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@138595 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
Tools/ChangeLog
Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am [deleted file]
Tools/GNUmakefile.am
Tools/ImageDiff/gtk/ImageDiff.cpp [moved from Tools/DumpRenderTree/gtk/ImageDiff.cpp with 99% similarity]

index 9ae0dfe..cc55e91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-31  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Move ImageDiff to the Tools directory root
+        https://bugs.webkit.org/show_bug.cgi?id=105421
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * GNUmakefile.am: Remove the old ImageDiff makefile include.
+
 2012-12-30  Kondapally Kalyan  <kalyan.kondapally@intel.com>
 
         [EFL] [WebGL] Rename EGLConfigHelper as EGLConfigSelector.
index f51d39f..1862189 100644 (file)
@@ -295,7 +295,6 @@ include Source/WebKit/gtk/GNUmakefile.am
 include Source/WebCore/bindings/gobject/GNUmakefile.am
 include Tools/GNUmakefile.am
 include Source/WebKit/gtk/po/GNUmakefile.am
-include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
 
 include Source/WebKit2/GNUmakefile.am
 include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
index acece16..975c926 100644 (file)
@@ -1,3 +1,14 @@
+2012-12-31  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Move ImageDiff to the Tools directory root
+        https://bugs.webkit.org/show_bug.cgi?id=105421
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * DumpRenderTree/gtk/GNUmakefile.ImageDiff.am: Removed.
+        * GNUmakefile.am:
+        * ImageDiff/gtk/ImageDiff.cpp: Renamed from Tools/DumpRenderTree/gtk/ImageDiff.cpp.
+
 2012-12-30  Mike West  <mkwst@chromium.org>
 
         Add myself to watchlists for CSP and console logs.
diff --git a/Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am b/Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
deleted file mode 100644 (file)
index e7c3aef..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-noinst_PROGRAMS += \
-       Programs/ImageDiff
-
-Programs_ImageDiff_CPPFLAGS = $(global_cppflags)
-
-Programs_ImageDiff_SOURCES = \
-   Tools/DumpRenderTree/gtk/ImageDiff.cpp
-
-Programs_ImageDiff_CXXFLAGS = \
-   $(global_cxxflags) \
-   $(global_cppflags) \
-   $(Programs_ImageDiff_CFLAGS)
-
-Programs_ImageDiff_CFLAGS = \
-   -fno-strict-aliasing \
-   $(global_cflags) \
-   $(GLOBALDEPS_CFLAGS) \
-   $(GTK_CFLAGS)
-
-Programs_ImageDiff_LDADD = \
-   $(GTK_LIBS)
-
-Programs_ImageDiff_LDFLAGS = \
-   -no-fast-install \
-   -no-install
-
-CLEANFILES += \
-       Programs/ImageDiff
index 1dfe42f..02dc6ed 100644 (file)
@@ -1,6 +1,7 @@
 noinst_PROGRAMS += \
        Programs/DumpRenderTree \
-       Programs/GtkLauncher
+       Programs/GtkLauncher \
+       Programs/ImageDiff
 
 # GtkLauncher
 Programs_GtkLauncher_CPPFLAGS = \
@@ -185,10 +186,35 @@ Programs_DumpRenderTree_LDFLAGS = \
        -no-fast-install \
        -no-install
 
+# ImageDiff
+Programs_ImageDiff_CPPFLAGS = $(global_cppflags)
+
+Programs_ImageDiff_SOURCES = \
+   Tools/ImageDiff/gtk/ImageDiff.cpp
+
+Programs_ImageDiff_CXXFLAGS = \
+   $(global_cxxflags) \
+   $(global_cppflags) \
+   $(Programs_ImageDiff_CFLAGS)
+
+Programs_ImageDiff_CFLAGS = \
+   -fno-strict-aliasing \
+   $(global_cflags) \
+   $(GLOBALDEPS_CFLAGS) \
+   $(GTK_CFLAGS)
+
+Programs_ImageDiff_LDADD = \
+   $(GTK_LIBS)
+
+Programs_ImageDiff_LDFLAGS = \
+   -no-fast-install \
+   -no-install
+
 # clean target
 CLEANFILES += \
        Programs/DumpRenderTree \
-       Programs/GtkLauncher
+       Programs/GtkLauncher \
+       Programs/ImageDiff
 
 if TARGET_X11
 
similarity index 99%
rename from Tools/DumpRenderTree/gtk/ImageDiff.cpp
rename to Tools/ImageDiff/gtk/ImageDiff.cpp
index f6f680a..7baa25e 100644 (file)
@@ -171,9 +171,8 @@ void printImageDifferences(GdkPixbuf* baselineImage, GdkPixbuf* actualImage)
             g_object_unref(differenceImage);
         }
         printf("diff: %01.2f%% failed\n", difference);
-    } else {
+    } else
         printf("diff: %01.2f%% passed\n", difference);
-    }
 }
 
 int main(int argc, char* argv[])