<html>
    <head>
      <base href="https://bugs.webkit.org/">
    </head>
    <body>
      <p>
        <div>
            <b><a class="bz_bug_link 
          bz_status_NEW "
   title="NEW - HTTPS Upgrade: Scripts / preprocessing necessary to create new database in future"
   href="https://bugs.webkit.org/show_bug.cgi?id=192612#c10">Comment # 10</a>
              on <a class="bz_bug_link 
          bz_status_NEW "
   title="NEW - HTTPS Upgrade: Scripts / preprocessing necessary to create new database in future"
   href="https://bugs.webkit.org/show_bug.cgi?id=192612">bug 192612</a>
              from <span class="vcard"><a class="email" href="mailto:aestes@apple.com" title="Andy Estes <aestes@apple.com>"> <span class="fn">Andy Estes</span></a>
</span></b>
        <pre>Comment on <span class="bz_obsolete"><a href="attachment.cgi?id=357259&action=diff" name="attach_357259" title="Patch">attachment 357259</a> <a href="attachment.cgi?id=357259&action=edit" title="Patch">[details]</a></span>
Patch

View in context: <a href="https://bugs.webkit.org/attachment.cgi?id=357259&action=review">https://bugs.webkit.org/attachment.cgi?id=357259&action=review</a>

<span class="quote">> Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig:403
> +ENABLE_HTTPS_UPGRADE = ;</span >

This is the same as just not defining ENABLE_HTTPS_UPGRADE. You shouldn't need to change any FeatureDefines files until this feature will be at least conditionally enabled somewhere.

<span class="quote">> Source/WebKit/Configurations/WebKit.xcconfig:155
> -EXCLUDED_SOURCE_FILE_NAMES = Resources/ios/*;
> +EXCLUDED_SOURCE_FILE_NAMES_BASE_ = Resources/ios/* ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2/HTTPSUpgradeList.db;
> +EXCLUDED_SOURCE_FILE_NAMES_BASE_ENABLE_HTTPS_UPGRADE = Resources/ios/*;
> +
> +EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_BASE_$(ENABLE_HTTPS_UPGRADE));</span >

We can avoid repeating the "Resources/ios/*" part by splitting things up a little differently:

WK_EXCLUDED_HTTPS_UPGRADE_FILE = $(WK_EXCLUDED_HTTPS_UPGRADE_FILE_$(ENABLE_HTTPS_UPGRADE));
WK_EXCLUDED_HTTPS_UPGRADE_FILE_ = HTTPSUpgradeList.db;

EXCLUDED_SOURCE_FILE_NAMES = Resources/ios/* $(WK_EXCLUDED_HTTPS_UPGRADE_FILE);

(I *think* you can specify HTTPSUpgradeList.db without its path as long as it's included in the project).

<span class="quote">> Source/WebKit/DerivedSources.make:320
> +HTTPSUpgradeList.db : $(WebKit2)/Scripts/generate-https-upgrade-database.sh</span >

HTTPSUpgradeList.txt also needs to be a dependency here (as well as the script) because HTTPSUpgradeList.db needs to rebuild when it changes. See below about using VPATH to make this easier.

<span class="quote">> Source/WebKit/Scripts/generate-https-upgrade-database.sh:24
> +RELATIVE_SOURCE_PATH="usr/local/include/WebKitAdditions"
> +SOURCE_PATH="${BUILT_PRODUCTS_DIR}/${RELATIVE_SOURCE_PATH}"
> +
> +if [[ ! -d "$SOURCE_PATH" ]]; then
> +  SOURCE_PATH="${SDK_DIR}/${RELATIVE_SOURCE_PATH}"
> +fi
> +
> +INPUT_FILE_PATH="${SOURCE_PATH}/HTTPSUpgradeList.txt"</span >

I don't think you need all this. Note that DerivedSources.make has $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) in its VPATH, so it's set up to search $SDKROOT and $BUILT_PRODUCTS_DIR in the right order. I'd just have the makefile find HTTPSUpgradeList.txt in the VPATH then pass that path to the script as a command-line argument.</pre>
        </div>
      </p>


      <hr>
      <span>You are receiving this mail because:</span>

      <ul>
          <li>You are the assignee for the bug.</li>
      </ul>
    </body>
</html>