move skpdiff into tools

R=djsollen@google.com

Review URL: https://codereview.chromium.org/19608005

git-svn-id: http://skia.googlecode.com/svn/trunk@10249 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/experimental/skpdiff/skpdiff.gyp b/experimental/skpdiff/skpdiff.gyp
deleted file mode 100644 (file)
index 0a69229..0000000
--- a/experimental/skpdiff/skpdiff.gyp
+++ /dev/null
@@ -1,70 +0,0 @@
-# GYP file to build skpdiff.
-#
-# To build on Linux:
-#  ./gyp_skia skpdiff.gyp && make skpdiff
-#
-{
-  'targets': [
-    {
-      'target_name': 'skpdiff',
-      'type': 'executable',
-      'sources': [
-        'main.cpp',
-        'SkDiffContext.cpp',
-        'SkImageDiffer.cpp',
-        'SkPMetric.cpp',
-        'skpdiff_util.cpp',
-        '../../tools/flags/SkCommandLineFlags.cpp',
-      ],
-      'include_dirs': [
-        '../../tools/flags'
-      ],
-      'dependencies': [
-        '../../gyp/skia_lib.gyp:skia_lib',
-      ],
-      'cflags': [
-        '-O3',
-      ],
-      'conditions': [
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
-          'link_settings': {
-            'libraries': [
-              '-lrt',
-            ],
-          },
-        }],
-        ['skia_opencl', {
-          'sources': [
-            'SkCLImageDiffer.cpp',
-            'SkDifferentPixelsMetric_opencl.cpp',
-          ],
-          'conditions': [
-            [ 'skia_os == "mac"', {
-              'link_settings': {
-                'libraries': [
-                  '$(SDKROOT)/System/Library/Frameworks/OpenCL.framework',
-                ]
-              }
-            }, {
-              'link_settings': {
-                'libraries': [
-                  '-lOpenCL',
-                ],
-              },
-            }],
-          ],
-        }, { # !skia_opencl
-          'sources': [
-            'SkDifferentPixelsMetric_cpu.cpp',
-          ],
-        }],
-      ],
-    },
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:

diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 4cbdf4b..f460ee3 100644 (file)
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -21,6 +21,7 @@
         'render_pdfs',
         'render_pictures',
         'skdiff',
+        'skpdiff',
         'skhello',
         'skimage',
       ],
@@ -51,6 +52,61 @@
       ],
     },
     {
+      'target_name': 'skpdiff',
+      'type': 'executable',
+      'sources': [
+        '../tools/skpdiff/skpdiff_main.cpp',
+        '../tools/skpdiff/SkDiffContext.cpp',
+        '../tools/skpdiff/SkImageDiffer.cpp',
+        '../tools/skpdiff/SkPMetric.cpp',
+        '../tools/skpdiff/skpdiff_util.cpp',
+        '../tools/flags/SkCommandLineFlags.cpp',
+      ],
+      'include_dirs': [
+        '../tools/flags'
+      ],
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+      ],
+      'cflags': [
+        '-O3',
+      ],
+      'conditions': [
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
+          'link_settings': {
+            'libraries': [
+              '-lrt',
+            ],
+          },
+        }],
+        ['skia_opencl', {
+          'sources': [
+            '../tools/skpdiff/SkCLImageDiffer.cpp',
+            '../tools/skpdiff/SkDifferentPixelsMetric_opencl.cpp',
+          ],
+          'conditions': [
+            [ 'skia_os == "mac"', {
+              'link_settings': {
+                'libraries': [
+                  '$(SDKROOT)/System/Library/Frameworks/OpenCL.framework',
+                ]
+              }
+            }, {
+              'link_settings': {
+                'libraries': [
+                  '-lOpenCL',
+                ],
+              },
+            }],
+          ],
+        }, { # !skia_opencl
+          'sources': [
+            '../tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp',
+          ],
+        }],
+      ],
+    },
+    {
       'target_name': 'skimagediff',
       'type': 'executable',
       'sources': [

diff --git a/experimental/skpdiff/README b/tools/skpdiff/README
similarity index 100%
rename from experimental/skpdiff/README
rename to tools/skpdiff/README

diff --git a/experimental/skpdiff/SkCLImageDiffer.cpp b/tools/skpdiff/SkCLImageDiffer.cpp
similarity index 100%
rename from experimental/skpdiff/SkCLImageDiffer.cpp
rename to tools/skpdiff/SkCLImageDiffer.cpp

diff --git a/experimental/skpdiff/SkCLImageDiffer.h b/tools/skpdiff/SkCLImageDiffer.h
similarity index 100%
rename from experimental/skpdiff/SkCLImageDiffer.h
rename to tools/skpdiff/SkCLImageDiffer.h

diff --git a/experimental/skpdiff/SkDiffContext.cpp b/tools/skpdiff/SkDiffContext.cpp
similarity index 100%
rename from experimental/skpdiff/SkDiffContext.cpp
rename to tools/skpdiff/SkDiffContext.cpp

diff --git a/experimental/skpdiff/SkDiffContext.h b/tools/skpdiff/SkDiffContext.h
similarity index 100%
rename from experimental/skpdiff/SkDiffContext.h
rename to tools/skpdiff/SkDiffContext.h

diff --git a/experimental/skpdiff/SkDifferentPixelsMetric.h b/tools/skpdiff/SkDifferentPixelsMetric.h
similarity index 100%
rename from experimental/skpdiff/SkDifferentPixelsMetric.h
rename to tools/skpdiff/SkDifferentPixelsMetric.h

diff --git a/experimental/skpdiff/SkDifferentPixelsMetric_cpu.cpp b/tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp
similarity index 100%
rename from experimental/skpdiff/SkDifferentPixelsMetric_cpu.cpp
rename to tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp

diff --git a/experimental/skpdiff/SkDifferentPixelsMetric_opencl.cpp b/tools/skpdiff/SkDifferentPixelsMetric_opencl.cpp
similarity index 100%
rename from experimental/skpdiff/SkDifferentPixelsMetric_opencl.cpp
rename to tools/skpdiff/SkDifferentPixelsMetric_opencl.cpp

diff --git a/experimental/skpdiff/SkImageDiffer.cpp b/tools/skpdiff/SkImageDiffer.cpp
similarity index 100%
rename from experimental/skpdiff/SkImageDiffer.cpp
rename to tools/skpdiff/SkImageDiffer.cpp

diff --git a/experimental/skpdiff/SkImageDiffer.h b/tools/skpdiff/SkImageDiffer.h
similarity index 100%
rename from experimental/skpdiff/SkImageDiffer.h
rename to tools/skpdiff/SkImageDiffer.h

diff --git a/experimental/skpdiff/SkPMetric.cpp b/tools/skpdiff/SkPMetric.cpp
similarity index 100%
rename from experimental/skpdiff/SkPMetric.cpp
rename to tools/skpdiff/SkPMetric.cpp

diff --git a/experimental/skpdiff/SkPMetric.h b/tools/skpdiff/SkPMetric.h
similarity index 100%
rename from experimental/skpdiff/SkPMetric.h
rename to tools/skpdiff/SkPMetric.h

diff --git a/experimental/skpdiff/SkPMetricUtil_generated.h b/tools/skpdiff/SkPMetricUtil_generated.h
similarity index 100%
rename from experimental/skpdiff/SkPMetricUtil_generated.h
rename to tools/skpdiff/SkPMetricUtil_generated.h

diff --git a/experimental/skpdiff/diff_viewer.js b/tools/skpdiff/diff_viewer.js
similarity index 100%
rename from experimental/skpdiff/diff_viewer.js
rename to tools/skpdiff/diff_viewer.js

diff --git a/experimental/skpdiff/generate_pmetric_tables.py b/tools/skpdiff/generate_pmetric_tables.py
similarity index 100%
rename from experimental/skpdiff/generate_pmetric_tables.py
rename to tools/skpdiff/generate_pmetric_tables.py

diff --git a/experimental/skpdiff/main.cpp b/tools/skpdiff/skpdiff_main.cpp
similarity index 100%
rename from experimental/skpdiff/main.cpp
rename to tools/skpdiff/skpdiff_main.cpp

diff --git a/experimental/skpdiff/skpdiff_util.cpp b/tools/skpdiff/skpdiff_util.cpp
similarity index 100%
rename from experimental/skpdiff/skpdiff_util.cpp
rename to tools/skpdiff/skpdiff_util.cpp

diff --git a/experimental/skpdiff/skpdiff_util.h b/tools/skpdiff/skpdiff_util.h
similarity index 100%
rename from experimental/skpdiff/skpdiff_util.h
rename to tools/skpdiff/skpdiff_util.h

diff --git a/experimental/skpdiff/viewer.html b/tools/skpdiff/viewer.html
similarity index 100%
rename from experimental/skpdiff/viewer.html
rename to tools/skpdiff/viewer.html

diff --git a/experimental/skpdiff/viewer_style.css b/tools/skpdiff/viewer_style.css
similarity index 100%
rename from experimental/skpdiff/viewer_style.css
rename to tools/skpdiff/viewer_style.css