WebCore:

[WebKit-https.git] / WebKitTools / BuildSlaveSupport / build-launcher-app

diff --git a/WebKitTools/BuildSlaveSupport/build-launcher-app b/WebKitTools/BuildSlaveSupport/build-launcher-app
index 735e3bb6c8ce2b370e8e03f7b81a7ffed94a384a..ceee27503bf4a8e339d101758525d70830066b66 100755 (executable)
--- a/WebKitTools/BuildSlaveSupport/build-launcher-app
+++ b/WebKitTools/BuildSlaveSupport/build-launcher-app
@@ -44,8 +44,8 @@ my $droseraStagingPath = productDir() . "/DroseraLauncher.app";
 sub buildNightlyLauncher
 {
     chdir($nightlyLauncherTemplatePath);
-    system("xcodebuild", "clean", "-alltargets", @xcodeBuildArguments) == 0 or die "Failed cleaning WebKitLauncher project";
-    system("xcodebuild", @xcodeBuildArguments) == 0 or die "Failed building WebKitLauncher project";
+    system("xcodebuild", "clean", "-alltargets", @xcodeBuildArguments, @ARGV) == 0 or die "Failed cleaning WebKitLauncher project";
+    system("xcodebuild", @xcodeBuildArguments, @ARGV) == 0 or die "Failed building WebKitLauncher project";
     chdirWebKit();
 }
 
@@ -53,6 +53,7 @@ sub copyNightlyLauncher
 {
     my $revision = currentSVNRevision();
     my $infoPlist = "$nightlyLauncherStagingPath/Contents/Info.plist";
+    my $versionFile = "$nightlyLauncherStagingPath/Contents/Resources/VERSION";
     my $data;
     open(IN, $infoPlist) or die "Couldn't open Info.plist in built application for reading";
     {
@@ -64,7 +65,11 @@ sub copyNightlyLauncher
     $data =~ s/VERSION/$revision/g;
     print OUT $data;
     close(OUT);
-    
+
+    open(OUT, ">$versionFile") or die "Couldn't open VERSION in built application for writing";
+    print OUT "$revision\n";
+    close(OUT);
+
     my @frameworks = ("JavaScriptCore", "JavaScriptGlue", "WebCore", "WebKit");
     for my $framework (@frameworks) {
         system("ditto", productDir() . "/$framework.framework", "$nightlyLauncherStagingPath/Contents/Resources/$framework.framework") == 0 or die "Failed copying $framework.framework into $nightlyLauncherStagingPath";
@@ -74,10 +79,10 @@ sub copyNightlyLauncher
 sub buildDroseraLauncher
 {
     chdir($droseraProjectPath);
-    system("xcodebuild", "clean", "-alltargets", @xcodeBuildArguments) == 0 or die "Failed cleaning Drosera project";
-    # build PPC only right now, building universal with the 10.4u SDK cause Xcode to look for the wrong WebCore & JavaScriptCore in the SDK
-    # universal fails because these frameworks are part of the WebKit umbrella, not in /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks
-    system("xcodebuild", "-alltargets", "ARCHS=ppc", @xcodeBuildArguments) == 0 or die "Failed building Drosera project";
+    system("xcodebuild", "clean", "-alltargets", @xcodeBuildArguments, @ARGV) == 0 or die "Failed cleaning Drosera project";
+    # Build native platform only right now, as building universal with the 10.4u SDK cause Xcode to look for WebKit,
+    # WebCore & JavaScriptCore in the SDK under /Developer/SDKs/MacOSX10.4u.sdk/$(BUILT_PRODUCTS_DIR) where they do not exist
+    system("xcodebuild", "-alltargets", @xcodeBuildArguments, @ARGV) == 0 or die "Failed building Drosera project";
     chdirWebKit();
 }