Changes done by Darin, reviewed by Kevin.

        - changed testkjs to build in Xcode rather than from Makefile

        * .cvsignore: Removed obsolete files from this list.
        * Makefile.am: Removed code to build testkjs; we do this in Xcode now.
        Changed to build target "All" rather than default target. This makes us
        build the testkjs test tool.
        * dummy.cpp: Removed.
        * kjs/.cvsignore: Removed obsolete files from this list, including
        the testkjs tool, which is now built in the symroots directory.
        * kjs/testkjs.cpp: Added copyright notice that was missing, since we have
        changed this file. Also this has the nice side effect of causing the tool
        to be rebuilt in the new location even if there are no other changes in
        your tree when you check this out.
        * tests/mozilla/run-mozilla-tests: Invoke perl explicitly so this works
        without setting the execute bit on jsDriver.pl.

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

diff --git a/JavaScriptCore/.cvsignore b/JavaScriptCore/.cvsignore
index c0e9837d8caaa0a3c1c3c37790e8f4229370d870..f7fab61fd48a616f5f9e0527054d08901e991a3e 100644 (file)
--- a/JavaScriptCore/.cvsignore
+++ b/JavaScriptCore/.cvsignore
@@ -1,5 +1,3 @@
 Makefile.in
 Makefile
 JavaScriptCore-stamp
-JavaScriptCore-install-stamp
-libJavaScriptCore.dylib

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 6d9c5837b1125271f122e313f3555fb622e41077..f51345b74e064b0d3440eab9710fa0be04190486 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,23 @@
+2004-07-26  Kevin Decker  <kdecker@apple.com>
+
+        Changes done by Darin, reviewed by Kevin.
+
+        - changed testkjs to build in Xcode rather than from Makefile
+
+        * .cvsignore: Removed obsolete files from this list.
+        * Makefile.am: Removed code to build testkjs; we do this in Xcode now.
+        Changed to build target "All" rather than default target. This makes us
+        build the testkjs test tool.
+        * dummy.cpp: Removed.
+        * kjs/.cvsignore: Removed obsolete files from this list, including
+        the testkjs tool, which is now built in the symroots directory.
+        * kjs/testkjs.cpp: Added copyright notice that was missing, since we have
+        changed this file. Also this has the nice side effect of causing the tool
+        to be rebuilt in the new location even if there are no other changes in
+        your tree when you check this out.
+        * tests/mozilla/run-mozilla-tests: Invoke perl explicitly so this works
+        without setting the execute bit on jsDriver.pl.
+
 2004-07-22  Kevin Decker  <kdecker@apple.com>
 
         Reviewed by Darin

diff --git a/JavaScriptCore/Makefile.am b/JavaScriptCore/Makefile.am
index 346e0e0851682e7560dae604636f9630979f727a..46df649c21e2efdfd1788927150d3e5d46e39957 100644 (file)
--- a/JavaScriptCore/Makefile.am
+++ b/JavaScriptCore/Makefile.am
@@ -1,18 +1,10 @@
 SUBDIRS = pcre kjs
 
-# FIXME: need to build the other kjs test program too
-
-INCLUDES = -I $(top_srcdir)/JavaScriptCore/kjs
-noinst_PROGRAMS = kjs/testkjs
-kjs_testkjs_SOURCES = kjs/testkjs.cpp
-kjs_testkjs_DEPENDENCIES = JavaScriptCore-stamp
-kjs_testkjs_LDFLAGS = -F$(SYMROOTS) -framework JavaScriptCore
-
 all-am: JavaScriptCore-stamp
 JavaScriptCore-stamp: kjs/*.cpp kjs/*.h pcre/*.c pcre/*.h bindings/*.h bindings/*.cpp bindings/jni/*.cpp bindings/jni/*.h bindings/objc/*.h bindings/objc/*.mm bindings/c/*.h bindings/c/*.cpp
-       xcodebuild -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) && touch $@
+       xcodebuild -target All -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) && touch $@
 clean-am:
-       xcodebuild clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS)
+       xcodebuild -target All clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS)
        rm -rf $(SYMROOTS)/JavaScriptCore.build
        rm -rf $(SYMROOTS)/JavaScriptCore.framework
        rm -rf $(SYMROOTS)/Safari.app/Frameworks/JavaScriptCore.framework

diff --git a/JavaScriptCore/dummy.cpp b/JavaScriptCore/dummy.cpp
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/JavaScriptCore/kjs/.cvsignore b/JavaScriptCore/kjs/.cvsignore
index 6ecb89ac396676d89fcc6d4c357bfcb053e65804..737b385bd735d37089e50b0efcf46cbe8f6db594 100644 (file)
--- a/JavaScriptCore/kjs/.cvsignore
+++ b/JavaScriptCore/kjs/.cvsignore
@@ -1,9 +1,4 @@
 Makefile.in
 Makefile
-testkjs
-.deps
-*-stamp
-.libs
-kjs-test.diff
-kjs-test.out
 .dirstamp
+grammar-stamp

diff --git a/JavaScriptCore/kjs/testkjs.cpp b/JavaScriptCore/kjs/testkjs.cpp
index 55faa1394cde64bfc100152c040ffef8804ecb1b..2c8eac95a42c91d954c658a76a554d416646412d 100644 (file)
--- a/JavaScriptCore/kjs/testkjs.cpp
+++ b/JavaScriptCore/kjs/testkjs.cpp
@@ -2,6 +2,7 @@
 /*
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
+ *  Copyright (C) 2004 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

diff --git a/JavaScriptCore/tests/mozilla/run-mozilla-tests b/JavaScriptCore/tests/mozilla/run-mozilla-tests
index 0222506bb4e3ba3860f7f3c39364d7d688c21744..4a25b727792de800a1ae164cfbebf146c43b88ec 100755 (executable)
--- a/JavaScriptCore/tests/mozilla/run-mozilla-tests
+++ b/JavaScriptCore/tests/mozilla/run-mozilla-tests
@@ -1,2 +1,2 @@
-./jsDriver.pl -e kjs -L ecma/Date -f actual.html
+perl jsDriver.pl -e kjs -L ecma/Date -f actual.html
 jst expected.html actual.html