[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:58:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 999b34c1874cc9e4bee8f7486b30bafab6a92dae
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 26 04:08:15 2003 +0000
Tools:
Roll out build system change since it did not actually work. :-(
* Scripts/SourceTools.pm:
* Scripts/embed-into-alex: Added.
* Scripts/embed-into-webkit: Removed.
JavaScriptCore:
Roll out build system change since it did not actually work. :-(
* JavaScriptCore.pbproj/project.pbxproj:
* Makefile.am:
WebCore:
Roll out build system change since it did not actually work. :-(
* WebCore.pbproj/project.pbxproj:
WebKit:
Roll out build system change since it did not actually work. :-(
* WebKit.pbproj/project.pbxproj:
WebBrowser:
Roll out build system change since it did not actually work. :-(
* WebBrowser.pbproj/project.pbxproj:
* add-environment.sh: Removed.
* embed-frameworks.sh: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5071 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b142160..8652ea8 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
2003-09-25 Maciej Stachowiak <mjs at apple.com>
+ Roll out build system change since it did not actually work. :-(
+
+ * JavaScriptCore.pbproj/project.pbxproj:
+ * Makefile.am:
+
+2003-09-25 Maciej Stachowiak <mjs at apple.com>
+
Reviewed by Darin.
* JavaScriptCore.pbproj/project.pbxproj: Don't hack install name. Instead
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index b142160..8652ea8 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
2003-09-25 Maciej Stachowiak <mjs at apple.com>
+ Roll out build system change since it did not actually work. :-(
+
+ * JavaScriptCore.pbproj/project.pbxproj:
+ * Makefile.am:
+
+2003-09-25 Maciej Stachowiak <mjs at apple.com>
+
Reviewed by Darin.
* JavaScriptCore.pbproj/project.pbxproj: Don't hack install name. Instead
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 31ce827..8d2801b 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -15,6 +15,7 @@
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;
@@ -29,6 +30,7 @@
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;
};
@@ -118,7 +120,7 @@
0867D69EFE84028FC02AAC07,
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
- 654F50BD05226B8E00EF888C,
+ F692A8D8025563E401FF60F7,
);
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -582,15 +584,6 @@
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;
@@ -891,6 +884,7 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "";
+ INSTALL_PATH = "@executable_path/../Frameworks";
OTHER_LDFLAGS = "-seg1addr $(LOCAL_SEG1_ADDR)";
};
isa = PBXBuildStyle;
@@ -1874,6 +1868,15 @@
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 5d9b6ca..4007efa 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 ${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
+all-am: JavaScriptCore-stamp
+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 3029511..8b1d887 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2003-09-25 Maciej Stachowiak <mjs at apple.com>
+
+ Roll out build system change since it did not actually work. :-(
+
+ * WebCore.pbproj/project.pbxproj:
+
2003-09-25 David Hyatt <hyatt at apple.com>
Landing the new repainting code. This code eliminates many redundant layouts, makes
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3029511..8b1d887 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2003-09-25 Maciej Stachowiak <mjs at apple.com>
+
+ Roll out build system change since it did not actually work. :-(
+
+ * WebCore.pbproj/project.pbxproj:
+
2003-09-25 David Hyatt <hyatt at apple.com>
Landing the new repainting code. This code eliminates many redundant layouts, makes
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 000e2e7..e1f3168 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -16,6 +16,7 @@
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;
@@ -32,6 +33,7 @@
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;
};
@@ -134,7 +136,7 @@
0867D69EFE84028FC02AAC07,
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
- 654F50BC05226B3800EF888C,
+ 255AF6590250FC030ECA149E,
);
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -809,6 +811,25 @@
//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
@@ -888,25 +909,6 @@
//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
@@ -9158,6 +9160,7 @@
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 05b62c2..3cac7d6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-25 Maciej Stachowiak <mjs at apple.com>
+
+ Roll out build system change since it did not actually work. :-(
+
+ * WebKit.pbproj/project.pbxproj:
+
2003-09-25 David Hyatt <hyatt at apple.com>
Change layout so that it is called from the private _recursive functions instead of
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 252e97f..9ebd7cf 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,6 +558,15 @@
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;
@@ -1661,15 +1670,6 @@
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 = (
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list