2006-09-15 Anders Carlsson <acarlsson@apple.com>
authorandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Sep 2006 21:52:16 +0000 (21:52 +0000)
committerandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Sep 2006 21:52:16 +0000 (21:52 +0000)
        Reviewed by Steve.

        Add JavaScriptCore API to the build.
        * API/JSBase.cpp:
        * API/JSCallbackConstructor.cpp:
        * API/JSCallbackFunction.cpp:
        * API/JSCallbackObject.cpp:
        * API/JSClassRef.cpp:
        * API/JSContextRef.cpp:
        * API/JSObjectRef.cpp:
        * API/JSStringRef.cpp:
        * API/JSValueRef.cpp:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * os-win32/stdbool.h: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16371 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
JavaScriptCore/API/JSBase.cpp
JavaScriptCore/API/JSCallbackConstructor.cpp
JavaScriptCore/API/JSCallbackFunction.cpp
JavaScriptCore/API/JSCallbackObject.cpp
JavaScriptCore/API/JSClassRef.cpp
JavaScriptCore/API/JSContextRef.cpp
JavaScriptCore/API/JSObjectRef.cpp
JavaScriptCore/API/JSStringRef.cpp
JavaScriptCore/API/JSValueRef.cpp
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
JavaScriptCore/os-win32/stdbool.h [new file with mode: 0644]

index ed0834ad87044b00a5df79b344ae147c4116b7b9..e18498e463a6bf289e83f962f5077836e6e3e664 100644 (file)
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include <wtf/Platform.h>
 #include "JSBase.h"
 
 #include "APICast.h"
index a4e3507a8ada3fce927545d8dbbb8581b42f3fc8..3f240faa57d06decb40321ed8fa5cb0c5f2aa432 100644 (file)
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include <wtf/Platform.h>
 #include "JSCallbackConstructor.h"
 
 #include "APICast.h"
index b921cea7abc56e755d3052e9dd0da4e11fdfd26f..9f08e627559d8dde658f82161f4503f55fcff155 100644 (file)
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include <wtf/Platform.h>
 #include "JSCallbackFunction.h"
 
 #include "APICast.h"
index b0c4b2a51c7d97a1872406051ccfd0b46d9eaee4..a2c41dd4ced66c72d63acb99ec64214ef026ec8f 100644 (file)
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include <wtf/Platform.h>
 #include "JSCallbackObject.h"
 
 #include "APICast.h"
index b6882abf91eeb01da15cd24bd6365726f9cd9df9..0394d6b377cfc11eb15272771b971ecdbde1ded6 100644 (file)
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include <wtf/Platform.h>
 #include "APICast.h"
 #include "JSCallbackObject.h"
 #include "JSClassRef.h"
index 3dbd705b6b201ef03498dcfbe2855779a5f0d193..2f1c622bd880022c91f25b57eda2fdf4e0fe9dc2 100644 (file)
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include <wtf/Platform.h>
 #include "APICast.h"
 #include "JSContextRef.h"
 
index 8d6a211d186b1299e615c4c82d2f15148471d8be..e32e34630a960194fce7b7dafbc62dc843ccd0e9 100644 (file)
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include <wtf/Platform.h>
 #include "APICast.h"
 #include "JSValueRef.h"
 #include "JSObjectRef.h"
index ab5e45ff4c4d95af700f785ec4ac4402a9b8864a..e73ab233f9342296f105ffb3291a63640eeabb5b 100644 (file)
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include <wtf/Platform.h>
 #include "APICast.h"
 #include "JSStringRef.h"
 
index 8b8a356d45be41991f080be790eb727eea8574c0..2208d517f3dc0c8419b1bd5346a5a1d70980a07a 100644 (file)
@@ -24,6 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include <wtf/Platform.h>
 #include "APICast.h"
 #include "JSCallbackObject.h"
 #include "JSValueRef.h"
index 04fdf693e9f0b3ed994ee7866ed6452ee5579655..f1618e19e4f467c611404507ba5b2d0b71e57b6e 100644 (file)
@@ -1,3 +1,20 @@
+2006-09-15  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Steve.
+
+        Add JavaScriptCore API to the build.
+        * API/JSBase.cpp:
+        * API/JSCallbackConstructor.cpp:
+        * API/JSCallbackFunction.cpp:
+        * API/JSCallbackObject.cpp:
+        * API/JSClassRef.cpp:
+        * API/JSContextRef.cpp:
+        * API/JSObjectRef.cpp:
+        * API/JSStringRef.cpp:
+        * API/JSValueRef.cpp:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * os-win32/stdbool.h: Added.
+
 2006-09-12  Steve Falkenburg  <sfalken@apple.com>
 
         Reviewed by Ada.
index 7a135a563cc783261aac3ad534db4fa76896de85..0027c450f38a6ef15a26d2ce0908fa0a1b9b244e 100644 (file)
@@ -26,7 +26,7 @@
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Constructing generated files..."
-                               CommandLine="bash build-generated-files.sh &quot;$(ConfigurationName)&quot; &quot;$(WebKitOutputDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(WebkitOutputDir)\bin\dftables_debug.exe&quot; &quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\chartables.c&quot;&#x0D;&#x0A;"
+                               CommandLine="bash build-generated-files.sh &quot;$(ConfigurationName)&quot; &quot;$(WebKitOutputDir)&quot;&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(WebkitOutputDir)\bin\dftables_debug.exe&quot; &quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\chartables.c&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSBase.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSContextRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSObjectRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSStringRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JSValueRef.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\JavaScriptCore.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -45,7 +45,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitSDKDir)\include\icu&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni"
+                               AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../kjs/;../../wtf/;&quot;$(WebKitSDKDir)\include\icu&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;"
                                PreprocessorDefinitions="HAVE_CONFIG_H;WIN32;__STD_C"
                                MinimalRebuild="true"
                                ExceptionHandling="0"
@@ -86,7 +86,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf\os-win32&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\pcre&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\os-win32\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf\os-win32&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\kjs\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\kjs\create_hash_table&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\pcre\pcre.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\pcre&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npruntime.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npapi.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npruntime_impl.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\NP_jsobject.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\runtime_root.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\bindings&quot;&#x0D;&#x0A;&#x0D;&#x0A;dir &gt; &quot;$(TargetDir)WTF_debug.lib&quot;&#x0D;&#x0A;xcopy /y /i &quot;$(TargetPath)&quot; &quot;$(TargetDir)WTF_debug.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;dstroot-to-sdk.cmd JavaScriptCore&#x0D;&#x0A;"
+                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf\os-win32&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\include\JavaScriptCore\pcre&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\wtf\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\os-win32\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\wtf\os-win32&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\kjs\*.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\kjs\create_hash_table&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\kjs&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\pcre\pcre.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\pcre&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npruntime.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npapi.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\npruntime_impl.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\NP_jsobject.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\runtime_object.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\runtime_root.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\bindings\runtime.h&quot; &quot;$(WebKitOutputDir)\include\JavaScriptCore\JavaScriptCore&quot;&#x0D;&#x0A;&#x0D;&#x0A;dir &gt; &quot;$(TargetDir)WTF_debug.lib&quot;&#x0D;&#x0A;xcopy /y /i &quot;$(TargetPath)&quot; &quot;$(TargetDir)WTF_debug.lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;dstroot-to-sdk.cmd JavaScriptCore&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
                                >
                        </File>
                </Filter>
+               <Filter
+                       Name="API"
+                       >
+                       <File
+                               RelativePath="..\..\API\APICast.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JavaScriptCore.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSBase.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSBase.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSCallbackConstructor.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSCallbackConstructor.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSCallbackFunction.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSCallbackFunction.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSCallbackObject.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSCallbackObject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSClassRef.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSClassRef.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSContextRef.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSContextRef.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSObjectRef.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSObjectRef.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSStringRef.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSStringRef.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSValueRef.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\API\JSValueRef.h"
+                               >
+                       </File>
+               </Filter>
        </Files>
        <Globals>
        </Globals>
diff --git a/JavaScriptCore/os-win32/stdbool.h b/JavaScriptCore/os-win32/stdbool.h
new file mode 100644 (file)
index 0000000..8e7bace
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2005, 2006 Apple Computer, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef STDBOOL_WIN32_H
+#define STDBOOL_WIN32_H
+
+#if !PLATFORM(WIN_OS)
+#error "This stdbool.h file should only be compiled under Windows"
+#endif
+
+#ifndef __cplusplus
+
+typedef unsigned char bool;
+
+#define true 1
+#define false 0
+
+#ifndef CASSERT
+#define CASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1];
+#endif
+
+CASSERT(sizeof(bool) == 1, bool_is_one_byte)
+CASSERT(true, true_is_true)
+CASSERT(!false, false_is_false)
+
+#endif
+
+#endif