- os::String complete;
-
- /* First look in the same directory from which this process is
- * running, (to support developers running a compiled program that
- * has not been installed. */
- os::String process_dir = os::getProcessName();
- process_dir.trimFilename();
-
- complete = process_dir;
- complete.join(relPath);
-
- if (complete.exists())
- return complete;
-
- /* Second, look in the directory for installed wrappers. */
- complete = absPath;
- if (complete.exists())
- return complete;
-
- if (verbose) {
- std::cerr << "error: cannot find " << relPath << " or " << absPath << "\n";
- }
-
- return "";
-}
-
-
-os::String
-findScript(const char *name)
-{
- os::String path;
-
-#if defined(APITRACE_SOURCE_DIR)
- // Try the absolute source path -- useful for development or quick
- // experiment. Relative paths don't quite work here due to out of source
- // trees.
- path = APITRACE_SOURCE_DIR "/scripts";
- path.join(name);
- if (path.exists()) {
- return path;
+ os::String scriptPath;
+
+ os::String processDir = os::getProcessName();
+ processDir.trimFilename();
+
+ // Try relative build directory
+ // XXX: Just make build and install directory layout match
+ scriptPath = processDir;
+ scriptPath.join("scripts");
+ scriptPath.join(scriptFilename);
+ if (scriptPath.exists()) {
+ return scriptPath;