Removed nuget.exe and nugetpack powershell script, changed version number on assemblies, DLLs, and nuspecs to 1.0.0.0, Changed ARM related nuspec references to use win8-arm since win-arm is not a valid NuGet Runtime Identifier (RID)

2016-12-16 16:01:54 -08:00
parent 63230ae46a 74fb205083
commit c5ab9637f4
28 changed files with 123 additions and 92 deletions
--- a/csharp/BUCK
+++ b/csharp/BUCK
@@ -5,6 +5,10 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.

+include_defs('//YOGA_DEFS')
+
+COMPILER_FLAGS = BASE_COMPILER_FLAGS + ['-std=c++11']
+
 csharp_library(
  name = 'yogalibnet46',
  dll_name = 'Facebook.Yoga.dll',
@@ -18,3 +22,42 @@ csharp_library(
  framework_ver = 'net45',
  srcs = glob(['**/*.cs']),
 )
+
+cxx_library(
+  name = 'yoganet',
+  soname = 'libyoga.$(ext)',
+  srcs = glob(['Yoga/YGInterop.cpp']),
+  compiler_flags = COMPILER_FLAGS,
+  link_style = 'static',
+  link_whole = True,
+  deps = [yoga_dep(':yoga')],
+  visibility = ['PUBLIC'],
+)
+
+with allow_unsafe_import():
+  import os
+
+if os.path.isdir('/Applications/Xcode.app'):
+  yoganet_ios_srcs = []
+  for arch in ['iphonesimulator-x86_64', 'iphoneos-arm64', 'iphoneos-armv7']:
+    name = 'yoganet-' + arch
+    yoganet_ios_srcs.append(':' + name)
+    genrule(
+      name = name,
+      srcs = [
+        yoga_dep(':yoga#%s,static' % arch),
+        yoga_dep('YogaKit:YogaKit#%s,static' % arch),
+        yoga_dep('csharp:yoganet#%s,static' % arch),
+      ],
+      out = 'libyoga-%s.a' % arch,
+      cmd = 'libtool -static -o $OUT $SRCS',
+      visibility = [yoga_dep('csharp:yoganet-ios')],
+    )
+
+  genrule(
+    name = 'yoganet-ios',
+    srcs = yoganet_ios_srcs,
+    out = 'libyoga.a',
+    cmd = 'lipo $SRCS -create -output $OUT',
+    visibility = ['PUBLIC'],
+  )
--- a/csharp/Facebook.Yoga.Desktop.sln
+++ b/csharp/Facebook.Yoga.Desktop.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -27,7 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Build\Facebook.Yoga.NativeInterop.targets = Build\Facebook.Yoga.NativeInterop.targets
 		NuGet\Facebook.Yoga.nuspec = NuGet\Facebook.Yoga.nuspec
 		NuGet\Facebook.Yoga.targets = NuGet\Facebook.Yoga.targets
-		nuget\NuGetPackageBuilder.ps1 = nuget\NuGetPackageBuilder.ps1
 	EndProjectSection
 EndProject
 Global
--- a/csharp/Facebook.Yoga.Universal.sln
+++ b/csharp/Facebook.Yoga.Universal.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -25,7 +25,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Build\Facebook.Yoga.NativeInterop.targets = Build\Facebook.Yoga.NativeInterop.targets
 		NuGet\Facebook.Yoga.nuspec = NuGet\Facebook.Yoga.nuspec
 		NuGet\Facebook.Yoga.targets = NuGet\Facebook.Yoga.targets
-		nuget\NuGetPackageBuilder.ps1 = nuget\NuGetPackageBuilder.ps1
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "tests\Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0856757B-1671-4E43-AF41-4AEA53988796}"
--- a/csharp/Facebook.Yoga.sln
+++ b/csharp/Facebook.Yoga.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -27,7 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Build\Facebook.Yoga.NativeInterop.targets = Build\Facebook.Yoga.NativeInterop.targets
 		NuGet\Facebook.Yoga.nuspec = NuGet\Facebook.Yoga.nuspec
 		NuGet\Facebook.Yoga.targets = NuGet\Facebook.Yoga.targets
-		nuget\NuGetPackageBuilder.ps1 = nuget\NuGetPackageBuilder.ps1
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "tests\Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0856757B-1671-4E43-AF41-4AEA53988796}"
--- a/csharp/Facebook.Yoga/Native.cs
+++ b/csharp/Facebook.Yoga/Native.cs
@@ -14,7 +14,7 @@ namespace Facebook.Yoga
 {
    internal static class Native
    {
-#if UNITY_IOS && !UNITY_EDITOR
+#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
        private const string DllName = "__Internal";
 #else
        private const string DllName = "yoga";
@@ -58,7 +58,7 @@ namespace Facebook.Yoga
        public static extern IntPtr YGNodeGetChild(IntPtr node, uint index);

        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern uint YGNodeChildCount(IntPtr node);
+        public static extern uint YGNodeGetChildCount(IntPtr node);

        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
        public static extern void YGNodeCalculateLayout(IntPtr node,
--- a/csharp/Facebook.Yoga/Properties/AssemblyInfo.cs
+++ b/csharp/Facebook.Yoga/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@ using System.Runtime.InteropServices;

 [assembly: NeutralResourcesLanguage("en")]

-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

--- a/csharp/Facebook.Yoga/YogaNode.Create.cs
+++ b/csharp/Facebook.Yoga/YogaNode.Create.cs
@@ -31,12 +31,12 @@ namespace Facebook.Yoga
            Spacing margin = null,
            Spacing padding = null,
            Spacing border = null,
-            float? Width = null,
-            float? Height = null,
-            float? MaxWidth = null,
-            float? MaxHeight = null,
-            float? MinWidth = null,
-            float? MinHeight = null)
+            float? width = null,
+            float? height = null,
+            float? maxWidth = null,
+            float? maxHeight = null,
+            float? minWidth = null,
+            float? minHeight = null)
        {
            YogaNode node = new YogaNode();

@@ -197,34 +197,34 @@ namespace Facebook.Yoga
                }
            }

-            if (Width.HasValue)
+            if (width.HasValue)
            {
-                node.Width = Width.Value;
+                node.Width = width.Value;
            }

-            if (Height.HasValue)
+            if (height.HasValue)
            {
-                node.Height = Height.Value;
+                node.Height = height.Value;
            }

-            if (MinWidth.HasValue)
+            if (minWidth.HasValue)
            {
-                node.MinWidth = MinWidth.Value;
+                node.MinWidth = minWidth.Value;
            }

-            if (MinHeight.HasValue)
+            if (minHeight.HasValue)
            {
-                node.MinHeight = MinHeight.Value;
+                node.MinHeight = minHeight.Value;
            }

-            if (MaxWidth.HasValue)
+            if (maxWidth.HasValue)
            {
-                node.MaxWidth = MaxWidth.Value;
+                node.MaxWidth = maxWidth.Value;
            }

-            if (MaxHeight.HasValue)
+            if (maxHeight.HasValue)
            {
-                node.MaxHeight = MaxHeight.Value;
+                node.MaxHeight = maxHeight.Value;
            }

            return node;
--- a/csharp/Yoga/Yoga.rc
+++ b/csharp/Yoga/Yoga.rc
--- a/csharp/Yoga/Yoga.vcxproj
+++ b/csharp/Yoga/Yoga.vcxproj
@@ -29,6 +29,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
+    <ProjectName>yoga</ProjectName>
    <RootNamespace>Yoga</RootNamespace>
    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
--- a/csharp/nuget/Facebook.Yoga.Native.nuspec
+++ b/csharp/nuget/Facebook.Yoga.Native.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
  <metadata>
    <id>Facebook.Yoga.Native</id>
-    <version>3.0.0-pre</version>
+    <version>1.0.0-pre</version>
    <title>Facebook.Yoga.Native</title>
    <authors>Facebook</authors>
    <owners>Facebook</owners>
@@ -31,8 +31,8 @@
    <file src="..\Yoga\bin\x64\Release\Yoga.dll" target="runtimes\win-x64\native"/>
    <file src="..\Yoga\bin\x64\Release\Yoga.pdb" target="runtimes\win-x64\native"/>

-    <file src="..\Yoga\bin\ARM\Release\Yoga.dll" target="runtimes\win-arm\native"/>
-    <file src="..\Yoga\bin\ARM\Release\Yoga.pdb" target="runtimes\win-arm\native"/>    
+    <file src="..\Yoga\bin\ARM\Release\Yoga.dll" target="runtimes\win8-arm\native"/>
+    <file src="..\Yoga\bin\ARM\Release\Yoga.pdb" target="runtimes\win8-arm\native"/>    
  </files>
  
 </package>
--- a/csharp/nuget/Facebook.Yoga.Native.targets
+++ b/csharp/nuget/Facebook.Yoga.Native.targets
@@ -27,7 +27,7 @@
    </Content>
  </ItemGroup>
  <ItemGroup Condition=" (Exists('packages.config') Or Exists('packages.$(MSBuildProjectName).config')) And '$(Platform)' == 'ARM'">
-    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm\native\*">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win8-arm\native\*">
      <Link>%(Filename)%(Extension)</Link>
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <Visible>False</Visible>
--- a/csharp/nuget/Facebook.Yoga.nuspec
+++ b/csharp/nuget/Facebook.Yoga.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
  <metadata>
    <id>Facebook.Yoga</id>
-    <version>3.0.0-pre</version>
+    <version>1.0.0-pre</version>
    <title>Facebook.Yoga</title>
    <authors>Facebook</authors>
    <owners>Facebook</owners>
@@ -30,8 +30,8 @@
    <file src="..\Facebook.Yoga\bin\x64\Release\Facebook.Yoga.dll" target="runtimes\win-x64\lib\netstandard"/>
    <file src="..\Facebook.Yoga\bin\x64\Release\Facebook.Yoga.pdb" target="runtimes\win-x64\lib\netstandard"/>
    
-    <file src="..\Facebook.Yoga\bin\ARM\Release\Facebook.Yoga.dll" target="runtimes\win-arm\lib\netstandard"/>
-    <file src="..\Facebook.Yoga\bin\ARM\Release\Facebook.Yoga.pdb" target="runtimes\win-arm\lib\netstandard"/>    
+    <file src="..\Facebook.Yoga\bin\ARM\Release\Facebook.Yoga.dll" target="runtimes\win8-arm\lib\netstandard"/>
+    <file src="..\Facebook.Yoga\bin\ARM\Release\Facebook.Yoga.pdb" target="runtimes\win8-arm\lib\netstandard"/>    

    <!-- Native -->
    <file src="..\Yoga\bin\x86\Release\Yoga.dll" target="runtimes\win-x86\native"/>
@@ -40,7 +40,7 @@
    <file src="..\Yoga\bin\x64\Release\Yoga.dll" target="runtimes\win-x64\native"/>
    <file src="..\Yoga\bin\x64\Release\Yoga.pdb" target="runtimes\win-x64\native"/>

-    <file src="..\Yoga\bin\ARM\Release\Yoga.dll" target="runtimes\win-arm\native"/>
-    <file src="..\Yoga\bin\ARM\Release\Yoga.pdb" target="runtimes\win-arm\native"/>
+    <file src="..\Yoga\bin\ARM\Release\Yoga.dll" target="runtimes\win8-arm\native"/>
+    <file src="..\Yoga\bin\ARM\Release\Yoga.pdb" target="runtimes\win8-arm\native"/>
  </files>
 </package>
--- a/csharp/nuget/Facebook.Yoga.targets
+++ b/csharp/nuget/Facebook.Yoga.targets
@@ -37,12 +37,12 @@
    </Content>    
  </ItemGroup>
  <ItemGroup Condition=" (Exists('packages.config') Or Exists('packages.$(MSBuildProjectName).config')) And '$(Platform)' == 'ARM'">
-    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm\lib\netstandard\*">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win8-arm\lib\netstandard\*">
      <Link>%(Filename)%(Extension)</Link>
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <Visible>False</Visible>
    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm\native\*">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win8-arm\native\*">
      <Link>%(Filename)%(Extension)</Link>
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <Visible>False</Visible>
--- a/csharp/nuget/NuGetPackageBuilder.ps1
+++ b/csharp/nuget/NuGetPackageBuilder.ps1
@@ -1,10 +0,0 @@
-$solutionRoot = Resolve-Path ..\
-
-# Delete any existing output.
-Remove-Item *.nupkg
-
-# Create new packages for any nuspec files that exist in this directory.
-Foreach ($nuspec in $(Get-Item *.nuspec))
-{
-	.\Tools\NuGet.exe pack "$nuspec"
-}
--- a/csharp/nuget/Tools/nuget.exe
+++ b/csharp/nuget/Tools/nuget.exe
--- a/csharp/tests/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs
+++ b/csharp/tests/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs
@@ -23,6 +23,6 @@ using System.Runtime.InteropServices;

 [assembly: NeutralResourcesLanguage("en")]

-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

--- a/csharp/tests/Facebook.Yoga/YogaNodeCreateTest.cs
+++ b/csharp/tests/Facebook.Yoga/YogaNodeCreateTest.cs
@@ -87,12 +87,12 @@ namespace Facebook.Yoga
                padding: new Spacing(top: 13, bottom: 14, left: 15, right: 16),
                border: new Spacing(top: 17, bottom: 18, left: 19, right: 20),

-                Width: 21,
-                Height: 22,
-                MinWidth: 23,
-                MinHeight: 24,
-                MaxWidth: 25,
-                MaxHeight: 26);
+                width: 21,
+                height: 22,
+                minWidth: 23,
+                minHeight: 24,
+                maxWidth: 25,
+                maxHeight: 26);

            Assert.AreEqual(YogaDirection.RTL, node.StyleDirection);
            Assert.AreEqual(YogaFlexDirection.RowReverse, node.FlexDirection);
--- a/csharp/tests/Facebook.Yoga/test_macos.sh
+++ b/csharp/tests/Facebook.Yoga/test_macos.sh
@@ -1,16 +1,6 @@
 #!/bin/sh
-if clang --version >/dev/null 2>&1; then true; else
-  echo "ERROR: Can't execute clang. You need to install Xcode and command line tools."
-  exit 1
-fi
-
-if mcs --version >/dev/null 2>&1; then true; else
-  echo "ERROR: Can't execute mcs. You need to install Mono from http://www.mono-project.com/download/ and re-login to apply PATH environment."
-  exit 1
-fi
-
-if mono --version >/dev/null 2>&1; then true; else
-  echo "ERROR: Can't execute mono64. You need to install Mono from http://www.mono-project.com/download/ and re-login to apply PATH environment."
+if mcs --version >/dev/null 2>&1 && mono --version >/dev/null 2>&1; then true; else
+  echo "ERROR: Need to install Mono (brew install mono, or http://www.mono-project.com/download/)"
  exit 1
 fi

@@ -28,6 +18,11 @@ if [ -d $NUNIT \
  rm NUnit-2.6.4.zip
 fi

-clang -g -Wall -Wextra -dynamiclib -o libyoga.dylib -I../../.. ../../../yoga/*.c ../../Yoga/YGInterop.cpp
+TARGET=//csharp:yoganet#default,shared
+buck build $TARGET
+ROOT=`buck root|tail -1`
+DYLIB=`buck targets --show-output $TARGET|tail -1|awk '{print $2}'`
+cp $ROOT/$DYLIB .
+
 mcs -debug -t:library -r:$NUNIT/nunit.framework.dll -out:YogaTest.dll *.cs ../../../csharp/Facebook.Yoga/*cs
 MONO_PATH=$NUNIT mono --arch=64 --debug $NUNIT/nunit-console.exe YogaTest.dll