From f368350fa677cebb24c2199d7af5a2a60f194cb7 Mon Sep 17 00:00:00 2001 From: "cwzwarich@webkit.org" Date: Thu, 6 Nov 2008 08:53:06 +0000 Subject: [PATCH] 2008-11-05 Cameron Zwarich 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: http://svn.webkit.org/repository/webkit/trunk@38155 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 9 +++++++++ JavaScriptCore/ChangeLog | 17 +++++++++++++++++ JavaScriptCore/DerivedSources.make | 1 + JavaScriptCore/JavaScriptCore.pri | 4 ++-- .../JavaScriptCore.xcodeproj/project.pbxproj | 2 +- JavaScriptCore/{kjs => }/create_hash_table | 0 JavaScriptCore/{kjs => }/jsc.pro | 0 JavaScriptCore/make-generated-sources.sh | 2 +- WebKit.pro | 2 +- 9 files changed, 32 insertions(+), 5 deletions(-) rename JavaScriptCore/{kjs => }/create_hash_table (100%) rename JavaScriptCore/{kjs => }/jsc.pro (100%) diff --git a/ChangeLog b/ChangeLog index a380ea1e1a8..6509f39fb86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-11-05 Cameron Zwarich + + 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 autotools distcleancheck fix. Add dolt-generated files and diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index 9c975ba1151..e38bb482ec1 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,20 @@ +2008-11-05 Cameron Zwarich + + 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 Reviewed by Maciej Stachowiak. diff --git a/JavaScriptCore/DerivedSources.make b/JavaScriptCore/DerivedSources.make index e1529795ad4..ba0a74a71a3 100644 --- a/JavaScriptCore/DerivedSources.make +++ b/JavaScriptCore/DerivedSources.make @@ -25,6 +25,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VPATH = \ + $(JavaScriptCore) \ $(JavaScriptCore)/kjs \ $(JavaScriptCore)/VM \ $(JavaScriptCore)/pcre \ diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri index e00a7a07f97..21f543cae5f 100644 --- a/JavaScriptCore/JavaScriptCore.pri +++ b/JavaScriptCore/JavaScriptCore.pri @@ -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 diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj index 950fc366c76..960a0f6acc9 100644 --- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj +++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj @@ -815,6 +815,7 @@ isa = PBXGroup; children = ( 937B63CC09E766D200A671DD /* DerivedSources.make */, + F692A8540255597D01FF60F7 /* create_hash_table */, 14B8ECA60A5653980062BE54 /* JavaScriptCore.exp */, F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */, 659126BC0BDD1728001921FB /* AllInOneFile.cpp */, @@ -1083,7 +1084,6 @@ 65417200039E01BA0058BFEB /* kjs */ = { isa = PBXGroup; children = ( - F692A8540255597D01FF60F7 /* create_hash_table */, 933A3499038AE7C6008635CE /* grammar.y */, 93F1981A08245AAE001E9ABC /* keywords.table */, 869EBCB60E8C6D4A008722CC /* ResultType.h */, diff --git a/JavaScriptCore/kjs/create_hash_table b/JavaScriptCore/create_hash_table similarity index 100% rename from JavaScriptCore/kjs/create_hash_table rename to JavaScriptCore/create_hash_table diff --git a/JavaScriptCore/kjs/jsc.pro b/JavaScriptCore/jsc.pro similarity index 100% rename from JavaScriptCore/kjs/jsc.pro rename to JavaScriptCore/jsc.pro diff --git a/JavaScriptCore/make-generated-sources.sh b/JavaScriptCore/make-generated-sources.sh index e1e247b177f..943a7ccda15 100755 --- a/JavaScriptCore/make-generated-sources.sh +++ b/JavaScriptCore/make-generated-sources.sh @@ -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 diff --git a/WebKit.pro b/WebKit.pro index 035f73aa3f8..82aab37be26 100644 --- a/WebKit.pro +++ b/WebKit.pro @@ -4,7 +4,7 @@ CONFIG += ordered SUBDIRS += \ JavaScriptCore \ WebCore \ - JavaScriptCore/kjs/jsc.pro \ + JavaScriptCore/jsc.pro \ WebKit/qt/QtLauncher \ WebKit/qt/tests -- GitLab