Instrumented libraries: move all scripts to scripts/.

BUG=none
R=glider@chromium.org
NOTRY=true

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

Cr-Commit-Position: refs/heads/master@{#321171}

15 files changed, 37 insertions, 36 deletions

diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 5c5c50c..28fa65f 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -56,7 +56,7 @@
       '-Wl,-R,XORIGIN/.'
     ],
     'patch': '',
-    'run_before_build': '',
+    'pre_build': '',
     'asan_blacklist': '',
     'msan_blacklist': '',
     'tsan_blacklist': '',
@@ -186,7 +186,7 @@
       'package_name': 'freetype',
       'dependencies=': [],
       'extra_configure_flags': ['--disable-static'],
-      'run_before_build': 'scripts/freetype.sh',
+      'pre_build': 'scripts/pre-build/freetype.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -284,7 +284,7 @@
       ],
       'asan_blacklist': 'blacklists/asan/libglib2.0-0.txt',
       'msan_blacklist': 'blacklists/msan/libglib2.0-0.txt',
-      'run_before_build': 'scripts/autogen.sh',
+      'pre_build': 'scripts/pre-build/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -302,7 +302,7 @@
         # TSan reports data races on debug variables.
         '--disable-debug',
       ],
-      'run_before_build': 'scripts/libnspr4.sh',
+      'pre_build': 'scripts/pre-build/libnspr4.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -310,7 +310,7 @@
       'dependencies=': [],
       'extra_configure_flags': ['--disable-static'],
       # Required on Trusty due to autoconf version mismatch.
-      'run_before_build': 'scripts/autoreconf.sh',
+      'pre_build': 'scripts/pre-build/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -352,7 +352,7 @@
       ],
       'msan_blacklist': 'blacklists/msan/libx11-6.txt',
       # Required on Trusty due to autoconf version mismatch.
-      'run_before_build': 'scripts/autoreconf.sh',
+      'pre_build': 'scripts/pre-build/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -375,7 +375,7 @@
         }],
       ],
       # Required on Trusty due to autoconf version mismatch.
-      'run_before_build': 'scripts/autoreconf.sh',
+      'pre_build': 'scripts/pre-build/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -501,14 +501,14 @@
           # this even impacts x86-64 builds.
           '--disable-neon-opt'
       ],
-      'run_before_build': 'scripts/pulseaudio.sh',
+      'pre_build': 'scripts/pre-build/pulseaudio.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libasound2',
       'dependencies=': [],
       'extra_configure_flags': ['--disable-static'],
-      'run_before_build': 'scripts/libasound2.sh',
+      'pre_build': 'scripts/pre-build/libasound2.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -575,7 +575,7 @@
           # TODO(earthdok): find a better fix.
           '--disable-gudev'
       ],
-      'run_before_build': 'scripts/udev.sh',
+      'pre_build': 'scripts/pre-build/udev.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -630,7 +630,7 @@
           'patch': 'patches/libgtk2.0-0.trusty.diff',
         }],
       ],
-      'run_before_build': 'scripts/libgtk2.0-0.sh',
+      'pre_build': 'scripts/pre-build/libgtk2.0-0.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -648,7 +648,7 @@
           '--disable-modules',
       ],
       'dependencies=': [],
-      'run_before_build': 'scripts/libgdk-pixbuf2.0-0.sh',
+      'pre_build': 'scripts/pre-build/libgdk-pixbuf2.0-0.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -673,7 +673,7 @@
           '--disable-vala',
       ],
       'dependencies=': [],
-      'run_before_build': 'scripts/autogen.sh',
+      'pre_build': 'scripts/pre-build/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -698,7 +698,7 @@
       ],
       'dependencies=': [],
       'jobs': 1,
-      'run_before_build': 'scripts/autogen.sh',
+      'pre_build': 'scripts/pre-build/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -713,7 +713,7 @@
           '--disable-vala',
       ],
       'dependencies=': [],
-      'run_before_build': 'scripts/autogen.sh',
+      'pre_build': 'scripts/pre-build/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -730,7 +730,7 @@
       'package_name': 'libunity9',
       'dependencies=': [],
       'extra_configure_flags': ['--disable-static'],
-      'run_before_build': 'scripts/autogen.sh',
+      'pre_build': 'scripts/pre-build/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -741,7 +741,7 @@
           '--disable-introspection',
       ],
       'dependencies=': [],
-      'run_before_build': 'scripts/autogen.sh',
+      'pre_build': 'scripts/pre-build/autogen.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -786,7 +786,7 @@
       # Backport a use-after-free fix:
       # http://cgit.freedesktop.org/libva/diff/va/va.c?h=staging&id=d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9
       'patch': 'patches/libva1.diff',
-      'run_before_build': 'scripts/libva1.sh',
+      'pre_build': 'scripts/pre-build/libva1.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -797,7 +797,7 @@
           # See above.
           '--disable-introspection',
       ],
-      'run_before_build': 'scripts/autoreconf.sh',
+      'pre_build': 'scripts/pre-build/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
   ],
diff --git a/third_party/instrumented_libraries/download_build_install.py b/third_party/instrumented_libraries/scripts/download_build_install.py
index 48694fa..3bd24fa 100755
--- a/third_party/instrumented_libraries/download_build_install.py
+++ b/third_party/instrumented_libraries/scripts/download_build_install.py
@@ -26,15 +26,15 @@ def unescape_flags(s):
   return ' '.join(shlex.split(s))
 
 
-def real_path(path_relative_to_script):
+def real_path(path_relative_to_gyp):
   """Returns the absolute path to a file.
 
-  GYP generates paths relative to the location of the .gyp file, which coincides
-  with the location of this script. This function converts them to absolute
-  paths.
+  GYP generates paths relative to the location of the .gyp file, which is one
+  level above the location of this script. This function converts them to
+  absolute paths.
   """
-  return os.path.realpath(os.path.join(SCRIPT_ABSOLUTE_PATH,
-                                       path_relative_to_script))
+  return os.path.realpath(os.path.join(SCRIPT_ABSOLUTE_PATH, '..',
+                                       path_relative_to_gyp))
 
 
 class InstrumentedPackageBuilder(object):
@@ -47,8 +47,8 @@ class InstrumentedPackageBuilder(object):
     self._libdir = args.libdir
     self._package = args.package
     self._patch = real_path(args.patch) if args.patch else None
-    self._run_before_build = \
-        real_path(args.run_before_build) if args.run_before_build else None
+    self._pre_build = \
+        real_path(args.pre_build) if args.pre_build else None
     self._sanitizer = args.sanitizer
     self._verbose = args.verbose
     self._clobber = clobber
@@ -139,8 +139,8 @@ class InstrumentedPackageBuilder(object):
   def patch_source(self):
     if self._patch:
       self.shell_call('patch -p1 -i %s' % self._patch, cwd=self._source_dir)
-    if self._run_before_build:
-      self.shell_call(self._run_before_build, cwd=self._source_dir)
+    if self._pre_build:
+      self.shell_call(self._pre_build, cwd=self._source_dir)
 
   def copy_source_archives(self):
     """Copies the downloaded source archives to the output dir.
@@ -167,7 +167,8 @@ class InstrumentedPackageBuilder(object):
       self.build_and_install()
     except Exception as exception:
       print 'ERROR: Failed to build package %s. Have you run ' \
-            'src/third_party/instrumented_libraries/install-build-deps.sh?' % \
+            'src/third_party/instrumented_libraries/scripts/' \
+            'install-build-deps.sh?' % \
             self._package
       print
       raise
@@ -183,7 +184,7 @@ class InstrumentedPackageBuilder(object):
 
   def fix_rpaths(self, directory):
     # TODO(earthdok): reimplement fix_rpaths.sh in Python.
-    script = real_path('fix_rpaths.sh')
+    script = real_path('scripts/fix_rpaths.sh')
     self.shell_call("%s %s" % (script, directory))
 
   def temp_dir(self):
@@ -392,7 +393,7 @@ def main():
   parser.add_argument('--patch', default='')
   # This should be a shell script to run before building specific libraries.
   # This will be run after applying the patch above.
-  parser.add_argument('--run-before-build', default='')
+  parser.add_argument('--pre-build', default='')
   parser.add_argument('--build-method', default='destdir')
   parser.add_argument('--sanitizer-blacklist', default='')
   # The LIBDIR argument to configure/make.
diff --git a/third_party/instrumented_libraries/fix_rpaths.sh b/third_party/instrumented_libraries/scripts/fix_rpaths.sh
index 578243f..578243f 100755
--- a/third_party/instrumented_libraries/fix_rpaths.sh
+++ b/third_party/instrumented_libraries/scripts/fix_rpaths.sh
diff --git a/third_party/instrumented_libraries/install-build-deps.sh b/third_party/instrumented_libraries/scripts/install-build-deps.sh
index d6cce4a..d6cce4a 100755
--- a/third_party/instrumented_libraries/install-build-deps.sh
+++ b/third_party/instrumented_libraries/scripts/install-build-deps.sh
diff --git a/third_party/instrumented_libraries/scripts/autogen.sh b/third_party/instrumented_libraries/scripts/pre-build/autogen.sh
index 7b3b390..7b3b390 100755
--- a/third_party/instrumented_libraries/scripts/autogen.sh
+++ b/third_party/instrumented_libraries/scripts/pre-build/autogen.sh
diff --git a/third_party/instrumented_libraries/scripts/autoreconf.sh b/third_party/instrumented_libraries/scripts/pre-build/autoreconf.sh
index 138fabe..138fabe 100755
--- a/third_party/instrumented_libraries/scripts/autoreconf.sh
+++ b/third_party/instrumented_libraries/scripts/pre-build/autoreconf.sh
diff --git a/third_party/instrumented_libraries/scripts/freetype.sh b/third_party/instrumented_libraries/scripts/pre-build/freetype.sh
index 2a3ac3f..2a3ac3f 100755
--- a/third_party/instrumented_libraries/scripts/freetype.sh
+++ b/third_party/instrumented_libraries/scripts/pre-build/freetype.sh
diff --git a/third_party/instrumented_libraries/scripts/libasound2.sh b/third_party/instrumented_libraries/scripts/pre-build/libasound2.sh
index d7c59a4..d7c59a4 100755
--- a/third_party/instrumented_libraries/scripts/libasound2.sh
+++ b/third_party/instrumented_libraries/scripts/pre-build/libasound2.sh
diff --git a/third_party/instrumented_libraries/scripts/libgdk-pixbuf2.0-0.sh b/third_party/instrumented_libraries/scripts/pre-build/libgdk-pixbuf2.0-0.sh
index 254804a..254804a 100755
--- a/third_party/instrumented_libraries/scripts/libgdk-pixbuf2.0-0.sh
+++ b/third_party/instrumented_libraries/scripts/pre-build/libgdk-pixbuf2.0-0.sh
diff --git a/third_party/instrumented_libraries/scripts/libgtk2.0-0.sh b/third_party/instrumented_libraries/scripts/pre-build/libgtk2.0-0.sh
index adaf38f..adaf38f 100755
--- a/third_party/instrumented_libraries/scripts/libgtk2.0-0.sh
+++ b/third_party/instrumented_libraries/scripts/pre-build/libgtk2.0-0.sh
diff --git a/third_party/instrumented_libraries/scripts/libnspr4.sh b/third_party/instrumented_libraries/scripts/pre-build/libnspr4.sh
index 07b7908..07b7908 100755
--- a/third_party/instrumented_libraries/scripts/libnspr4.sh
+++ b/third_party/instrumented_libraries/scripts/pre-build/libnspr4.sh
diff --git a/third_party/instrumented_libraries/scripts/libva1.sh b/third_party/instrumented_libraries/scripts/pre-build/libva1.sh
index d28002a..d28002a 100755
--- a/third_party/instrumented_libraries/scripts/libva1.sh
+++ b/third_party/instrumented_libraries/scripts/pre-build/libva1.sh
diff --git a/third_party/instrumented_libraries/scripts/pulseaudio.sh b/third_party/instrumented_libraries/scripts/pre-build/pulseaudio.sh
index a74f1a7..a74f1a7 100755
--- a/third_party/instrumented_libraries/scripts/pulseaudio.sh
+++ b/third_party/instrumented_libraries/scripts/pre-build/pulseaudio.sh
diff --git a/third_party/instrumented_libraries/scripts/udev.sh b/third_party/instrumented_libraries/scripts/pre-build/udev.sh
index 921b590..921b590 100755
--- a/third_party/instrumented_libraries/scripts/udev.sh
+++ b/third_party/instrumented_libraries/scripts/pre-build/udev.sh
diff --git a/third_party/instrumented_libraries/standard_instrumented_package_target.gypi b/third_party/instrumented_libraries/standard_instrumented_package_target.gypi
index b6253f5..db715be 100644
--- a/third_party/instrumented_libraries/standard_instrumented_package_target.gypi
+++ b/third_party/instrumented_libraries/standard_instrumented_package_target.gypi
@@ -19,7 +19,7 @@
       'outputs': [
         '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/<(_package_name).txt',
       ],
-      'action': ['./download_build_install.py',
+      'action': ['scripts/download_build_install.py',
         '--build-method=>(_build_method)',
         '--cc=<(_cc)',
         '--cflags=>(_package_cflags)',
@@ -49,12 +49,12 @@
             '>(_patch)',
           ],
         }],
-        ['">(_run_before_build)"!=""', {
+        ['">(_pre_build)"!=""', {
           'action+': [
-            '--run-before-build=>(_run_before_build)',
+            '--pre-build=>(_pre_build)',
           ],
           'inputs+': [
-            '>(_run_before_build)',
+            '>(_pre_build)',
           ],
         }],
         ['">(_<(_sanitizer_type)_blacklist)"!=""', {