cli: Remove dead files.

diff --git a/cli/trace_tools.hpp b/cli/trace_tools.hpp
deleted file mode 100644 (file)
index ddfe888..0000000
--- a/cli/trace_tools.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2011 VMware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- **************************************************************************/
-
-#ifndef _TRACE_TOOLS_HPP_
-#define _TRACE_TOOLS_HPP_
-
-
-#include <stdlib.h>
-
-#include "trace_api.hpp"
-
-
-namespace trace {
-
-
-int
-traceProgram(API api,
-             char * const *argv,
-             const char *output = NULL,
-             bool verbose = false);
-
-
-
-} /* namespace trace */
-
-#endif /* _TRACE_TOOLS_HPP_ */

diff --git a/cli/trace_tools_trace.cpp b/cli/trace_tools_trace.cpp
deleted file mode 100644 (file)
index fa899f9..0000000
--- a/cli/trace_tools_trace.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*********************************************************************
- *
- * Copyright 2011 Intel Corporation
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- *********************************************************************/
-
-
-#include <stdlib.h>
-
-#include <iostream>
-
-#include "os_string.hpp"
-#include "os_process.hpp"
-#include "trace_tools.hpp"
-#include "cli_resources.hpp"
-
-
-
-namespace trace {
-
-
-#if defined(__APPLE__)
-#define TRACE_VARIABLE "DYLD_LIBRARY_PATH"
-#define GL_TRACE_WRAPPER  "OpenGL"
-#elif defined(_WIN32)
-#define GL_TRACE_WRAPPER  "opengl32.dll"
-#else
-#define TRACE_VARIABLE "LD_PRELOAD"
-#define GL_TRACE_WRAPPER  "glxtrace.so"
-#define EGL_TRACE_WRAPPER  "egltrace.so"
-#endif
-
-
-static inline bool
-copyWrapper(const os::String & wrapperPath,
-            const char *programPath,
-            bool verbose)
-{
-    os::String wrapperFilename(wrapperPath);
-    wrapperFilename.trimDirectory();
-
-    os::String tmpWrapper(programPath);
-    tmpWrapper.trimFilename();
-    tmpWrapper.join(wrapperFilename);
-
-    if (verbose) {
-        std::cerr << wrapperPath << " -> " << tmpWrapper << "\n";
-    }
-
-    if (tmpWrapper.exists()) {
-        std::cerr << "error: not overwriting " << tmpWrapper << "\n";
-        return false;
-    }
-
-    if (!os::copyFile(wrapperPath, tmpWrapper, false)) {
-        std::cerr << "error: failed to copy " << wrapperPath << " into " << tmpWrapper << "\n";
-        return false;
-    }
-
-    return true;
-}
-
-
-int
-traceProgram(API api,
-             char * const *argv,
-             const char *output,
-             bool verbose)
-{
-    const char *wrapperFilename;
-    std::vector<const char *> args;
-    int status = 1;
-
-    /*
-     * TODO: simplify code
-     */
-
-    bool useInject = false;
-    switch (api) {
-    case API_GL:
-        wrapperFilename = GL_TRACE_WRAPPER;
-        break;
-#ifdef EGL_TRACE_WRAPPER
-    case API_EGL:
-        wrapperFilename = EGL_TRACE_WRAPPER;
-        break;
-#endif
-#ifdef _WIN32
-    case API_D3D7:
-        wrapperFilename = "ddraw.dll";
-        break;
-    case API_D3D8:
-        wrapperFilename = "d3d8.dll";
-        break;
-    case API_D3D9:
-        wrapperFilename = "d3d9.dll";
-        break;
-    case API_D3D10:
-    case API_D3D10_1:
-    case API_D3D11:
-        wrapperFilename = "dxgitrace.dll";
-        useInject = true;
-        break;
-#endif
-    default:
-        std::cerr << "error: unsupported API\n";
-        return 1;
-    }
-
-    os::String wrapperPath = findWrapper(wrapperFilename);
-    if (!wrapperPath.length()) {
-        std::cerr << "error: failed to find " << wrapperFilename << "\n";
-        goto exit;
-    }
-
-#if defined(_WIN32)
-    if (useInject) {
-        args.push_back("inject");
-        args.push_back(wrapperPath);
-    } else {
-        /* On Windows copy the wrapper to the program directory.
-         */
-        if (!copyWrapper(wrapperPath, argv[0], verbose)) {
-            goto exit;
-        }
-    }
-#else  /* !_WIN32 */
-    (void)useInject;
-#endif /* !_WIN32 */
-
-#if defined(__APPLE__)
-    /* On Mac OS X, using DYLD_LIBRARY_PATH, we actually set the
-     * directory, not the file. */
-    wrapperPath.trimFilename();
-#endif
-
-#if defined(TRACE_VARIABLE)
-    if (verbose) {
-        std::cerr << TRACE_VARIABLE << "=" << wrapperPath.str() << "\n";
-    }
-    /* FIXME: Don't modify the current environment */
-    os::setEnvironment(TRACE_VARIABLE, wrapperPath.str());
-#endif /* TRACE_VARIABLE */
-
-    if (output) {
-        os::setEnvironment("TRACE_FILE", output);
-    }
-
-    for (char * const * arg = argv; *arg; ++arg) {
-        args.push_back(*arg);
-    }
-    args.push_back(NULL);
-
-    if (verbose) {
-        const char *sep = "";
-        for (unsigned i = 0; i < args.size(); ++i) {
-            std::cerr << sep << args[i];
-            sep = " ";
-        }
-        std::cerr << "\n";
-    }
-
-    status = os::execute((char * const *)&args[0]);
-
-exit:
-#if defined(TRACE_VARIABLE)
-    os::unsetEnvironment(TRACE_VARIABLE);
-#endif
-#if defined(_WIN32)
-    if (!useInject) {
-        os::String tmpWrapper(argv[0]);
-        tmpWrapper.trimFilename();
-        tmpWrapper.join(wrapperFilename);
-        os::removeFile(tmpWrapper);
-    }
-#endif
-
-    if (output) {
-        os::unsetEnvironment("TRACE_FILE");
-    }
-    
-    return status;
-
-}
-
-
-} /* namespace trace */