Changeset 142207 in webkit


Ignore:
Timestamp:
Feb 7, 2013 4:56:03 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Makefiles should work for arbitrary SDKs and architectures on Apple ports
​https://bugs.webkit.org/show_bug.cgi?id=107863

Patch by David Farler <​dfarler@apple.com> on 2013-02-07
Reviewed by Mark Rowe.

.:

  • Makefile:

Allow SDKROOT, ARCHS outside of $(ARGS).
Setting ARCHS => ONLY_ACTIVE_ARCH=NO.

  • Makefile.shared: options to webkitdirs based on SDKROOT
  • Source/Makefile: don't build WebKit2 for iOS

Tools:

  • DumpRenderTree/Makefile: SDKROOT=iphone* => -target All-iOS
  • Makefile: Only build some projects for iOS
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r142179 r142207  
     12013-02-07  David Farler  <dfarler@apple.com>
     2
     3        Makefiles should work for arbitrary SDKs and architectures on Apple ports
     4        https://bugs.webkit.org/show_bug.cgi?id=107863
     5
     6        Reviewed by Mark Rowe.
     7
     8        * Makefile:
     9        Allow SDKROOT, ARCHS outside of $(ARGS).
     10        Setting ARCHS => ONLY_ACTIVE_ARCH=NO.
     11        * Makefile.shared: options to webkitdirs based on SDKROOT
     12        * Source/Makefile: don't build WebKit2 for iOS
     13
    1142013-02-07  Martin Robinson  <mrobinson@igalia.com>
    215

  • trunk/Makefile

    r140939 r142207  
    55        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
    66
    7 debug d development dev develop:
     7debug d:
    88        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
    99        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
    1010
    11 release r deployment dep deploy:
     11release r:
    1212        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
    1313        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done

  • trunk/Makefile.shared

    r140939 r142207  
    11SCRIPTS_PATH ?= ../Tools/Scripts
    2 XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
     2
     3XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $(ARGS)
     4
     5ifneq (,$(SDKROOT))
     6        XCODE_OPTIONS += SDKROOT=$(SDKROOT)
     7endif
     8
     9ifneq (,$(ARCHS))
     10        XCODE_OPTIONS += ARCHS="$(ARCHS)"
     11        XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
     12endif
    313
    414DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")

  • trunk/Source/Makefile

    r140939 r142207  
    11MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2
     2
     3ifneq (,$(findstring iphoneos,$(SDKROOT)))
     4        MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit
     5else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
     6        MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit
     7endif
    28
    39all:
    … …  
    511        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
    612
    7 debug d development dev develop:
     13debug d:
    814        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
    915        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
    1016
    11 release r deployment dep deploy:
     17release r:
    1218        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
    1319        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done

  • trunk/Tools/ChangeLog

    r142188 r142207  
     12013-02-07  David Farler  <dfarler@apple.com>
     2
     3        Makefiles should work for arbitrary SDKs and architectures on Apple ports
     4        https://bugs.webkit.org/show_bug.cgi?id=107863
     5
     6        Reviewed by Mark Rowe.
     7
     8        * DumpRenderTree/Makefile: SDKROOT=iphone* => -target All-iOS
     9        * Makefile: Only build some projects for iOS
     10
    1112013-02-07  Roger Fong  <roger_fong@apple.com>
    212

  • trunk/Tools/DumpRenderTree/Makefile

    r140939 r142207  
    11SCRIPTS_PATH = ../Scripts
     2
     3ifneq (,$(findstring iphoneos,$(SDKROOT)))
     4        OTHER_OPTIONS += -target All-iOS
     5else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
     6        OTHER_OPTIONS += -target All-iOS
     7endif
     8
    29include ../../Makefile.shared

  • trunk/Tools/Makefile

    r140939 r142207  
    11MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
     2
     3ifneq (,$(findstring iphoneos,$(SDKROOT)))
     4        MODULES = ../Source/ThirdParty/gtest/xcode
     5else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
     6        MODULES = DumpRenderTree ../Source/ThirdParty/gtest/xcode
     7endif
    28
    39all:
Note: See TracChangeset for help on using the changeset viewer.