From 50feb21cb3ebc8c4990204e9c8af2f2b11dae3cb Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Tue, 16 May 2017 09:47:25 -0700
Subject: [PATCH] =?UTF-8?q?=C2=A0Centralize=20native=20dependencies=20buil?=
 =?UTF-8?q?d=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary: Closes https://github.com/facebook/yoga/pull/554

Differential Revision: D5069362

Pulled By: emilsjolander

fbshipit-source-id: 7cf65233928c11010337ee21c633173ea919cc94
---
 .../Android/Facebook.Yoga.Android/CustomBuildAction.targets | 6 +++---
 csharp/Mac/CustomBuildAction.targets                        | 2 +-
 csharp/Mac/buck-build.sh                                    | 6 ------
 csharp/iOS/Facebook.Yoga.iOS/CustomBuildAction.targets      | 2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100755 csharp/Mac/buck-build.sh

diff --git a/csharp/Android/Facebook.Yoga.Android/CustomBuildAction.targets b/csharp/Android/Facebook.Yoga.Android/CustomBuildAction.targets
index 73ba6bad..7ee8767c 100644
--- a/csharp/Android/Facebook.Yoga.Android/CustomBuildAction.targets
+++ b/csharp/Android/Facebook.Yoga.Android/CustomBuildAction.targets
@@ -4,17 +4,17 @@
         <BuildDependsOn>NativeLibraryARMV7;NativeLibraryX86;$(BuildDependsOn)</BuildDependsOn>
     </PropertyGroup>
     <Target Name="NativeLibraryARMV7" Outputs="$(ProjectDir)/lib/armeabi-v7a/libyoga.so">
-        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet#android-armv7,shared" />
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../build-native.sh" />
         <Copy SourceFiles="$(ProjectDir)../../../buck-out/gen/csharp/yoganet#android-armv7,shared/libyoga.so" DestinationFiles="$(ProjectDir)/lib/armeabi-v7a/libyoga.so" SkipUnchangedFiles="true" />
     </Target>
     <!--
     <Target Name="NativeLibraryARM64" Outputs="$(ProjectDir)/lib/arm64-v8a/libyoga.so">
-        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet#android-arm64,shared" />
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../build-native.sh" />
         <Copy SourceFiles="$(ProjectDir)../../../buck-out/gen/csharp/yoganet#android-arm64,shared/libyoga.so" DestinationFiles="$(ProjectDir)/lib/arm64-v8/libyoga.so" SkipUnchangedFiles="true" />
     </Target>
     -->
     <Target Name="NativeLibraryX86" Outputs="$(ProjectDir)/lib/x86/libyoga.so">
-        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet#android-x86,shared" />
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../build-native.sh" />
         <Copy SourceFiles="$(ProjectDir)../../../buck-out/gen/csharp/yoganet#android-x86,shared/libyoga.so" DestinationFiles="$(ProjectDir)/lib/x86/libyoga.so" SkipUnchangedFiles="true" />
     </Target>
 </Project>
diff --git a/csharp/Mac/CustomBuildAction.targets b/csharp/Mac/CustomBuildAction.targets
index f17d2169..d8df4e70 100644
--- a/csharp/Mac/CustomBuildAction.targets
+++ b/csharp/Mac/CustomBuildAction.targets
@@ -4,7 +4,7 @@
 		<CompileDependsOn>NativeLibrary;$(CompileDependsOn)</CompileDependsOn>
 	</PropertyGroup>
 	<Target Name="NativeLibrary" Outputs="$(ProjectDir)libyoga.dylib">
-		<Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)buck-build.sh //csharp:yoganet-macosx" />
+		<Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../build-native.sh" />
 		<Copy SourceFiles="$(ProjectDir)..\..\buck-out\gen\csharp\yoganet-macosx\libyoga.dylib" DestinationFiles="$(ProjectDir)libyoga.dylib" SkipUnchangedFiles="true" />
 	</Target>
 </Project>
\ No newline at end of file
diff --git a/csharp/Mac/buck-build.sh b/csharp/Mac/buck-build.sh
deleted file mode 100755
index de1a32a2..00000000
--- a/csharp/Mac/buck-build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if buck --version >/dev/null 2>&1; then true; else
-  echo "SKIP: Need to install buck https://buckbuild.com/setup/getting_started.html"
-  exit 0
-fi
-buck build $1
diff --git a/csharp/iOS/Facebook.Yoga.iOS/CustomBuildAction.targets b/csharp/iOS/Facebook.Yoga.iOS/CustomBuildAction.targets
index 04a1b830..bce91a45 100644
--- a/csharp/iOS/Facebook.Yoga.iOS/CustomBuildAction.targets
+++ b/csharp/iOS/Facebook.Yoga.iOS/CustomBuildAction.targets
@@ -4,7 +4,7 @@
         <CompileDependsOn>NativeLibrary;$(CompileDependsOn)</CompileDependsOn>
     </PropertyGroup>
     <Target Name="NativeLibrary" Outputs="$(ProjectDir)libyoga.a">
-        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet-ios" />
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../build-native.sh" />
         <Copy SourceFiles="$(ProjectDir)..\..\..\buck-out\gen\csharp\yoganet-ios\libyoga.a" DestinationFiles="$(ProjectDir)libyoga.a" SkipUnchangedFiles="true" />
     </Target>
 </Project>