[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:12:15 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7c2d808373b56f4cadb1ff397833648d298f026b
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 6 16:35:02 2002 +0000
JavaScriptCore:
Reviewed by: Darin Adler
- made framework embedding work correctly with buildit
* JavaScriptCore.pbproj/project.pbxproj: Give framework a relative
install path, don't install it the normal way, and copy it
manually to /AppleInternal/Library/Frameworks if installing.
WebFoundation:
Reviewed by: Darin Adler
- made framework embedding work correctly with buildit
* WebFoundation.pbproj/project.pbxproj: Give framework a relative
install path, don't install it the normal way, and copy it
manually to /AppleInternal/Library/Frameworks if installing.
WebCore:
Reviewed by: Darin Adler
- made framework embedding work correctly with buildit
* WebCore.pbproj/project.pbxproj: Give framework a relative
install path, don't install it the normal way, and copy it
manually to /AppleInternal/Library/Frameworks if installing. Also
look for other frameworks in
${DSTROOT}/AppleInternal/Library/Frameworks.
WebKit:
Reviewed by: Darin Adler
- made framework embedding work correctly with buildit
* WebKit.pbproj/project.pbxproj: Give framework a relative
install path, don't install it the normal way, and copy it
manually to /AppleInternal/Library/Frameworks if installing. Also
look for other frameworks in
${DSTROOT}/AppleInternal/Library/Frameworks.
WebBrowser:
Reviewed by: Darin Adler
- made framework embedding work correctly with buildit
* copy-frameworks-to-dstroot.sh: Copy frameworks from
/AppleInternal/Library/Frameworks
* embed-frameworks.sh: Fixed typo.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2958 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1f5316a..f6c8a42 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-06 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by: Darin Adler
+
+ - made framework embedding work correctly with buildit
+
+ * JavaScriptCore.pbproj/project.pbxproj: Give framework a relative
+ install path, don't install it the normal way, and copy it
+ manually to /AppleInternal/Library/Frameworks if installing.
+
=== Alexander-35 ===
2002-12-04 Maciej Stachowiak <mjs at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 1f5316a..f6c8a42 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-12-06 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by: Darin Adler
+
+ - made framework embedding work correctly with buildit
+
+ * JavaScriptCore.pbproj/project.pbxproj: Give framework a relative
+ install path, don't install it the normal way, and copy it
+ manually to /AppleInternal/Library/Frameworks if installing.
+
=== Alexander-35 ===
2002-12-04 Maciej Stachowiak <mjs at apple.com>
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 39d9236..3d75008 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -12,9 +12,7 @@
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
- INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O0";
- SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Development;
@@ -23,8 +21,6 @@
buildRules = (
);
buildSettings = {
- INSTALL_PATH = "@executable_path/../Frameworks";
- SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Deployment;
@@ -112,6 +108,7 @@
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
F692A8D8025563E401FF60F7,
+ 6573C62F03A0BDCD00FCA39F,
);
buildSettings = {
COPY_PHASE_STRIP = YES;
@@ -123,7 +120,7 @@
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = "";
- INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+ INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
@@ -132,6 +129,7 @@
PREFIX_HEADER = JavaScriptCorePrefix.h;
PRODUCT_NAME = JavaScriptCore;
SECTORDER_FLAGS = "";
+ SKIP_INSTALL = YES;
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WRAPPER_EXTENSION = framework;
@@ -140,7 +138,7 @@
);
isa = PBXFrameworkTarget;
name = JavaScriptCore;
- productInstallPath = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+ productInstallPath = "@executable_path/../Frameworks";
productName = JavaScriptCore;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -594,6 +592,19 @@
settings = {
};
};
+ 6573C62F03A0BDCD00FCA39F = {
+ buildActionMask = 8;
+ files = (
+ );
+ generatedFileNames = (
+ );
+ isa = PBXShellScriptBuildPhase;
+ neededFileNames = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
+ shellScript = "ditto ${SYMROOT}/JavaScriptCore.framework ${DSTROOT}/AppleInternal/Library/Frameworks/JavaScriptCore.framework";
+ };
//650
//651
//652
@@ -747,8 +758,6 @@
buildRules = (
);
buildSettings = {
- INSTALL_PATH = "@executable_path/../Frameworks";
- SKIP_INSTALL = YES;
i386 = YES;
ppc = YES;
};
@@ -822,9 +831,7 @@
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
- INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O";
- SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Mixed;
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 18499bb..fa68ea4 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-12-06 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by: Darin Adler
+
+ - made framework embedding work correctly with buildit
+
+ * WebCore.pbproj/project.pbxproj: Give framework a relative
+ install path, don't install it the normal way, and copy it
+ manually to /AppleInternal/Library/Frameworks if installing. Also
+ look for other frameworks in
+ ${DSTROOT}/AppleInternal/Library/Frameworks.
+
2002-12-06 Darin Adler <darin at apple.com>
Reviewed by Trey.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 18499bb..fa68ea4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-12-06 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by: Darin Adler
+
+ - made framework embedding work correctly with buildit
+
+ * WebCore.pbproj/project.pbxproj: Give framework a relative
+ install path, don't install it the normal way, and copy it
+ manually to /AppleInternal/Library/Frameworks if installing. Also
+ look for other frameworks in
+ ${DSTROOT}/AppleInternal/Library/Frameworks.
+
2002-12-06 Darin Adler <darin at apple.com>
Reviewed by Trey.
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 85abe21..5b795b7 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -13,10 +13,7 @@
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
EXPORTED_SYMBOLS_FILE = "WebCore-combined.exp";
- FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
- INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O0";
- SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Development;
@@ -25,9 +22,6 @@
buildRules = (
);
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
- INSTALL_PATH = "@executable_path/../Frameworks";
- SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Deployment;
@@ -121,6 +115,7 @@
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
255AF6590250FC030ECA149E,
+ 6573C63B03A0BE5700FCA39F,
);
buildSettings = {
COPY_PHASE_STRIP = YES;
@@ -129,11 +124,11 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXPORTED_SYMBOLS_FILE = WebCore.exp;
- FRAMEWORK_SEARCH_PATHS = "";
+ FRAMEWORK_SEARCH_PATHS = "\"${DSTROOT}/AppleInternal/Library/Frameworks\"";
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = ForwardingHeaders;
- INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+ INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
@@ -142,6 +137,7 @@
PREFIX_HEADER = WebCorePrefix.h;
PRODUCT_NAME = WebCore;
SECTORDER_FLAGS = "";
+ SKIP_INSTALL = YES;
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "$(WARNING_COMMONFLAGS)";
WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
@@ -873,6 +869,19 @@
settings = {
};
};
+ 6573C63B03A0BE5700FCA39F = {
+ buildActionMask = 8;
+ files = (
+ );
+ generatedFileNames = (
+ );
+ isa = PBXShellScriptBuildPhase;
+ neededFileNames = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
+ shellScript = "ditto ${SYMROOT}/WebCore.framework ${DSTROOT}/AppleInternal/Library/Frameworks/WebCore.framework";
+ };
//650
//651
//652
@@ -4104,9 +4113,6 @@
buildRules = (
);
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
- INSTALL_PATH = "@executable_path/../Frameworks";
- SKIP_INSTALL = YES;
i386 = YES;
ppc = YES;
};
@@ -7643,10 +7649,7 @@
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
EXPORTED_SYMBOLS_FILE = "WebCore-combined.exp";
- FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
- INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O";
- SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Mixed;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c3ce3f8..b048471 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-12-06 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by: Darin Adler
+
+ - made framework embedding work correctly with buildit
+
+ * WebKit.pbproj/project.pbxproj: Give framework a relative
+ install path, don't install it the normal way, and copy it
+ manually to /AppleInternal/Library/Frameworks if installing. Also
+ look for other frameworks in
+ ${DSTROOT}/AppleInternal/Library/Frameworks.
+
2002-12-05 Darin Adler <darin at apple.com>
Reviewed by Trey.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 2252acf..a060d15 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -12,10 +12,7 @@
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
- FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
- INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O0";
- SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Development;
@@ -24,9 +21,6 @@
buildRules = (
);
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
- INSTALL_PATH = "@executable_path/../Frameworks";
- SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Deployment;
@@ -130,6 +124,7 @@
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
255AF6590250FC030ECA149E,
+ 6573C62203A0BD7100FCA39F,
);
buildSettings = {
COPY_PHASE_STRIP = YES;
@@ -138,11 +133,11 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXPORTED_SYMBOLS_FILE = WebKit.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks\" \"$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks\" \"${DSTROOT}/AppleInternal/Library/Frameworks\"";
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = "";
- INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+ INSTALL_PATH = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = "";
OPTIMIZATION_CFLAGS = "-Os";
OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H -DFRAMEWORK_NAME=WebKit";
@@ -151,6 +146,7 @@
PREFIX_HEADER = WebKitPrefix.h;
PRODUCT_NAME = WebKit;
SECTORDER_FLAGS = "";
+ SKIP_INSTALL = YES;
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "-Werror -Wall -W -Wbad-function-cast -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
WRAPPER_EXTENSION = framework;
@@ -1413,6 +1409,19 @@
settings = {
};
};
+ 6573C62203A0BD7100FCA39F = {
+ buildActionMask = 8;
+ files = (
+ );
+ generatedFileNames = (
+ );
+ isa = PBXShellScriptBuildPhase;
+ neededFileNames = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
+ shellScript = "ditto ${SYMROOT}/WebKit.framework ${DSTROOT}/AppleInternal/Library/Frameworks/WebKit.framework";
+ };
657D8FA10366687600FA1ED0 = {
fileRef = 513D422E034CF55A00CA2ACD;
isa = PBXBuildFile;
@@ -2776,9 +2785,6 @@
buildRules = (
);
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
- INSTALL_PATH = "@executable_path/../Frameworks";
- SKIP_INSTALL = YES;
i386 = YES;
ppc = YES;
};
@@ -3011,10 +3017,7 @@
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
- FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
- INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O";
- SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Mixed;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list