2008-11-05 Cameron Zwarich <zwarich@apple.com>
authorcwzwarich@webkit.org <cwzwarich@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Nov 2008 08:53:06 +0000 (08:53 +0000)
committercwzwarich@webkit.org <cwzwarich@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Nov 2008 08:53:06 +0000 (08:53 +0000)
        Rubber-stamped by Sam Weinig.

        Move create_hash_table and jsc.pro out of the kjs directory and into the
        root directory of JavaScriptCore.

        JavaScriptCore:

        * DerivedSources.make:
        * JavaScriptCore.pri:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.xcodeproj/project.pbxproj:
        * create_hash_table: Copied from kjs/create_hash_table.
        * jsc.pro: Copied from kjs/jsc.pro.
        * kjs/create_hash_table: Removed.
        * kjs/jsc.pro: Removed.
        * make-generated-sources.sh:

        * WebKit.pro:

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

ChangeLog
JavaScriptCore/ChangeLog
JavaScriptCore/DerivedSources.make
JavaScriptCore/JavaScriptCore.pri
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
JavaScriptCore/create_hash_table [moved from JavaScriptCore/kjs/create_hash_table with 100% similarity]
JavaScriptCore/jsc.pro [moved from JavaScriptCore/kjs/jsc.pro with 100% similarity]
JavaScriptCore/make-generated-sources.sh
WebKit.pro

index a380ea1..6509f39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-05  Cameron Zwarich  <zwarich@apple.com>
+
+        Rubber-stamped by Sam Weinig.
+
+        Correct the reference to jsc.pro in WebKit.pro to match its new
+        location in the root directory of JavaScriptCore.
+
+        * WebKit.pro:
+
 2008-11-03  Alp Toker  <alp@nuanti.com>
 
         autotools distcleancheck fix. Add dolt-generated files and
index 9c975ba..e38bb48 100644 (file)
@@ -1,3 +1,20 @@
+2008-11-05  Cameron Zwarich  <zwarich@apple.com>
+
+        Rubber-stamped by Sam Weinig.
+
+        Move create_hash_table and jsc.pro out of the kjs directory and into the
+        root directory of JavaScriptCore.
+
+        * DerivedSources.make:
+        * JavaScriptCore.pri:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * create_hash_table: Copied from kjs/create_hash_table.
+        * jsc.pro: Copied from kjs/jsc.pro.
+        * kjs/create_hash_table: Removed.
+        * kjs/jsc.pro: Removed.
+        * make-generated-sources.sh:
+
 2008-11-05  Gavin Barraclough  <barraclough@apple.com>
 
         Reviewed by Maciej Stachowiak.
index e152979..ba0a74a 100644 (file)
@@ -25,6 +25,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 VPATH = \
+    $(JavaScriptCore) \
     $(JavaScriptCore)/kjs \
     $(JavaScriptCore)/VM \
     $(JavaScriptCore)/pcre \
index e00a7a0..21f543c 100644 (file)
@@ -148,7 +148,7 @@ SOURCES += \
 
 # GENERATOR 1-A: LUT creator
 lut.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.lut.h
-lut.commands = perl $$PWD/kjs/create_hash_table ${QMAKE_FILE_NAME} -i > ${QMAKE_FILE_OUT}
+lut.commands = perl $$PWD/create_hash_table ${QMAKE_FILE_NAME} -i > ${QMAKE_FILE_OUT}
 lut.depend = ${QMAKE_FILE_NAME}
 lut.input = LUT_FILES
 lut.CONFIG += no_link
@@ -156,7 +156,7 @@ addExtraCompiler(lut)
 
 # GENERATOR 1-B: particular LUT creator (for 1 file only)
 keywordlut.output = $$GENERATED_SOURCES_DIR/lexer.lut.h
-keywordlut.commands = perl $$PWD/kjs/create_hash_table ${QMAKE_FILE_NAME} -i > ${QMAKE_FILE_OUT}
+keywordlut.commands = perl $$PWD/create_hash_table ${QMAKE_FILE_NAME} -i > ${QMAKE_FILE_OUT}
 keywordlut.depend = ${QMAKE_FILE_NAME}
 keywordlut.input = KEYWORDLUT_FILES
 keywordlut.CONFIG += no_link
index 950fc36..960a0f6 100644 (file)
                        isa = PBXGroup;
                        children = (
                                937B63CC09E766D200A671DD /* DerivedSources.make */,
+                               F692A8540255597D01FF60F7 /* create_hash_table */,
                                14B8ECA60A5653980062BE54 /* JavaScriptCore.exp */,
                                F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */,
                                659126BC0BDD1728001921FB /* AllInOneFile.cpp */,
                65417200039E01BA0058BFEB /* kjs */ = {
                        isa = PBXGroup;
                        children = (
-                               F692A8540255597D01FF60F7 /* create_hash_table */,
                                933A3499038AE7C6008635CE /* grammar.y */,
                                93F1981A08245AAE001E9ABC /* keywords.table */,
                                869EBCB60E8C6D4A008722CC /* ResultType.h */,
index e1e247b..943a7cc 100755 (executable)
@@ -2,7 +2,7 @@
 
 export SRCROOT=$PWD
 export WebCore=$PWD
-export CREATE_HASH_TABLE="$SRCROOT/kjs/create_hash_table"
+export CREATE_HASH_TABLE="$SRCROOT/create_hash_table"
 
 mkdir -p DerivedSources/JavaScriptCore
 cd DerivedSources/JavaScriptCore
index 035f73a..82aab37 100644 (file)
@@ -4,7 +4,7 @@ CONFIG += ordered
 SUBDIRS += \
         JavaScriptCore \
         WebCore \
-        JavaScriptCore/kjs/jsc.pro \
+        JavaScriptCore/jsc.pro \
         WebKit/qt/QtLauncher \
         WebKit/qt/tests