[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:14:59 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 27948c94358dd9e4434904064f743358cb8b1daf
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat May 25 10:47:40 2002 +0000
WebCore:
Changed WebCore to build as a framework, not a dylib, so resources
can be added to it.
* Makefile.am: Actual changes to build WebCore.framework
* Resources/Info.plist: Added.
* English.lproj/InfoPlist.strings: Added.
* WebCore-tests.exp: Added.
* WebCore.exp: Added.
* libwebcore.exp: Removed.
* libwebcoretests.exp: Removed.
* .cvsignore: Updated.
WebKit:
* WebKit.pbproj/project.pbxproj: Link against WebCore.framework,
not libwebcore.dylib.
WebBrowser:
* WebBrowser.pbproj/project.pbxproj: Link against
WebCore.framework, not libwebcore.dylib.
Top level:
Link against WebCore.framework, not libwebcore.dylib.
* Tests/kde/Makefile.am:
* Tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj:
* Tests/qt/Makefile.am:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1217 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/.cvsignore b/WebCore/.cvsignore
index 6eec7ea..d30de60 100644
--- a/WebCore/.cvsignore
+++ b/WebCore/.cvsignore
@@ -1,8 +1,8 @@
Makefile
Makefile.in
+WebCore-combined.exp
+framework-stamp
+framework-dylib-stamp
+framework-resource-stamp
libwebcore.dylib
-libwebcorecombined.exp
-libwebcorenmedited.dylib
-libwebcoreunstripped.dylib
-webcore-install-stamp
*.pfe
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1c4601a..f52b298 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-05-25 Maciej Stachowiak <mjs at apple.com>
+
+ Changed WebCore to build as a framework, not a dylib, so resources
+ can be added to it.
+
+ * Makefile.am: Actual changes to build WebCore.framework
+ * Resources/Info.plist: Added.
+ * English.lproj/InfoPlist.strings: Added.
+ * WebCore-tests.exp: Added.
+ * WebCore.exp: Added.
+ * libwebcore.exp: Removed.
+ * libwebcoretests.exp: Removed.
+ * .cvsignore: Updated.
+
=== 0.3 ===
2002-05-24 Shelley A Sheridan <sheridan at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1c4601a..f52b298 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-05-25 Maciej Stachowiak <mjs at apple.com>
+
+ Changed WebCore to build as a framework, not a dylib, so resources
+ can be added to it.
+
+ * Makefile.am: Actual changes to build WebCore.framework
+ * Resources/Info.plist: Added.
+ * English.lproj/InfoPlist.strings: Added.
+ * WebCore-tests.exp: Added.
+ * WebCore.exp: Added.
+ * libwebcore.exp: Removed.
+ * libwebcoretests.exp: Removed.
+ * .cvsignore: Updated.
+
=== 0.3 ===
2002-05-24 Shelley A Sheridan <sheridan at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1c4601a..f52b298 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-05-25 Maciej Stachowiak <mjs at apple.com>
+
+ Changed WebCore to build as a framework, not a dylib, so resources
+ can be added to it.
+
+ * Makefile.am: Actual changes to build WebCore.framework
+ * Resources/Info.plist: Added.
+ * English.lproj/InfoPlist.strings: Added.
+ * WebCore-tests.exp: Added.
+ * WebCore.exp: Added.
+ * libwebcore.exp: Removed.
+ * libwebcoretests.exp: Removed.
+ * .cvsignore: Updated.
+
=== 0.3 ===
2002-05-24 Shelley A Sheridan <sheridan at apple.com>
diff --git a/JavaScriptCore/English.lproj/InfoPlist.strings b/WebCore/English.lproj/InfoPlist.strings
similarity index 51%
copy from JavaScriptCore/English.lproj/InfoPlist.strings
copy to WebCore/English.lproj/InfoPlist.strings
index 7c8dd8b..dcedd06 100644
Binary files a/JavaScriptCore/English.lproj/InfoPlist.strings and b/WebCore/English.lproj/InfoPlist.strings differ
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index fa6518e..b0000ca 100644
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -4,58 +4,22 @@ SUBDIRS = khtml kwq
symrootsdir = $(SYMROOTS)
-symroots_LIBRARIES = libwebcore.dylib
+noinst_LIBRARIES = libwebcore.dylib
-noinst_LIBRARIES = libwebcoreunstripped.dylib
-
-libwebcoreunstripped_dylib_SOURCES = \
+libwebcore_dylib_SOURCES = \
dummy.mm \
$(NULL)
-libwebcoreunstripped_dylib_LIBADD = \
+libwebcore_dylib_LIBADD = \
./khtml/libkhtml.o \
./kwq/libkwq.o \
$(NULL)
-LIBWEBCORE_INSTALL_PATH = @executable_path/../Frameworks
+WEBCORE_INSTALL_PATH = $(SYMROOTS)
-DYLIB_NAME = libwebcore.dylib
-EMBED_HOST = $(SYMROOTS)/Alexander.app
-EMBED_DIR = $(EMBED_HOST)/Contents/Frameworks
-
-libwebcorecombined.exp: libwebcore.exp libwebcoretests.exp
+WebCore-combined.exp: WebCore.exp WebCore-tests.exp
cat $^ > $@
-libwebcorenmedited.dylib: libwebcoreunstripped.dylib libwebcorecombined.exp
- nmedit -s libwebcorecombined.exp -o $@ - $<
-
-libwebcore.dylib: libwebcorenmedited.dylib
- if test -z "$(STRIP_FLAGS)"; then \
- ln -f $< $@; \
- else \
- strip $(STRIP_FLAGS) -o $@ - $<; \
- fi
-
-embed:
- @if test -f "$(DYLIB_NAME)"; then \
- INSTALL_PATH=`otool -D "$(DYLIB_NAME)"`; \
- 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 $(DYLIB_NAME) into $(EMBED_HOST)..."; \
- cp -f $(DYLIB_NAME) $(EMBED_DIR); \
- else \
- echo "$(EMBED_HOST) not found. Not embedding framework"; \
- fi; \
- fi; \
- else \
- echo "can't find: $(DYLIB_NAME)"; \
- exit 1; \
- fi
-
LDFLAGS = \
-framework Cocoa \
-framework CoreFoundation \
@@ -68,14 +32,88 @@ LDFLAGS = \
-undefined error \
-all_load \
-seg1addr 0x2200000 \
- -install_name $(LIBWEBCORE_INSTALL_PATH)/libwebcore.dylib \
$(NULL)
-libwebcoreunstripped_dylib_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
+libwebcore_dylib_AR = touch libwebcore.dylib; :
+
+noinst_DATA = framework-stamp framework-resource-stamp framework-dylib-stamp framework-header-stamp WebCore-combined.exp
+
+# Framework assembly
+
+FRAMEWORK_NAME = WebCore
+FRAMEWORK_VERSION = A
+FRAMEWORK_RESOURCES = Resources/Info.plist
+FRAMEWORK_LOCALIZED_RESOURCES = English.lproj/InfoPlist.strings
+
+
+FRAMEWORK_DIR = $(SYMROOTS)/$(FRAMEWORK_NAME).framework
+FRAMEWORK_DYLIB = $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/$(FRAMEWORK_NAME)
+FRAMEWORK_LINKFLAGS = $(libwebcore_dylib_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
+
+framework-stamp: framework-dylib-stamp framework-resource-stamp framework-header-stamp
+ $(MAKE) embed && \
+ touch ./framework-stamp
+
+framework-resource-stamp: $(FRAMEWORK_RESOURCES) $(FRAMEWORK_LOCALIZED_RESOURCES)
+ rm -rf $(FRAMEWORK_RESOURCE_DIR)
+ mkdir -p $(FRAMEWORK_RESOURCE_DIR)
+ ln -sf Versions/Current/Resources $(FRAMEWORK_DIR)/Resources
+ @list='$(FRAMEWORK_RESOURCES)'; for p in $$list; do \
+ echo " $(INSTALL_DATA) $$p $(FRAMEWORK_RESOURCE_DIR)/$$p"; \
+ $(INSTALL_DATA) $$p $(FRAMEWORK_RESOURCE_DIR); \
+ done
+ mkdir -p $(FRAMEWORK_LOCALIZED_RESOURCE_DIR)
+ @list='$(FRAMEWORK_LOCALIZED_RESOURCES)'; for p in $$list; do \
+ echo " $(INSTALL_DATA) $$p $(FRAMEWORK_LOCALIZED_RESOURCE_DIR)/$$p"; \
+ $(INSTALL_DATA) $$p $(FRAMEWORK_LOCALIZED_RESOURCE_DIR); \
+ done
+ touch ./framework-resource-stamp
+
+framework-header-stamp:
+ mkdir -p $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/Headers
+ mkdir -p $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/PrivateHeaders
+ ln -sf Versions/Current/Headers $(FRAMEWORK_DIR)/Headers
+ ln -sf Versions/Current/PrivateHeaders $(FRAMEWORK_DIR)/PrivateHeaders
+ touch ./framework-header-stamp
+
+framework-dylib-stamp: $(libwebcore_dylib_OBJECTS) $(libwebcore_dylib_DEPENDENCIES) WebCore-combined.exp
+ mkdir -p $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)
+ rm -f $(FRAMEWORK_DIR)/Versions/Current
+ ln -sf $(FRAMEWORK_VERSION) $(FRAMEWORK_DIR)/Versions/Current
+ $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(FRAMEWORK_LINKFLAGS) $(libwebcore_dylib_OBJECTS) -o $(FRAMEWORK_DYLIB)
+ nmedit -s WebCore-combined.exp - $(FRAMEWORK_DYLIB)
+ ln -sf Versions/Current/$(FRAMEWORK_NAME) $(FRAMEWORK_DIR)/$(FRAMEWORK_NAME)
+ touch ./framework-dylib-stamp
+
+
+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
-noinst_DATA = webcore-install-stamp
+EMBED_HOST = $(SYMROOTS)/Alexander.app
+EMBED_DIR = $(EMBED_HOST)/Contents/Frameworks
-webcore-install-stamp: libwebcore.dylib
- $(MAKE) install-symrootsLIBRARIES
- $(MAKE) embed
- touch ./webcore-install-stamp
+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
diff --git a/WebCore/Resources/Info.plist b/WebCore/Resources/Info.plist
new file mode 100644
index 0000000..b2299af
--- /dev/null
+++ b/WebCore/Resources/Info.plist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>WebCore</string>
+ <key>CFBundleGetInfoString</key>
+ <string>0.3</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.WebCore</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>WebCore</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleShortVersionString</key>
+ <string>0.3</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>5</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright (c) 2001-2002 Apple Compupter</string>
+</dict>
+</plist>
diff --git a/WebCore/libwebcoretests.exp b/WebCore/WebCore-tests.exp
similarity index 100%
rename from WebCore/libwebcoretests.exp
rename to WebCore/WebCore-tests.exp
diff --git a/WebCore/libwebcore.exp b/WebCore/WebCore.exp
similarity index 100%
rename from WebCore/libwebcore.exp
rename to WebCore/WebCore.exp
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f46f406..b369761 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-25 Maciej Stachowiak <mjs at apple.com>
+
+ * WebKit.pbproj/project.pbxproj: Link against WebCore.framework,
+ not libwebcore.dylib.
+
=== 0.3 ===
2002-05-24 Shelley A Sheridan <sheridan at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f46f406..b369761 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-05-25 Maciej Stachowiak <mjs at apple.com>
+
+ * WebKit.pbproj/project.pbxproj: Link against WebCore.framework,
+ not libwebcore.dylib.
+
=== 0.3 ===
2002-05-24 Shelley A Sheridan <sheridan at apple.com>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 15d5b0e..194362e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -110,6 +110,9 @@
F5C2869302846DCD018635CA,
F5C2869402846DCD018635CA,
F5C2869502846DCD018635CA,
+ F8216299029F4FB501000131,
+ F821629A029F4FB501000131,
+ F821629B029F4FB501000131,
);
isa = PBXGroup;
name = Frameworks;
@@ -137,7 +140,7 @@
LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
- OTHER_LDFLAGS = "-framework WebFoundation -framework JavaScriptCore -lwebcore -seg1addr 0x4000000";
+ OTHER_LDFLAGS = "-seg1addr 0x4000000";
PFE_FILE_C_DIALECTS = "objective-c objective-c++";
PRECOMPILE_PREFIX_HEADER = YES;
PREFIX_HEADER = WebKitPrefix.h;
@@ -310,6 +313,9 @@
F5C287BB02846DCD018635CA,
F5C287BC02846DCD018635CA,
F5C287BD02846DCD018635CA,
+ F82162D7029F4FB501000131,
+ F82162D8029F4FB501000131,
+ F82162D9029F4FB501000131,
);
isa = PBXFrameworksBuildPhase;
};
@@ -1882,6 +1888,39 @@
//F82
//F83
//F84
+ F8216299029F4FB501000131 = {
+ isa = PBXFrameworkReference;
+ path = JavaScriptCore.framework;
+ refType = 3;
+ };
+ F821629A029F4FB501000131 = {
+ isa = PBXFrameworkReference;
+ path = WebCore.framework;
+ refType = 3;
+ };
+ F821629B029F4FB501000131 = {
+ isa = PBXFrameworkReference;
+ path = WebFoundation.framework;
+ refType = 3;
+ };
+ F82162D7029F4FB501000131 = {
+ fileRef = F8216299029F4FB501000131;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F82162D8029F4FB501000131 = {
+ fileRef = F821629A029F4FB501000131;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F82162D9029F4FB501000131 = {
+ fileRef = F821629B029F4FB501000131;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F83DCC71029D09F301000131 = {
isa = PBXFileReference;
name = IFPanelAuthenticationHandler.h;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list