[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:17:42 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit afbc83f5c4e24877ce26304b69a99e3815aa925c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jun 8 06:48:29 2002 +0000
* Makefile.am: Use new shared "embed.am" file so we don't need four copies of
the embedding rules for WebFoundation, JavaScriptCore, WebCore, and WebKit.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1313 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index efe07d4..c4a84d9 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,10 @@
2002-06-07 Darin Adler <darin at apple.com>
+ * Makefile.am: Use new shared "embed.am" file so we don't need four copies of
+ the embedding rules for WebFoundation, JavaScriptCore, WebCore, and WebKit.
+
+2002-06-07 Darin Adler <darin at apple.com>
+
* JavaScriptCore.pbproj/project.pbxproj: Don't use any warning flags for C that won't work
for C++, because PFE uses the C warning flags on a C++ compile.
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index efe07d4..c4a84d9 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
2002-06-07 Darin Adler <darin at apple.com>
+ * Makefile.am: Use new shared "embed.am" file so we don't need four copies of
+ the embedding rules for WebFoundation, JavaScriptCore, WebCore, and WebKit.
+
+2002-06-07 Darin Adler <darin at apple.com>
+
* JavaScriptCore.pbproj/project.pbxproj: Don't use any warning flags for C that won't work
for C++, because PFE uses the C warning flags on a C++ compile.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index efe07d4..c4a84d9 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
2002-06-07 Darin Adler <darin at apple.com>
+ * Makefile.am: Use new shared "embed.am" file so we don't need four copies of
+ the embedding rules for WebFoundation, JavaScriptCore, WebCore, and WebKit.
+
+2002-06-07 Darin Adler <darin at apple.com>
+
* JavaScriptCore.pbproj/project.pbxproj: Don't use any warning flags for C that won't work
for C++, because PFE uses the C warning flags on a C++ compile.
diff --git a/JavaScriptCore/Makefile.am b/JavaScriptCore/Makefile.am
index 8f6415b..cfb0e32 100644
--- a/JavaScriptCore/Makefile.am
+++ b/JavaScriptCore/Makefile.am
@@ -1,47 +1,19 @@
-NULL=
-
SUBDIRS = kjs
-INCLUDES = -I $(top_srcdir)/JavaScriptCore/kjs
+# FIXME: need to build the other kjs test program too
-# FIXME: need to build kjs test program
+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
-FRAMEWORK_NAME = JavaScriptCore
-FRAMEWORK_DIR = $(SYMROOTS)/$(FRAMEWORK_NAME).framework
-FRAMEWORK_DYLIB = $(FRAMEWORK_DIR)/Versions/Current/$(FRAMEWORK_NAME)
-EMBED_HOST = $(SYMROOTS)/Alexander.app
-EMBED_DIR = $(EMBED_HOST)/Contents/Frameworks
-
-embed:
- @if test -f "$(FRAMEWORK_DYLIB)"; then \
- INSTALL_PATH=`otool -D "$(FRAMEWORK_DYLIB)"`; \
- WILL_EMBED=`echo $$INSTALL_PATH | sed -n -e "s/@executable_path//p"`; \
- if test -n "$$WILL_EMBED"; then \
- if [ -d "$(EMBED_HOST)" ]; then \
- if [ ! -d "$(EMBED_DIR)" ]; then \
- mkdir -p "$(EMBED_DIR)"; \
- fi; \
- echo "embedding $(FRAMEWORK_NAME) into $(EMBED_HOST)..."; \
- cp -rf $(FRAMEWORK_DIR) $(EMBED_DIR); \
- else \
- echo "$(EMBED_HOST) not found. Not embedding framework"; \
- fi; \
- fi; \
- else \
- echo "can't find: $(FRAMEWORK_DYLIB)"; \
- exit 1; \
- fi
-
all-am: JavaScriptCore-stamp
-
JavaScriptCore-stamp: kjs/*.cpp kjs/*.h
pbxbuild -buildstyle $(BUILDSTYLE) && touch $@
-
clean-am:
pbxbuild clean
-
CLEANFILES = JavaScriptCore-stamp
+
+FRAMEWORK_NAME = JavaScriptCore
+include $(top_srcdir)/embed.am
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d28fb13..f61f992 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-06-07 Darin Adler <darin at apple.com>
+
+ * Makefile.am: Use new shared "embed.am" file so we don't need four copies of
+ the embedding rules for WebFoundation, JavaScriptCore, WebCore, and WebKit.
+
2002-06-07 Maciej Stachowiak <mjs at apple.com>
* Makefile.am: Rename libwebcore.dylib to libwebcore.a; since this
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d28fb13..f61f992 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-06-07 Darin Adler <darin at apple.com>
+
+ * Makefile.am: Use new shared "embed.am" file so we don't need four copies of
+ the embedding rules for WebFoundation, JavaScriptCore, WebCore, and WebKit.
+
2002-06-07 Maciej Stachowiak <mjs at apple.com>
* Makefile.am: Rename libwebcore.dylib to libwebcore.a; since this
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d28fb13..f61f992 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2002-06-07 Darin Adler <darin at apple.com>
+
+ * Makefile.am: Use new shared "embed.am" file so we don't need four copies of
+ the embedding rules for WebFoundation, JavaScriptCore, WebCore, and WebKit.
+
2002-06-07 Maciej Stachowiak <mjs at apple.com>
* Makefile.am: Rename libwebcore.dylib to libwebcore.a; since this
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index 86f00af..f7ed7d3 100644
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -41,14 +41,13 @@ noinst_DATA = framework-stamp framework-resource-stamp framework-dylib-stamp fra
# Framework assembly
FRAMEWORK_NAME = WebCore
+include $(top_srcdir)/embed.am
+
FRAMEWORK_VERSION = A
FRAMEWORK_RESOURCES = Resources/Info.plist Resources/linkCursor.tiff
FRAMEWORK_LOCALIZED_RESOURCES = English.lproj/InfoPlist.strings
-FRAMEWORK_DIR_NAME = $(FRAMEWORK_NAME).framework
-FRAMEWORK_DIR = $(SYMROOTS)/$(FRAMEWORK_DIR_NAME)
-FRAMEWORK_DYLIB = $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/$(FRAMEWORK_NAME)
-FRAMEWORK_LINKFLAGS = $(libwebcore_a_LIBADD) -install_name @executable_path/../Frameworks/$(FRAMEWORK_DIR_NAME)/Versions/$(FRAMEWORK_VERSION)/$(FRAMEWORK_NAME)
+FRAMEWORK_LINKFLAGS = $(libwebcore_a_LIBADD) -install_name @executable_path/../Frameworks/$(FRAMEWORK_NAME).framework/Versions/$(FRAMEWORK_VERSION)/$(FRAMEWORK_NAME)
FRAMEWORK_RESOURCE_DIR = $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/Resources
FRAMEWORK_LOCALIZED_RESOURCE_DIR = $(FRAMEWORK_RESOURCE_DIR)/English.lproj
@@ -92,29 +91,3 @@ CLEANFILES = $(noinst_DATA)
# can't use CLEANFILES for this because it doesn't work for directories
clean-am:
rm -rf $(FRAMEWORK_DIR)
-
-# Embedding into Alexander
-
-EMBED_HOST = $(SYMROOTS)/Alexander.app
-EMBED_DIR = $(EMBED_HOST)/Contents/Frameworks
-
-embed:
- @if test -f "$(FRAMEWORK_DYLIB)"; then \
- INSTALL_PATH=`otool -D "$(FRAMEWORK_DYLIB)"`; \
- WILL_EMBED=`echo $$INSTALL_PATH | sed -n -e "s/@executable_path//p"`; \
- if test -n "$$WILL_EMBED"; then \
- if [ -d "$(EMBED_HOST)" ]; then \
- if [ ! -d "$(EMBED_DIR)" ]; then \
- mkdir -p "$(EMBED_DIR)"; \
- fi; \
- echo "embedding $(FRAMEWORK_NAME) into $(EMBED_HOST)..." && \
- rm -Rf $(EMBED_DIR)/$(FRAMEWORK_DIR_NAME) && \
- cp -R $(FRAMEWORK_DIR) $(EMBED_DIR); \
- else \
- echo "$(EMBED_HOST) not found. Not embedding framework"; \
- fi; \
- fi; \
- else \
- echo "can't find: $(FRAMEWORK_DYLIB)"; \
- exit 1; \
- fi
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cee172b..15f49fa 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,10 @@
2002-06-07 Darin Adler <darin at apple.com>
+ * Makefile.am: Use new shared "embed.am" file so we don't need four copies of
+ the embedding rules for WebFoundation, JavaScriptCore, WebCore, and WebKit.
+
+2002-06-07 Darin Adler <darin at apple.com>
+
* MIME.subproj/IFContentHandler.m: (-[IFContentHandler HTMLDocument]):
Fix a warning that shows up with the new C++ compiler (not sure why it
is not showing up with the old one).
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index cee172b..15f49fa 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
2002-06-07 Darin Adler <darin at apple.com>
+ * Makefile.am: Use new shared "embed.am" file so we don't need four copies of
+ the embedding rules for WebFoundation, JavaScriptCore, WebCore, and WebKit.
+
+2002-06-07 Darin Adler <darin at apple.com>
+
* MIME.subproj/IFContentHandler.m: (-[IFContentHandler HTMLDocument]):
Fix a warning that shows up with the new C++ compiler (not sure why it
is not showing up with the old one).
diff --git a/WebKit/Makefile.am b/WebKit/Makefile.am
index 668b96d..2f17acb 100644
--- a/WebKit/Makefile.am
+++ b/WebKit/Makefile.am
@@ -1,33 +1,7 @@
-
all-am:
pbxbuild -buildstyle $(BUILDSTYLE)
-
-FRAMEWORK_NAME = WebKit
-FRAMEWORK_DIR = $(SYMROOTS)/$(FRAMEWORK_NAME).framework
-FRAMEWORK_DYLIB = $(FRAMEWORK_DIR)/Versions/Current/$(FRAMEWORK_NAME)
-EMBED_HOST = $(SYMROOTS)/Alexander.app
-EMBED_DIR = $(EMBED_HOST)/Contents/Frameworks
-
-embed:
- @if test -f "$(FRAMEWORK_DYLIB)"; then \
- INSTALL_PATH=`otool -D "$(FRAMEWORK_DYLIB)"`; \
- WILL_EMBED=`echo $$INSTALL_PATH | sed -n -e "s/@executable_path//p"`; \
- if test -n "$$WILL_EMBED"; then \
- if [ -d "$(EMBED_HOST)" ]; then \
- if [ ! -d "$(EMBED_DIR)" ]; then \
- mkdir -p "$(EMBED_DIR)"; \
- fi; \
- echo "embedding $(FRAMEWORK_NAME) into $(EMBED_HOST)..."; \
- cp -rf $(FRAMEWORK_DIR) $(EMBED_DIR); \
- else \
- echo "$(EMBED_HOST) not found. Not embedding framework"; \
- fi; \
- fi; \
- else \
- echo "can't find: $(FRAMEWORK_DYLIB)"; \
- exit 1; \
- fi
-
clean-am:
pbxbuild clean
+FRAMEWORK_NAME = WebKit
+include $(top_srcdir)/embed.am
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list