[Win] Pass OFFICIAL_BUILD flag to WebInspectorUI build process

https://bugs.webkit.org/show_bug.cgi?id=136229

Reviewed by Dean Jackson.

Source/WebInspectorUI:

* WebInspectorUI.vcxproj/WebInspectorUI.make: Pass OFFICIAL_BUILD
flag to build-webinspectorui.pl.
* WebInspectorUI.vcxproj/build-webinspectorui.pl: Accept and use
the OFFICIAL_BUILD flag.

WebKitLibraries:

* win/tools/vsprops/common.props: Pass OFFICIAL_BUILD argument
from VS to child Make processes.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172929 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index bd509717b0811feb88cbe874c2ab30cfa5c73f41..61d7221d2688c5576b42da532581a5c26a6406c1 100644 (file)
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,15 @@
+2014-08-25  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Pass OFFICIAL_BUILD flag to WebInspectorUI build process
+        https://bugs.webkit.org/show_bug.cgi?id=136229
+
+        Reviewed by Dean Jackson.
+
+        * WebInspectorUI.vcxproj/WebInspectorUI.make: Pass OFFICIAL_BUILD
+        flag to build-webinspectorui.pl.
+        * WebInspectorUI.vcxproj/build-webinspectorui.pl: Accept and use
+        the OFFICIAL_BUILD flag.
+
 2014-08-24  Benjamin Poulain  <benjamin@webkit.org>
 
         The inspector should not use the "after" pseudo element with the compatibility syntax

diff --git a/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make b/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make
index bb7b3f87f82ee7d920442e18511dba38e7cc1338..0b0e5577b92e6f7aede833f677160e406c3574b7 100644 (file)
--- a/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make
+++ b/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.make
@@ -1,6 +1,6 @@
 make:\r
        -mkdir "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"\r
-       perl build-webinspectorui.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%"\r
+       perl build-webinspectorui.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" windows "%PlatformArchitecture%" "%OFFICIAL_BUILD%"\r
        if errorlevel 1 exit 1\r
 \r
        xcopy /y /e "..\Localizations\en.lproj\*" "%ConfigurationBuildDir%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"\r

diff --git a/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl b/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl
index 16ddb8d4ce7c5ec685f82861570ffc9fc1db3047..035cab1a585aae94326198056d59b2576b4c1d41 100755 (executable)
--- a/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl
+++ b/Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl
@@ -46,7 +46,7 @@ $ENV{'XDSTROOT'} = $XDSTROOT;
 my $TARGET_BUILD_DIR = File::Spec->catdir($XDSTROOT, "bin$ARGV[3]", 'WebKit.resources');
 $ENV{'TARGET_BUILD_DIR'} = $TARGET_BUILD_DIR;
 my ($JAVASCRIPTCORE_PRIVATE_HEADERS_DIR, $WEBCORE_PRIVATE_HEADERS_DIR);
-if ($ENV{'OFFICIAL_BUILD'} eq '1') {
+if ($ARGV[4] eq '1') {
     $ARGV[1] =~ s/^\"//;
     $ARGV[1] =~ s/\"$//;
     my $Internal = Cwd::realpath($ARGV[1]);;
@@ -59,6 +59,7 @@ if ($ENV{'OFFICIAL_BUILD'} eq '1') {
 
 $ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'} = $JAVASCRIPTCORE_PRIVATE_HEADERS_DIR;
 $ENV{'WEBCORE_PRIVATE_HEADERS_DIR'} = $WEBCORE_PRIVATE_HEADERS_DIR;
+
 my $DERIVED_SOURCES_DIR = File::Spec->catdir($XDSTROOT, "obj$ARGV[3]", 'WebInspectorUI', 'DerivedSources');
 $ENV{'DERIVED_SOURCES_DIR'} = $DERIVED_SOURCES_DIR;
 
@@ -68,5 +69,17 @@ if (($TARGET_BUILD_DIR =~ /Release/) || ($TARGET_BUILD_DIR =~ /Production/)) {
     $ENV{'COMBINE_INSPECTOR_RESOURCES'} = 'YES';
 } 
 
+my $targetResourcePath = File::Spec->catdir($ENV{'TARGET_BUILD_DIR'}, $ENV{'UNLOCALIZED_RESOURCES_FOLDER_PATH'});
+my $protocolDir = File::Spec->catdir($targetResourcePath, 'Protocol');
+
+# Copy over dynamically loaded files from other frameworks, even if we aren't combining resources.
+my $jsFrom = File::Spec->catfile($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'InspectorJSBackendCommands.js');
+my $jsTo = File::Spec->catfile($protocolDir, 'InspectorJSBackendCommands.js');
+print "Copying JavaScript bindings from $jsFrom to $jsTo\n";
+
+my $wcFrom = File::Spec->catfile($ENV{'WEBCORE_PRIVATE_HEADERS_DIR'}, 'InspectorWebBackendCommands.js');
+my $wcTo = File::Spec->catfile($protocolDir, 'InspectorWebBackendCommands.js');
+print "Copying WebCore bindings from $wcFrom to $wcTo\n";
+
 my $copyResourcesCommand = File::Spec->catfile($XSRCROOT, 'Scripts', 'copy-user-interface-resources.pl');
 do $copyResourcesCommand;

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 2a09eed995e02c3d8af1e3f740c562b5f5f9104c..263633daa9b37bfb15765fd712e7caca85f685a1 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+2014-08-25  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Pass OFFICIAL_BUILD flag to WebInspectorUI build process
+        https://bugs.webkit.org/show_bug.cgi?id=136229
+
+        Reviewed by Dean Jackson.
+
+        * win/tools/vsprops/common.props: Pass OFFICIAL_BUILD argument
+        from VS to child Make processes.
+
 2014-08-17  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Unreviewed build fix.

diff --git a/WebKitLibraries/win/tools/vsprops/common.props b/WebKitLibraries/win/tools/vsprops/common.props
index 00df6416228487cc4a80bff692f51bad3638fa48..fd321cc8a5b252723045d89aef44ce952f0dc2b3 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/common.props
+++ b/WebKitLibraries/win/tools/vsprops/common.props
@@ -15,12 +15,14 @@ if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
 set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
 set PLATFORMARCHITECTURE=$(PlatformArchitecture)
 set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
+set OFFICIAL_BUILD=$(OFFICIAL_BUILD)
 nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
 if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
 set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
 set PLATFORMARCHITECTURE=$(PlatformArchitecture)
 set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
+set OFFICIAL_BUILD=$(OFFICIAL_BUILD)
 nmake /nologo -f $(ProjectName).make clean
 nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
@@ -241,4 +243,4 @@ cmd /c
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>