diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 18:27:38 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 18:27:38 +0000 |
commit | 7bcfbb4296c517f0c6f27c23065065a0b5568b59 (patch) | |
tree | d0e804359a9bd9e0f697751d624be5d53215b6b4 /webkit/build/JavaScriptCore | |
parent | ab5b9a361b7e6674c04071fa63dc2fce8491b196 (diff) | |
download | chromium_src-7bcfbb4296c517f0c6f27c23065065a0b5568b59.zip chromium_src-7bcfbb4296c517f0c6f27c23065065a0b5568b59.tar.gz chromium_src-7bcfbb4296c517f0c6f27c23065065a0b5568b59.tar.bz2 |
Revert "Delete a bunch of deprecated and/or empty directores in src/webkit/."
This reverts commit r32340.
TBR=japhet
Review URL: http://codereview.chromium.org/402054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JavaScriptCore')
-rwxr-xr-x | webkit/build/JavaScriptCore/build-generated-files.sh | 47 | ||||
-rw-r--r-- | webkit/build/JavaScriptCore/copy_files.bat | 22 | ||||
-rw-r--r-- | webkit/build/JavaScriptCore/prebuild.bat | 32 | ||||
-rw-r--r-- | webkit/build/JavaScriptCore/pthread.h | 94 | ||||
-rw-r--r-- | webkit/build/JavaScriptCore/sched.h | 14 |
5 files changed, 209 insertions, 0 deletions
diff --git a/webkit/build/JavaScriptCore/build-generated-files.sh b/webkit/build/JavaScriptCore/build-generated-files.sh new file mode 100755 index 0000000..8644af3 --- /dev/null +++ b/webkit/build/JavaScriptCore/build-generated-files.sh @@ -0,0 +1,47 @@ +#!/usr/bin/bash + +# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This file just sets some paths then defers file creation to +# DerivedSources.make. +# This file is almost the same as the one found in webkit. The only +# difference is that some paths have changed and we don't try to detect +# the number of CPUs. + +NUMCPUS=1 + +XSRCROOT="`pwd`/../.." +XSRCROOT=`realpath "$XSRCROOT"` +# Do a little dance to get the path into 8.3 form to make it safe for gnu make +# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173 +XSRCROOT=`cygpath -m -s "$XSRCROOT"` +XSRCROOT=`cygpath -u "$XSRCROOT"` +export XSRCROOT +export SOURCE_ROOT=$XSRCROOT + +XDSTROOT="$1" +export XDSTROOT +# Do a little dance to get the path into 8.3 form to make it safe for gnu make +# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173 +XDSTROOT=`cygpath -m -s "$XDSTROOT"` +XDSTROOT=`cygpath -u "$XDSTROOT"` +export XDSTROOT + +SDKROOT="$2" +export SDKROOT +# Do a little dance to get the path into 8.3 form to make it safe for gnu make +# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173 +SDKROOT=`cygpath -m -s "$SDKROOT"` +SDKROOT=`cygpath -u "$SDKROOT"` +export SDKROOT + +export BUILT_PRODUCTS_DIR="$XDSTROOT" + +mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources" +cd "${BUILT_PRODUCTS_DIR}/DerivedSources" + +export JavaScriptCore="${XSRCROOT}/../third_party/WebKit/JavaScriptCore" +export DFTABLES_EXTENSION=".exe" +make -f "$JavaScriptCore/DerivedSources.make" -j ${NUMCPUS} || exit 1 diff --git a/webkit/build/JavaScriptCore/copy_files.bat b/webkit/build/JavaScriptCore/copy_files.bat new file mode 100644 index 0000000..431032b --- /dev/null +++ b/webkit/build/JavaScriptCore/copy_files.bat @@ -0,0 +1,22 @@ +@echo off + +set DIR=%1 +set JAVASCRIPTCORE_DIR="..\..\..\third_party\WebKit\JavaScriptCore" +setlocal + +mkDIR 2>NUL %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\APICast.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JavaScript.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSBase.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSContextRef.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSObjectRef.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSStringRef.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSStringRefCF.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSStringRefBSTR.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSValueRef.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JavaScriptCore.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSRetainPtr.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\OpaqueJSString.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\WebKitAvailability.h" %DIR% + +endlocal diff --git a/webkit/build/JavaScriptCore/prebuild.bat b/webkit/build/JavaScriptCore/prebuild.bat new file mode 100644 index 0000000..fd7b878 --- /dev/null +++ b/webkit/build/JavaScriptCore/prebuild.bat @@ -0,0 +1,32 @@ +REM @echo off + +setlocal +set IntDir=%1 +set OutDir=%2 +set CYGWIN_ROOT=%~dp0..\..\..\third_party\cygwin\ +set GNU_ROOT=%~dp0..\..\..\third_party\gnu\files + +set PATH=%CYGWIN_ROOT%bin;%GNU_ROOT%;%SystemRoot%;%SystemRoot%\system32 + +:: Ensure that the cygwin mount points are defined +CALL %CYGWIN_ROOT%setup_mount.bat > NUL + +:: Fix tempfile() on vista: without this flag, the files that it creates are not accessible. +set CYGWIN=nontsec + +:: Help dftables script to find a usable temporary directory. For an unknown +:: reason, /tmp is not defined on cygwin and this script looks at TMPDIR +:: environment variable, which is usually not defined on Windows either. +if "%TMPDIR%" == "" ( + REM It fails in even stranger way if the TEMP folder is not owned by the + REM current user, so create a folder to make sure we are the owner. + set TMPDIR=%TEMP%\javascriptcore_pcre + mkdir %TEMP%\javascriptcore_pcre + bash build-generated-files.sh "%IntDir%" "..\..\..\third_party\WebKit" + rd /q /s %TEMP%\javascriptcore_pcre +) else ( + bash build-generated-files.sh "%IntDir%" "..\..\..\third_party\WebKit" +) + +call copy_files.bat %IntDir%\JavaScriptCore +endlocal diff --git a/webkit/build/JavaScriptCore/pthread.h b/webkit/build/JavaScriptCore/pthread.h new file mode 100644 index 0000000..3259fe8 --- /dev/null +++ b/webkit/build/JavaScriptCore/pthread.h @@ -0,0 +1,94 @@ +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_WEBKIT_BUILD_JAVASCRIPTCORE_PTHREAD_H__ +#define CHROME_WEBKIT_BUILD_JAVASCRIPTCORE_PTHREAD_H__ + +#include <errno.h> +#include "wtf/Assertions.h" + +// Dummy implementations of various pthread APIs + +// ---------------------------------------------------------------------------- +// pthread_t + +typedef int pthread_t; + +inline pthread_t pthread_self() { + return 0; +} +inline int pthread_equal(pthread_t a, pthread_t b) { + return a == b; +} +inline int pthread_create(pthread_t* thread, void*, void* (*)(void*), void*) { + ASSERT_NOT_REACHED(); + return EINVAL; +} +inline int pthread_join(pthread_t thread, void **) { + ASSERT_NOT_REACHED(); + return EINVAL; +} + +// ---------------------------------------------------------------------------- +// pthread_mutex_t + +typedef int pthread_mutex_t; + +inline int pthread_mutex_init(pthread_mutex_t* mutex, const void*) { + return 0; +} +inline int pthread_mutex_destroy(pthread_mutex_t* mutex) { + return 0; +} +inline int pthread_mutex_lock(pthread_mutex_t* mutex) { + return 0; +} + +inline int pthread_mutex_trylock(pthread_mutex_t* mutex) { + return 0; +} + +inline int pthread_mutex_unlock(pthread_mutex_t* mutex) { + return 0; +} + +#define PTHREAD_MUTEX_INITIALIZER 0 + +// +// pthread_cond_t +typedef int pthread_cond_t; + +inline int pthread_cond_init(pthread_cond_t* cond, const void*) { + return 0; +} +inline int pthread_cond_destroy(pthread_cond_t* cond) { + return 0; +} + +inline int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *) { + return 0; +} +inline int pthread_cond_signal(pthread_cond_t *) { + return 0; +} +inline int pthread_cond_broadcast(pthread_cond_t *) { + return 0; +} + +// ---------------------------------------------------------------------------- +// pthread_key_t + +typedef int pthread_key_t; + +void pthread_setspecific(pthread_key_t key, void* value) { + TlsSetValue(key, value); +} + +void pthread_key_create(pthread_key_t* key, void* destructor) { + // TODO(mbelshe): hook up the per-thread destructor. + *key = TlsAlloc(); +} + + +#endif // CHROME_WEBKIT_BUILD_JAVASCRIPTCORE_PTHREAD_H__ diff --git a/webkit/build/JavaScriptCore/sched.h b/webkit/build/JavaScriptCore/sched.h new file mode 100644 index 0000000..276e87a --- /dev/null +++ b/webkit/build/JavaScriptCore/sched.h @@ -0,0 +1,14 @@ +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef WEBKIT_BUILD_JAVASCRIPTCORE_SCHED_H__ +#define WEBKIT_BUILD_JAVASCRIPTCORE_SCHED_H__ + +// Dummy implementation of sched.h so WTF will compile. + +inline int sched_yield() { + return 0; +} + +#endif // WEBKIT_BUILD_JAVASCRIPTCORE_SCHED_H__ |