[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:59:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 702048a2cd92958f1369514f6a7b90e1abf891f2
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 27 00:18:54 2002 +0000
2002-03-26 Kenneth Kocienda <kocienda at apple.com>
These changes help the transition to the new build system which unifies
our development build setting with the settings we use to ship
releases.
Labyrinth:
Removed --enable-alexander-test configure option
Added --with-buildstyle option
* configure.in:
WebFoundation:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
* Makefile.am:
* WebKit.pbproj/kocienda.pbxuser:
* WebKit.pbproj/project.pbxproj:
WebBrowser:
* Makefile.am:
* WebBrowser.pbproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@864 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3fadefa..4e2ce2e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,7 @@
+2002-03-26 Kenneth Kocienda <kocienda at apple.com>
+
+ * src/Makefile.am:
+
2002-03-26 Darin Adler <darin at apple.com>
* src/kwq/KWQKjobclasses.mm: (TransferJobPrivate::TransferJobPrivate):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3fadefa..4e2ce2e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,7 @@
+2002-03-26 Kenneth Kocienda <kocienda at apple.com>
+
+ * src/Makefile.am:
+
2002-03-26 Darin Adler <darin at apple.com>
* src/kwq/KWQKjobclasses.mm: (TransferJobPrivate::TransferJobPrivate):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3fadefa..4e2ce2e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,7 @@
+2002-03-26 Kenneth Kocienda <kocienda at apple.com>
+
+ * src/Makefile.am:
+
2002-03-26 Darin Adler <darin at apple.com>
* src/kwq/KWQKjobclasses.mm: (TransferJobPrivate::TransferJobPrivate):
diff --git a/WebCore/src/Makefile.am b/WebCore/src/Makefile.am
index 1b3b970..35729be 100644
--- a/WebCore/src/Makefile.am
+++ b/WebCore/src/Makefile.am
@@ -22,11 +22,31 @@ libwebcore_dylib_LIBADD = \
$(NULL)
-if AlexanderTest
-LIBWEBCORE_INSTALL_PATH=@executable_path/../Frameworks
-else
-LIBWEBCORE_INSTALL_PATH=$(symrootsdir)
-endif
+LIBWEBCORE_INSTALL_PATH = @executable_path/../Frameworks
+
+DYLIB_NAME = libwebcore.dylib
+EMBED_HOST = $(SYMROOTS)/Alexander.app
+EMBED_DIR = $(EMBED_HOST)/Contents/Frameworks
+
+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 \
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 17a29ce..46d0891 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-03-26 Kenneth Kocienda <kocienda at apple.com>
+
+ Changes to help the transition to the new build system which unifies
+ our development build setting with the settings we use to ship
+ releases.
+
+ * Makefile.am:
+ * WebKit.pbproj/kocienda.pbxuser:
+ * WebKit.pbproj/project.pbxproj:
+
2002-03-26 Richard Williamson <rjw at apple.com>
Try to ensure that display needed bits are correctly set.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 17a29ce..46d0891 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-03-26 Kenneth Kocienda <kocienda at apple.com>
+
+ Changes to help the transition to the new build system which unifies
+ our development build setting with the settings we use to ship
+ releases.
+
+ * Makefile.am:
+ * WebKit.pbproj/kocienda.pbxuser:
+ * WebKit.pbproj/project.pbxproj:
+
2002-03-26 Richard Williamson <rjw at apple.com>
Try to ensure that display needed bits are correctly set.
diff --git a/WebKit/Makefile.am b/WebKit/Makefile.am
index 9727c05..913625d 100644
--- a/WebKit/Makefile.am
+++ b/WebKit/Makefile.am
@@ -2,5 +2,32 @@
all:
pbxbuild -buildstyle $(BUILDSTYLE)
+FRAMEWORK_NAME = WebKit
+FRAMEWORK_DIR = $(SYMROOTS)/$(FRAMEWORK_NAME).framework
+FRAMEWORK_DYLIB = $(FRAMEWORK_DIR)/Versions/Current/$(FRAMEWORK_NAME)
+EMBED_HOST = $(SYMROOTS)/Alexander.app
+EMBED_DIR = $(EMBED_HOST)/Contents/Frameworks
+
+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
+
clean:
pbxbuild clean
+
diff --git a/WebKit/WebKit.pbproj/kocienda.pbxuser b/WebKit/WebKit.pbproj/kocienda.pbxuser
index ecac31a..14dbf96 100644
--- a/WebKit/WebKit.pbproj/kocienda.pbxuser
+++ b/WebKit/WebKit.pbproj/kocienda.pbxuser
@@ -15,13 +15,14 @@
Split0 = {
Split0 = {
NavContent0 = {
- bookmark = 25C50A3C022D54260ECA149E;
+ bookmark = 25D8E5DB025145AD0ECA149E;
history = (
25F29B12022C4F6E0ECA149E,
25F29B13022C4F6E0ECA149E,
25F29B18022C50AE0ECA149E,
25C50A27022D4CB10ECA149E,
- 25C50A2B022D4CB10ECA149E,
+ 25D8E5D8025145AD0ECA149E,
+ 25D8E5D9025145AD0ECA149E,
);
prevStack = (
25F29B15022C4F6E0ECA149E,
@@ -30,11 +31,12 @@
25F29B1B022C50AE0ECA149E,
25C50A29022D4CB10ECA149E,
25C50A2A022D4CB10ECA149E,
+ 25D8E5DA025145AD0ECA149E,
);
};
NavCount = 1;
NavGeometry0 = {
- Frame = "{{0, 0}, {979, 1002}}";
+ Frame = "{{0, 0}, {1048, 1002}}";
NavBarVisible = YES;
};
};
@@ -71,14 +73,14 @@
{
ContentSize = "{1263, 1049}";
LeftSlideOut = {
- ActiveTab = 0;
+ ActiveTab = 3;
Collapsed = NO;
Frame = "{{0, 23}, {1263, 1026}}";
Split0 = {
Collapsed = NO;
- Frame = "{{284, 0}, {979, 1026}}";
+ Frame = "{{215, 0}, {1048, 1026}}";
Split0 = {
- Frame = "{{0, 24}, {979, 1002}}";
+ Frame = "{{0, 24}, {1048, 1002}}";
};
SplitCount = 1;
Tab0 = {
@@ -208,16 +210,19 @@
StatusViewVisible = YES;
Template = F5F68CF101725D4C0D7A8F4C;
ToolbarVisible = YES;
- WindowLocation = "{365, 192}";
+ WindowLocation = "{227, 178}";
},
);
+ PBXWorkspaceStateSaveDate = 38880671;
};
perUserProjectItems = {
25C50A27022D4CB10ECA149E = 25C50A27022D4CB10ECA149E;
25C50A29022D4CB10ECA149E = 25C50A29022D4CB10ECA149E;
25C50A2A022D4CB10ECA149E = 25C50A2A022D4CB10ECA149E;
- 25C50A2B022D4CB10ECA149E = 25C50A2B022D4CB10ECA149E;
- 25C50A3C022D54260ECA149E = 25C50A3C022D54260ECA149E;
+ 25D8E5D8025145AD0ECA149E = 25D8E5D8025145AD0ECA149E;
+ 25D8E5D9025145AD0ECA149E = 25D8E5D9025145AD0ECA149E;
+ 25D8E5DA025145AD0ECA149E = 25D8E5DA025145AD0ECA149E;
+ 25D8E5DB025145AD0ECA149E = 25D8E5DB025145AD0ECA149E;
25F29B12022C4F6E0ECA149E = 25F29B12022C4F6E0ECA149E;
25F29B13022C4F6E0ECA149E = 25F29B13022C4F6E0ECA149E;
25F29B15022C4F6E0ECA149E = 25F29B15022C4F6E0ECA149E;
@@ -226,6 +231,8 @@
25F29B1A022C50AE0ECA149E = 25F29B1A022C50AE0ECA149E;
25F29B1B022C50AE0ECA149E = 25F29B1B022C50AE0ECA149E;
};
+ projectwideBuildSettings = {
+ };
wantsIndex = 1;
wantsSCM = -1;
};
@@ -277,25 +284,66 @@
vrLen = 1920;
vrLoc = 0;
};
- 25C50A2B022D4CB10ECA149E = {
+ 25D8E5D8025145AD0ECA149E = {
fRef = F5EBC45602134BC301CA1520;
isa = PBXTextBookmark;
- name = "IFPluginView.mm: 652";
- rLen = 0;
- rLoc = 21975;
+ name = "IFPluginView.mm: 160";
+ rLen = 9;
+ rLoc = 4899;
rType = 0;
- vrLen = 2573;
- vrLoc = 10968;
+ vrLen = 2695;
+ vrLoc = 7473;
+ };
+ 25D8E5D9025145AD0ECA149E = {
+ isa = PBXTargetBookmark;
+ trg = 0867D69CFE84028FC02AAC07;
};
- 25C50A3C022D54260ECA149E = {
+ 25D8E5DA025145AD0ECA149E = {
fRef = F5EBC45602134BC301CA1520;
isa = PBXTextBookmark;
- name = "IFPluginView.mm: drawRect:";
+ name = "IFPluginView.mm: 160";
rLen = 9;
rLoc = 4899;
rType = 0;
- vrLen = 2607;
- vrLoc = 7571;
+ vrLen = 2695;
+ vrLoc = 7473;
+ };
+ 25D8E5DB025145AD0ECA149E = {
+ isa = PBXTargetBookmark;
+ trg = 0867D69CFE84028FC02AAC07;
+ uiCtxt = {
+ buildPhasesExpandedSubviews = (
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ );
+ buildPhasesVisRect = "{{0, 0}, {1033, 951}}";
+ buildSettingsExpandedSubviews = (
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ );
+ buildSettingsVisRect = "{{0, 0}, {393, 256}}";
+ expertProductSettingsVisRect = "{{0, 0}, {464, 403}}";
+ guiProductSettingsExpandedSubviews = (
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ );
+ guiProductSettingsVisRect = "{{0, 0}, {2000, 1249}}";
+ productSettingsIsSimple = YES;
+ selectedTab = buildPhases;
+ };
};
25F29B12022C4F6E0ECA149E = {
fRef = F520FB1A0221DEFD01C1A525;
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 9e94c51..c37d22b 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -3,13 +3,16 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 38;
+ objectVersion = 36;
objects = {
014CEA440018CDF011CA2923 = {
buildRules = (
);
buildSettings = {
COPY_PHASE_STRIP = NO;
+ FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Development;
@@ -19,6 +22,9 @@
);
buildSettings = {
COPY_PHASE_STRIP = YES;
+ FRAMEWORK_SEARCH_PATHS = "";
+ INSTALL_PATH = "";
+ SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
name = Deployment;
@@ -60,7 +66,6 @@
buildStyles = (
014CEA440018CDF011CA2923,
014CEA450018CDF011CA2923,
- 257486E20221853F0ECA149E,
);
isa = PBXProject;
knownRegions = (
@@ -116,6 +121,7 @@
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
0867D6A2FE84028FC02AAC07,
+ 255AF6590250FC030ECA149E,
);
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -365,6 +371,18 @@
name = Misc;
refType = 4;
};
+ 255AF6590250FC030ECA149E = {
+ buildActionMask = 2147483647;
+ files = (
+ );
+ generatedFileNames = (
+ );
+ isa = PBXShellScriptBuildPhase;
+ neededFileNames = (
+ );
+ shellPath = /bin/sh;
+ shellScript = "make embed";
+ };
2568C72C0174912D0ECA149E = {
isa = PBXFileReference;
name = WebKit.h;
@@ -380,19 +398,6 @@
);
};
};
- 257486E20221853F0ECA149E = {
- buildRules = (
- );
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
- INSTALL_PATH = "@executable_path/../Frameworks";
- OPTIMIZATION_CFLAGS = "-O2";
- SKIP_INSTALL = YES;
- };
- isa = PBXBuildStyle;
- name = AlexanderTest;
- };
25A5593101A5996D0ECA149E = {
isa = PBXFileReference;
name = WebKitDebug.h;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list