Merge branch 'master' of https://github.com/fsharp/fsharp

fsharp · Aug 4, 2015 · 6e143f7 · 6e143f7
2 parents 07489f9 + e51a2a7
commit 6e143f7
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 4 deletions.
diff --git a/config.make.in b/config.make.in
@@ -55,6 +55,11 @@ VERSION = 3.98.4.0
 TARGET = monotouch
 endif
 
+ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-xamarinwatchos-)
+VERSION = 3.98.4.0
+TARGET = xamarinwatchos
+endif
+
 ifeq (x-$(TargetFramework)-$(FSharpCoreBackVersion),x-xamarinmacmobile-)
 VERSION = 3.99.4.0
 TARGET = xamarinmacmobile

diff --git a/dependencies/mono/2.1/XamarinWatchOS/System.Core.dll b/dependencies/mono/2.1/XamarinWatchOS/System.Core.dll
diff --git a/dependencies/mono/2.1/XamarinWatchOS/System.Numerics.dll b/dependencies/mono/2.1/XamarinWatchOS/System.Numerics.dll
diff --git a/dependencies/mono/2.1/XamarinWatchOS/System.dll b/dependencies/mono/2.1/XamarinWatchOS/System.dll
diff --git a/dependencies/mono/2.1/XamarinWatchOS/mscorlib.dll b/dependencies/mono/2.1/XamarinWatchOS/mscorlib.dll
diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
@@ -24,6 +24,7 @@
     <AssemblyVersion Condition="'$(TargetFramework)' == 'portable259'">3.259.4.0</AssemblyVersion>
     <AssemblyVersion Condition="'$(TargetFramework)' == 'monodroid' ">3.98.4.0</AssemblyVersion>
     <AssemblyVersion Condition="'$(TargetFramework)' == 'monotouch' ">3.98.4.0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(TargetFramework)' == 'xamarinwatchos' ">3.98.4.0</AssemblyVersion>
     <AssemblyVersion Condition="'$(TargetFramework)' == 'xamarinmacmobile' ">3.99.4.0</AssemblyVersion>
     <AssemblyVersion Condition="'$(TargetFramework)' == 'xamarinmacfull' ">3.100.4.0</AssemblyVersion>
 
@@ -196,6 +197,25 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
     <AssemblySearchPaths>$(FSharpSourcesRoot)\..\dependencies\mono\2.1\MonoTouch;$(AssemblySearchPaths)</AssemblySearchPaths>
   </PropertyGroup>
 
+  <!-- Target XamarinWatchOS (should be identical to MonoTouch configurations, though we sanity check --> 
+  <!-- by building against the Xamarin.WatchOS mscorlib) -->
+  <PropertyGroup Condition="'$(TargetFramework)'=='xamarinwatchos'">
+    <!--<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>-->
+    <!-- <TargetFrameworkIdentifier>Xamarin.WatchOS</TargetFrameworkIdentifier> --> 
+    <TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>
+    <DefineConstants>$(DefineConstants);FSHARP_CORE_4_5</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_ATLEAST_45</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
+    <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
+    <DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE;</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
+    <AssemblySearchPaths>$(FSharpSourcesRoot)\..\dependencies\mono\2.1\XamarinWatchOS;$(AssemblySearchPaths)</AssemblySearchPaths>
+  </PropertyGroup>
+
   <!-- Target xamarinmacmobile similar to monotouch configurations, with Reflection.emit, structural equality, and BigInt --> 
   <PropertyGroup Condition="'$(TargetFramework)'=='xamarinmacmobile'">
     <TargetFrameworkOutputDirectory>$(TargetFramework)</TargetFrameworkOutputDirectory>

diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -211,6 +211,7 @@
     </Reference>
     <Reference Include="System.Numerics" Condition="'$(TargetFramework)' == 'net40' OR 
                                                     '$(TargetFramework)' == 'monotouch' OR 
+                                                    '$(TargetFramework)' == 'xamarinwatchos' OR 
                                                     '$(TargetFramework)' == 'monodroid' OR
                                                     '$(TargetFramework)' == 'xamarinmacmobile' OR
                                                     '$(TargetFramework)' == 'xamarinmacfull'" >
@@ -235,6 +236,7 @@
                                                 '$(TargetFramework)' == 'XNA\5.0' OR 
                                                 '$(TargetFramework)' == 'sl3-wp' OR 
                                                 '$(TargetFramework)' == 'monotouch' OR 
+                                                '$(TargetFramework)' == 'xamarinwatchos' OR 
                                                 '$(TargetFramework)' == 'monodroid' OR 
                                                 '$(TargetFramework)' == 'portable47' OR 
                                                 '$(TargetFramework)' == 'net40-xna40-xbox360' OR 

diff --git a/src/fsharp/Makefile.in b/src/fsharp/Makefile.in
@@ -71,25 +71,30 @@ endif
 
 all-monotouch-monodroid-xamarinmac:
 	$(MAKE) build-proto
-	$(MAKE) only-monotouch only-monodroid only-xamarinmac
+	$(MAKE) only-monotouch only-monodroid only-xamarinmac only-xamarinwatchos
 
 all-monotouch-xamarinmac:
 	$(MAKE) build-proto
-	$(MAKE) only-monotouch only-xamarinmac
+	$(MAKE) only-monotouch only-xamarinmac only-xamarinwatchos
 
 all-monotouch-monodroid:
 	$(MAKE) build-proto
-	$(MAKE) only-monotouch only-monodroid
+	$(MAKE) only-monotouch only-monodroid only-xamarinwatchos
 
 all-monotouch:
 	$(MAKE) build-proto
-	$(MAKE) only-monotouch
+	$(MAKE) only-monotouch only-xamarinwatchos
 
 only-monotouch:
 ifeq ("$(monotouchenabled)", "yes")
 	$(MAKE) -C FSharp.Core TargetFramework=monotouch build
 endif
 
+only-xamarinwatchos:
+ifeq ("$(monotouchenabled)", "yes")
+	$(MAKE) -C FSharp.Core TargetFramework=xamarinwatchos build
+endif
+
 all-monodroid:
 	$(MAKE) build-proto
 	$(MAKE) only-monodroid