[netcore] Add LLVM to nuget (mono/mono#16524)
authorEgor Bogatov <egorbo@gmail.com>
Thu, 12 Sep 2019 11:09:03 +0000 (14:09 +0300)
committerMarek Safar <marek.safar@gmail.com>
Thu, 12 Sep 2019 11:09:03 +0000 (13:09 +0200)
* nuspec for llvm

* Add llvm to matrix

* fix scripts/ci/pipeline-netcore-runtime.yml

* fix scripts/ci/pipeline-netcore-runtime.yml

* fix scripts/ci/pipeline-netcore-runtime.yml

* run tests with llvm

* add macOS lane

* disable llvm tests for now

Commit migrated from https://github.com/mono/mono/commit/977a37844b158e5aabbffa65891fa2ffaf1a416c

src/mono/netcore/Makefile
src/mono/netcore/metapackage-llvm.nuspec [new file with mode: 0644]
src/mono/netcore/runtime-llvm.nuspec [new file with mode: 0644]

index a583e8a..70851b6 100644 (file)
@@ -160,9 +160,11 @@ $(SHAREDRUNTIME)/.stamp-link-mono: ../mono/mini/.libs/libmonosgen-2.0$(PLATFORM_
 
 prepare: $(NETCORESDK_FILE) update-corefx update-roslyn link-mono
 
-nupkg:
-       $(DOTNET) pack roslyn-restore.csproj -p:IsPackable=true -p:NuspecFile=runtime.nuspec -p:NuspecProperties=\"RID=$(RID)\;VERSION=$(VERSION)$(VERSTUB)\;PLATFORM_AOT_SUFFIX=$(PLATFORM_AOT_SUFFIX)\;COREARCH=$(COREARCH)\;PLATFORM_AOT_PREFIX=$(PLATFORM_AOT_PREFIX)\" --output ../artifacts/ --no-build
-       $(DOTNET) pack roslyn-restore.csproj -p:IsPackable=true -p:NuspecFile=metapackage.nuspec -p:NuspecProperties=\"RID=$(RID)\;VERSION=$(VERSION)$(VERSTUB)\;PLATFORM_AOT_SUFFIX=$(PLATFORM_AOT_SUFFIX)\;COREARCH=$(COREARCH)\;PLATFORM_AOT_PREFIX=$(PLATFORM_AOT_PREFIX)\" --output ../artifacts/ --no-build
+pack-%:
+       $(DOTNET) pack roslyn-restore.csproj -p:IsPackable=true -p:NuspecFile=$*.nuspec -p:NuspecProperties=\"RID=$(RID)\;VERSION=$(VERSION)$(VERSTUB)\;PLATFORM_AOT_SUFFIX=$(PLATFORM_AOT_SUFFIX)\;COREARCH=$(COREARCH)\;PLATFORM_AOT_PREFIX=$(PLATFORM_AOT_PREFIX)\" --output ../artifacts/ --no-build
+
+nupkg: pack-metapackage pack-runtime
+nupkg-llvm: pack-metapackage-llvm pack-runtime-llvm
 
 clean:
        rm -rf .configured ../.dotnet sdk shared host dotnet tests obj corefx roslyn LICENSE.txt ThirdPartyNotices.txt $(NETCORESDK_FILE)
diff --git a/src/mono/netcore/metapackage-llvm.nuspec b/src/mono/netcore/metapackage-llvm.nuspec
new file mode 100644 (file)
index 0000000..cb0f161
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>Microsoft.NETCore.Runtime.MonoLLVM</id>
+        <version>$VERSION$</version>
+        <description>Internal implementation package not meant for direct consumption.  Please do not reference directly. 
+The Mono runtime, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.</description>
+        <authors>Microsoft</authors>
+        <projectUrl>https://www.mono-project.com/</projectUrl>
+        <dependencies>
+            <dependency id="runtime.linux-x64.Microsoft.NETCore.Runtime.MonoLLVM" version="$VERSION$" />
+        </dependencies>
+    </metadata>
+    <files>
+    </files>
+</package>
diff --git a/src/mono/netcore/runtime-llvm.nuspec b/src/mono/netcore/runtime-llvm.nuspec
new file mode 100644 (file)
index 0000000..558a5c3
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>runtime.$RID$.Microsoft.NETCore.Runtime.MonoLLVM</id>
+        <version>$VERSION$</version>
+        <description>Internal implementation package not meant for direct consumption.  Please do not reference directly. 
+The Mono runtime, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.</description>
+        <authors>Microsoft</authors>
+        <projectUrl>https://www.mono-project.com/</projectUrl>
+    </metadata>
+    <files>
+        <file src="System.Private.CoreLib\bin\$COREARCH$\System.Private.CoreLib.dll" target="runtimes\$RID$\native" />
+        <file src="..\mono\mini\.libs\$PLATFORM_AOT_PREFIX$monosgen-2.0$PLATFORM_AOT_SUFFIX$" target="runtimes\$RID$\native" />
+    </files>
+</package>