Commit 7c2d8083 authored by mjs's avatar mjs

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
parent a51a16b8
2002-12-06 Maciej Stachowiak <mjs@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@apple.com>
......
2002-12-06 Maciej Stachowiak <mjs@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@apple.com>
......
......@@ -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;
......
2002-12-06 Maciej Stachowiak <mjs@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@apple.com>
Reviewed by Trey.
......
2002-12-06 Maciej Stachowiak <mjs@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@apple.com>
Reviewed by Trey.
......
......@@ -13,10 +13,7 @@
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
EXPORTED_SYMBOLS_FILE = "WebCore-combined.exp";
FRAMEWORK_SEARCH_PATHS = "\U0001@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@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@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@executable_path/../Frameworks";
INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O";
SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Mixed;
......
2002-12-06 Maciej Stachowiak <mjs@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@apple.com>
Reviewed by Trey.
......
......@@ -12,10 +12,7 @@
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
DEBUG_CFLAGS = "";
FRAMEWORK_SEARCH_PATHS = "\U0001@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@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@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@executable_path/../Frameworks";
INSTALL_PATH = "@executable_path/../Frameworks";
OPTIMIZATION_CFLAGS = "-O";
SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Mixed;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment