Fix npm run start and build scripts to work in full Chromium checkout

Also simplified code for test script to use devtools_paths.js

Bug: none
Change-Id: I699808267782f55150eabaacf9f86298ab3741d1
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6403238
Commit-Queue: Benedikt Meurer <[email protected]>
Reviewed-by: Benedikt Meurer <[email protected]>

Author: Eric Leese

scripts/devtools_paths.js

@@ -47,7 +47,7 @@ function isInChromiumDirectory() {
   }
 
   const normalizedPath = PATH_TO_EXECUTED_FILE.split(path.sep).join('/');
-  const devtoolsPath = 'src/third_party/devtools-frontend';
+  const devtoolsPath = 'third_party/devtools-frontend/src';
   const isInChromium = normalizedPath.includes(devtoolsPath);
   const potentialChromiumDir = PATH_TO_EXECUTED_FILE.substring(
       0,
@@ -78,7 +78,7 @@ function devtoolsRootPath() {
 function rootPath() {
   const {isInChromium, chromiumDirectory} = isInChromiumDirectory();
   if (isInChromium) {
-    return path.join(chromiumDirectory, 'src');
+    return chromiumDirectory;
   }
   return devtoolsRootPath();
 }
@@ -166,6 +166,7 @@ function downloadedChromeBinaryPath() {
 module.exports = {
   devtoolsRootPath,
   downloadedChromeBinaryPath,
+  isInChromiumDirectory,
   litAnalyzerExecutablePath,
   mochaExecutablePath,
   nodeModulesPath,

scripts/run_build.mjs

@@ -8,6 +8,8 @@ import path from 'node:path';
 import yargs from 'yargs';
 import {hideBin} from 'yargs/helpers';
 
+import {rootPath} from './devtools_paths.js';
+
 const argv = yargs(hideBin(process.argv))
                  .option('target', {
                    alias: 't',
@@ -37,7 +39,7 @@ const cwd = process.cwd();
 const {env} = process;
 
 // Create and initialize the `out/<target>` directory as needed.
-const outDir = path.join('out', target);
+const outDir = path.join(rootPath(), 'out', target);
 if (!fs.existsSync(outDir)) {
   const gnExe = path.join(cwd, 'third_party', 'depot_tools', 'gn');
   fs.mkdirSync(outDir, {recursive: true});
@@ -51,7 +53,7 @@ if (!fs.existsSync(outDir)) {
 
 function build() {
   const autoninjaExe = path.join(cwd, 'third_party', 'depot_tools', 'autoninja');
-  childProcess.spawnSync(autoninjaExe, ['-C', outDir], {
+  childProcess.spawnSync(autoninjaExe, ['-C', outDir, 'devtools_all_files'], {
     cwd,
     env,
     stdio: 'inherit',

scripts/run_on_target.mjs

@@ -8,6 +8,8 @@ import * as path from 'path';
 import yargs from 'yargs';
 import unparse from 'yargs-unparser';
 
+import {isInChromiumDirectory, nodeModulesPath, rootPath} from './devtools_paths.js';
+
 const argv = yargs(process.argv.slice(2))
   .parserConfiguration({
     'strip-aliased': true,
@@ -24,32 +26,22 @@ let script = argv.script;
 delete argv.target;
 delete argv.script;
 
-let sourceRoot = path.dirname(path.dirname(path.resolve(argv['$0'])));
+const sourceRoot = rootPath();
 
 // Ensure that we can find the node_modules folder even if the out folder is
 // not a sibling of the node_modules folder.
 const env = process.env;
-env.NODE_PATH = path.join(sourceRoot, 'node_modules');
+env.NODE_PATH = nodeModulesPath();
 
-let cwd = path.join(sourceRoot, 'out', target);
+const cwd = path.join(sourceRoot, 'out', target);
 
-if (!fs.existsSync(cwd)) {
-  // Check if we are in a Chromium checkout and look for the out folder there.
-  const maybeChromiumRoot = path.dirname(
-    path.dirname(path.dirname(sourceRoot)),
-  );
-  if (
-    sourceRoot ===
-    path.join(maybeChromiumRoot, 'third_party', 'devtools-frontend', 'src')
-  ) {
-    sourceRoot = maybeChromiumRoot;
-    cwd = path.join(sourceRoot, 'out', target);
-    const pathParts = script.split(path.sep);
-    if (pathParts[0] === 'gen') {
-      pathParts.shift();
-      pathParts.unshift('gen', 'third_party', 'devtools-frontend', 'src');
-      script = pathParts.join(path.sep);
-    }
+if (isInChromiumDirectory().isInChromium) {
+  // Check if we need to change the location of the gen folder.
+  const pathParts = script.split(path.sep);
+  if (pathParts[0] === 'gen') {
+    pathParts.shift();
+    pathParts.unshift('gen', 'third_party', 'devtools-frontend', 'src');
+    script = pathParts.join(path.sep);
   }
 }
 

scripts/run_start.mjs

@@ -7,7 +7,7 @@ import path from 'node:path';
 import yargs from 'yargs';
 import {hideBin} from 'yargs/helpers';
 
-import {downloadedChromeBinaryPath, rootPath} from './devtools_paths.js';
+import {downloadedChromeBinaryPath, isInChromiumDirectory, rootPath} from './devtools_paths.js';
 
 // The list of features that are enabled by default.
 const ENABLE_FEATURES = [
@@ -30,7 +30,7 @@ const argv = yargs(hideBin(process.argv))
                  .option('browser', {
                    type: 'string',
                    choices: ['cft', 'canary'],
-                   default: 'cft',
+                   default: isInChromiumDirectory().isInChromium ? 'canary' : 'cft',
                    description: 'Launch in the specified browser',
                  })
                  .option('open', {
@@ -62,7 +62,7 @@ const runBuildPath = path.join(import.meta.dirname, 'run_build.mjs');
 function findBrowserBinary() {
   if (browser === 'canary') {
     const binary = ({
-      linux: path.join('/usr', 'bin', 'google-chrome-canary'),
+      linux: path.join('/usr', 'bin', 'google-chrome-unstable'),
       darwin: path.join('/Applications', 'Google Chrome Canary.app', 'Contents', 'MacOS', 'Google Chrome Canary'),
     })[process.platform];
     if (verbose) {
@@ -107,7 +107,10 @@ function start() {
   args.push(`--enable-features=${ENABLE_FEATURES.join(',')}`);
 
   // Open with our freshly built DevTools front-end.
-  const customDevToolsFrontEndPath = path.join(rootPath(), 'out', target, 'gen', 'front_end');
+  const genDir = path.join(rootPath(), 'out', target, 'gen');
+  const customDevToolsFrontEndPath = isInChromiumDirectory().isInChromium ?
+      path.join(genDir, 'third_party', 'devtools-frontend', 'src', 'front_end') :
+      path.join(genDir, 'front_end');
   args.push(`--custom-devtools-frontend=file://${customDevToolsFrontEndPath}`);
 
   // Chrome flags and URLs.