[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 07:57:59 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7801362f31e55290925e62ba8cb3f7216a3f738a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 25 21:09:03 2003 +0000
Tools:
Reviewed by Darin.
* Scripts/SourceTools.pm: Don't try to install Foundation on the
system any more. The new build setup takes care of it.
* Scripts/embed-into-alex: Removed.
* Scripts/embed-into-webkit: Added.
JavaScriptCore:
Reviewed by Darin.
* JavaScriptCore.pbproj/project.pbxproj: Don't hack install name. Instead
of embedding into Safari, embed into WebKit as sub-umbrella.
* Makefile.am: Don't forget to rebuild if the user removes
JavaScript.framework from symroots manually.
WebCore:
Reviewed by Darin.
* WebCore.pbproj/project.pbxproj: Don't hack install name. Instead
of embedding into Safari, embed into WebKit as sub-umbrella.
WebKit:
Reviewed by Darin.
Updated setup for engineering builds. Don't embed the framework
into Safari or hack the install name. However, do copy WebCore and
JavaScriptCore into the proper sub-umbrella locations.
* WebKit.pbproj/project.pbxproj:
* embed-frameworks.sh: Added.
WebBrowser:
Reviewed by Darin.
Changed things around for the engineering Safari build. Instead of
building frameworks embedded, set DYLD_FRAMEWORK_PATH via the
Info.plist (for engineering builds only). This also removes the
need to install engineering builds of Foundation on the system.
* WebBrowser.pbproj/project.pbxproj:
* add-environment.sh: Added.
* embed-frameworks.sh: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5063 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 66f9338..b142160 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-25 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ * JavaScriptCore.pbproj/project.pbxproj: Don't hack install name. Instead
+ of embedding into Safari, embed into WebKit as sub-umbrella.
+ * Makefile.am: Don't forget to rebuild if the user removes
+ JavaScript.framework from symroots manually.
+
=== Safari-107 ===
2003-09-24 Darin Adler <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 66f9338..b142160 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-09-25 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ * JavaScriptCore.pbproj/project.pbxproj: Don't hack install name. Instead
+ of embedding into Safari, embed into WebKit as sub-umbrella.
+ * Makefile.am: Don't forget to rebuild if the user removes
+ JavaScript.framework from symroots manually.
+
=== Safari-107 ===
2003-09-24 Darin Adler <darin at apple.com>
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 8d2801b..31ce827 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -15,7 +15,6 @@
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
- INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O0";
OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
ZERO_LINK = YES;
@@ -30,7 +29,6 @@
COPY_PHASE_STRIP = YES;
DEBUGGING_SYMBOLS = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
- INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
ZERO_LINK = NO;
};
@@ -120,7 +118,7 @@
0867D69EFE84028FC02AAC07,
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
- F692A8D8025563E401FF60F7,
+ 654F50BD05226B8E00EF888C,
);
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -584,6 +582,15 @@
settings = {
};
};
+ 654F50BD05226B8E00EF888C = {
+ buildActionMask = 2147483647;
+ files = (
+ );
+ isa = PBXShellScriptBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ -f ../Tools/Scripts/embed-into-webkit ]; then\n ../Tools/Scripts/embed-into-webkit;\nfi";
+ };
6560A4CF04B3B3E7008AE952 = {
expectedFileType = wrapper.framework;
isa = PBXFileReference;
@@ -884,7 +891,6 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
- INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
@@ -1868,15 +1874,6 @@
settings = {
};
};
- F692A8D8025563E401FF60F7 = {
- buildActionMask = 2147483647;
- files = (
- );
- isa = PBXShellScriptBuildPhase;
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [ -f ../Tools/Scripts/embed-into-alex ]; then sh ../Tools/Scripts/embed-into-alex; fi";
- };
};
rootObject = 0867D690FE84028FC02AAC07;
}
diff --git a/JavaScriptCore/Makefile.am b/JavaScriptCore/Makefile.am
index 4007efa..5d9b6ca 100644
--- a/JavaScriptCore/Makefile.am
+++ b/JavaScriptCore/Makefile.am
@@ -8,8 +8,8 @@ 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
+all-am: JavaScriptCore-stamp ${SYMROOTS}/JavaScriptCore.framework/Versions/Current/JavaScriptCore ${SYMROOTS}/JavaScriptCore.framework/Versions/Current/PrivateHeaders
+${SYMROOTS}/JavaScriptCore.framework/Versions/Current/JavaScriptCore ${SYMROOTS}/JavaScriptCore.framework/Versions/Current/PrivateHeaders JavaScriptCore-stamp: kjs/*.cpp kjs/*.h pcre/*.c pcre/*.h
pbxbuild -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) && touch $@
clean-am:
pbxbuild clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS)
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b41a109..558324d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2003-09-25 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ * WebCore.pbproj/project.pbxproj: Don't hack install name. Instead
+ of embedding into Safari, embed into WebKit as sub-umbrella.
+
=== Safari-107 ===
2003-09-25 Darin Adler <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b41a109..558324d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2003-09-25 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ * WebCore.pbproj/project.pbxproj: Don't hack install name. Instead
+ of embedding into Safari, embed into WebKit as sub-umbrella.
+
=== Safari-107 ===
2003-09-25 Darin Adler <darin at apple.com>
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index e1f3168..000e2e7 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -16,7 +16,6 @@
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
- INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O0";
OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
ZERO_LINK = YES;
@@ -33,7 +32,6 @@
DEPLOYMENT_LOCATION = YES;
DEPLOYMENT_POSTPROCESSING = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
- INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
ZERO_LINK = NO;
};
@@ -136,7 +134,7 @@
0867D69EFE84028FC02AAC07,
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
- 255AF6590250FC030ECA149E,
+ 654F50BC05226B3800EF888C,
);
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -811,25 +809,6 @@
//082
//083
//084
-//250
-//251
-//252
-//253
-//254
- 255AF6590250FC030ECA149E = {
- buildActionMask = 2147483647;
- files = (
- );
- isa = PBXShellScriptBuildPhase;
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [ -f ../Tools/Scripts/embed-into-alex ]; then sh ../Tools/Scripts/embed-into-alex; fi";
- };
-//250
-//251
-//252
-//253
-//254
//350
//351
//352
@@ -909,6 +888,25 @@
//512
//513
//514
+//650
+//651
+//652
+//653
+//654
+ 654F50BC05226B3800EF888C = {
+ buildActionMask = 2147483647;
+ files = (
+ );
+ isa = PBXShellScriptBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ -f ../Tools/Scripts/embed-into-webkit ]; then\n ../Tools/Scripts/embed-into-webkit;\nfi";
+ };
+//650
+//651
+//652
+//653
+//654
//930
//931
//932
@@ -9160,7 +9158,6 @@
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
EXPORTED_SYMBOLS_FILE = WebCore.exp;
- INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7cbfac1..142c9d7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-09-25 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ Updated setup for engineering builds. Don't embed the framework
+ into Safari or hack the install name. However, do copy WebCore and
+ JavaScriptCore into the proper sub-umbrella locations.
+
+ * WebKit.pbproj/project.pbxproj:
+ * embed-frameworks.sh: Added.
+
=== Safari-107 ===
2003-09-25 Ken Kocienda <kocienda at apple.com>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 9ebd7cf..252e97f 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -142,9 +142,9 @@
0867D69EFE84028FC02AAC07,
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
- 255AF6590250FC030ECA149E,
65CBE7AA04B53388006ACFE6,
6566F34204C12D14008B3232,
+ 654F50C105226D1D00EF888C,
);
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -558,15 +558,6 @@
refType = 4;
sourceTree = "<group>";
};
- 255AF6590250FC030ECA149E = {
- buildActionMask = 2147483647;
- files = (
- );
- isa = PBXShellScriptBuildPhase;
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "if [ -f ../Tools/Scripts/embed-into-alex ]; then sh ../Tools/Scripts/embed-into-alex; fi";
- };
2568C72C0174912D0ECA149E = {
expectedFileType = sourcecode.c.h;
fileEncoding = 4;
@@ -1670,6 +1661,15 @@
settings = {
};
};
+ 654F50C105226D1D00EF888C = {
+ buildActionMask = 2147483647;
+ files = (
+ );
+ isa = PBXShellScriptBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ -z \"$RC_RELEASE\" ]; then\n ./embed-frameworks.sh;\nfi";
+ };
6566F34204C12D14008B3232 = {
buildActionMask = 8;
files = (
diff --git a/WebKit/embed-frameworks.sh b/WebKit/embed-frameworks.sh
new file mode 100755
index 0000000..f009153
--- /dev/null
+++ b/WebKit/embed-frameworks.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+framework_name=WebKit.framework
+framework_dir="${SYMROOT}/${framework_name}/Versions/A/Frameworks"
+
+
+if [ -d "${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework" ]; then
+ ditto "${BUILT_PRODUCTS_DIR}/JavaScriptCore.framework" "${framework_dir}/JavaScriptCore.framework"
+ ditto "${BUILT_PRODUCTS_DIR}/WebCore.framework" "${framework_dir}/WebCore.framework"
+fi
+
+# When we copy files from the BuildRoot into DSTROOT, we sometimes pick up
+# huge turds from ditto. For now, just strip these out after the fact.
+find -X "${framework_dir}" -name '*.dittoKeptBinary.*' -print0 | xargs -0 rm -f
+
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list