WiP

2016-08-19 14:52:06 -07:00 · 2016-08-19 14:52:06 -07:00 · 56d2153c08
commit 56d2153c08
parent 578adf072c
4 changed files with 180 additions and 168 deletions
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.props
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.props
@ -12,4 +12,14 @@
    <DebLayoutDocsDirName>docs</DebLayoutDocsDirName>
    <DebLayoutDebianFilesDirName>debian</DebLayoutDebianFilesDirName>
  </PropertyGroup>
+
+  <ItemGroup>
+    <DotnetDebToolProjectJsonLines Remove="*" />
+    <DotnetDebToolProjectJsonLines Include="{" />
+    <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;version&quot;: &quot;1.0.0-*&quot;," />
+    <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;name&quot;: &quot;$(DotnetDebToolConsumerProjectName)&quot;," />
+    <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;frameworks&quot;: { &quot;netcoreapp1.0&quot;: {} }," />
+    <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;tools&quot;: {&quot;$(DotnetDebToolPackageId)&quot;: &quot;$(DotnetDebToolVersion)&quot; }" />
+    <DotnetDebToolProjectJsonLines Include="}" />
+  </ItemGroup>
 </Project>
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="Microsoft.DotNet.Cli.Installer.DEB.props" />
+
+  <Target Name="GenerateDebs"
+          DependsOnTargets="Init;
+                            GenerateSdkDeb;
+                            TestSdkDeb;"
+      Condition=" '$(OSName)' == 'ubuntu' " />
+
  <Target Name="SetupGenerateDebInputsOutputs">
      <Exec Command="/usr/bin/env debuild -h" ContinueOnError="true">
          <Output TaskParameter="ExitCode" PropertyName="DebuildExitCode" />
@ -12,84 +19,107 @@
               Importance="High" />

      <PropertyGroup>
-          <DebuildPresent>false</DebuildPresent>
-          <DebuildPresent Condition=" '$(DebuildExitCode)' == '0' ">true</DebuildPresent>
+        <DebuildPresent>false</DebuildPresent>
+        <DebuildPresent Condition=" '$(DebuildExitCode)' == '0' ">true</DebuildPresent>

-          <DotnetDebToolVersion></DotnetDebToolVersion>
-          <DotnetDebToolPackageSource></DotnetDebToolPackageSource>
+        <DotnetDebToolDir></DotnetDebToolDir>
+        <DotnetDebToolVersion></DotnetDebToolVersion>
+        <DotnetDebToolPackageSource></DotnetDebToolPackageSource>

-          <DebianPackagingScript>$(RepoRoot)/scripts/package/package-debian.sh</DebianPackagingScript>
-          <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
+        <DebianPackagingScript>$(RepoRoot)/scripts/package/package-debian.sh</DebianPackagingScript>
+        <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>

-          <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
-          <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
+        <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
+        <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>

-          <SdkDebianPackageName>dotnet-dev-$(SdkVersion)</SdkDebianPackageName>
-          <SharedFrameworkDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkVersion)</SharedFrameworkDebianPackageName>
-          <SharedFrameworkDebianPackageName>$(SharedFrameworkDebianPackageName.ToLower())</SharedFrameworkDebianPackageName>
-          <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrVersion)</HostFxrDebianPackageName>
-          <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
-          <SharedHostDebianPackageName>dotnet-host</SharedHostDebianPackageName>
+        <SdkDebianPackageName>dotnet-dev-$(SdkVersion)</SdkDebianPackageName>
+        <SharedFrameworkDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkVersion)</SharedFrameworkDebianPackageName>
+        <SharedFrameworkDebianPackageName>$(SharedFrameworkDebianPackageName.ToLower())</SharedFrameworkDebianPackageName>
+        <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrVersion)</HostFxrDebianPackageName>
+        <HostFxrDebianPackageName>$(HostFxrDebianPackageName.ToLower())</HostFxrDebianPackageName>
+        <SharedHostDebianPackageName>dotnet-host</SharedHostDebianPackageName>

-          <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
+        <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>

-          <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
-          <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
-          <EndToEndTestDirectory>$(RepoRoot)/test/EndToEnd</EndToEndTestDirectory>
+        <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
+        <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
+        <EndToEndTestDirectory>$(RepoRoot)/test/EndToEnd</EndToEndTestDirectory>
      </PropertyGroup>

      <ItemGroup>
        <TestSdkDebTaskEnvironmentVariables Include="PATH=$(DebianInstalledDirectory)$(PathListSeparator)$(PATH)" />
-      </ItemGroup>

-      <!-- Consumed By Publish -->
-      <ItemGroup>
+        <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME">
+          <ReplacementString>$(SharedFrameworkDebianPackageName)</ReplacementString>
+        </SdkDebianPackageTemplateReplacement>
+        <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_NUGET_NAME">
+          <ReplacementString>$(SharedFrameworkName)</ReplacementString>
+        </SdkDebianPackageTemplateReplacement>
+        <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_NUGET_VERSION">
+          <ReplacementString>$(SharedFrameworkVersion)</ReplacementString>
+        </SdkDebianPackageTemplateReplacement>
+        <SdkDebianPackageTemplateReplacement Include="SHARED_FRAMEWORK_BRAND_NAME">
+          <ReplacementString>$(SharedFrameworkBrandName)</ReplacementString>
+        </SdkDebianPackageTemplateReplacement>
+        <SdkDebianPackageTemplateReplacement Include="SDK_NUGET_VERSION">
+          <ReplacementString>$(SdkVersion)</ReplacementString>
+        </SdkDebianPackageTemplateReplacement>
+        <SdkDebianPackageTemplateReplacement Include="CLI_SDK_BRAND_NAME">
+          <ReplacementString>$(SdkBrandName)</ReplacementString>
+        </SdkDebianPackageTemplateReplacement>
+
+        <!-- Consumed By Publish -->
        <GeneratedInstallers Include="$(SdkInstallerFile)" />
-      </ItemGroup>

-      <ItemGroup>
-          <SdkDebInputFiles Include="$(SdkLayoutOutputDirectory)/**/*" />
+        <SdkDebInputFiles Include="$(SdkLayoutOutputDirectory)/**/*" />
+        <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
      </ItemGroup>
  </Target>

  <Target Name="GenerateSdkDeb"
      Condition=" '$(OSName)' == 'ubuntu' and '$(DebuildPresent)'  == 'true' "
-      Inputs="@(SdkDebInputFiles);"
+      DependsOnTargets="SetupGenerateDebInputsOutputs;
+                        PrepareDotnetDebDirectories;
+                        PrepareDotnetDebTool;"
+      Inputs="@(SdkDebInputFiles)"
      Outputs="$(SdkInstallerFile)" >

-      <!-- Clean the workspace -->
-      <ItemGroup>
-        <SdkDebianFilesToClean Remove="*" />
-        <SdkDebianFilesToClean Include="$(SdkInstallerFile)" />
-
-        <SdkDebianDirectoriesToClean Remove="*" />
-        <SdkDebianDirectoriesToClean Include="$(SdkDebianIntermediateDirectory)" />
-        <SdkDebianDirectoriesToClean Include="$(SdkDebianLayoutOutputDirectory)" />
-      </ItemGroup>
-
-      <Delete Condition=" 'Exists(%(SdkDebianFilesToClean))' " Files="%(SdkDebianFilesToClean)" />
-      <RemoveDir Condition=" 'Exists(%(SdkDebianDirectoriesToClean))' " Directories="%(SdkDebianDirectoriesToClean)" />
-      <MakeDir Directories="@(SdkDebianDirectoriesToClean)" />
-
      <!-- Install Packages -->
      <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
      <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
      <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />

      <!-- Create layout -->
+      <Copy
+        DestinationFiles="@(SourceFile->'$(DebLayoutPackageRootDirName)/%(RecursiveDir)%(Filename)%(Extension)')"
+        OverwriteReadOnlyFiles="True"
+        SkipUnchangedFiles="False"
+        SourceFiles="@(SdkLayoutOutputDirectory)"
+        UseHardlinksIfPossible="False">
+      </Copy>

+      <Copy
+        DestinationFiles="@(SourceFile->'$(DebLayoutDocsDir)/%(RecursiveDir)%(Filename)-$(SdkVersion)%(Extension)')"
+        OverwriteReadOnlyFiles="True"
+        SkipUnchangedFiles="False"
+        SourceFiles="@(SdkDebManPageFiles)"
+        UseHardlinksIfPossible="False">
+      </Copy>
+      
+      <Copy
+        DestinationFiles="@(SourceFile->'$(DebLayoutDocsDir)/%(RecursiveDir)%(Filename)-$(SdkVersion)%(Extension)')"
+        OverwriteReadOnlyFiles="True"
+        SkipUnchangedFiles="False"
+        SourceFiles="@(SdkDebManPageFiles)"
+        UseHardlinksIfPossible="False">
+      </Copy>

-      <Exec Command="'$(DebianPackagingScript)'
-                     -v '$(SdkVersion)'
-                     -i '$(SdkLayoutOutputDirectory)'
-                     -o '$(SdkInstallerFile)'
-                     -p '$(SdkDebianPackageName)'
-                     -b '$(SdkBrandName)'
-                     -m '$(ManpagesDirectory)'
-                     --framework-debian-package-name '$(SharedFrameworkDebianPackageName)'
-                     --framework-nuget-name '$(SharedFrameworkName)'
-                     --framework-nuget-version '$(SharedFrameworkVersion)'
-                     --obj-root '$(SdkDebianIntermediateDirectory)'" />
+      <DotNetDebTool ToolPath="$(Stage2Directory)"
+                     InputDir="$(SdkLayoutDirectory)"
+                     OutputFile="$(SdkInstallerFile)"
+                     PackageName="$(SdkDebianPackageName)"
+                     PackageVersion="$(SdkVersion)"
+                     WorkingDirectory="$(DotnetDebToolDir)" />

      <!-- Remove Packages -->
      <Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />
@ -106,7 +136,7 @@
              $(SdkInstallerFile);"
      Outputs="$(DebianTestResultsXmlFile)" >

-      <!-- Install Packages -->
+      <!-- Install v(N-1) Packages -->
      <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
      <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
      <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
@ -125,27 +155,50 @@
      <Exec Command="sudo dpkg -r $(SharedHostDebianPackageName)" />
  </Target>

-  <Target Name="GenerateDebs"
-      DependsOnTargets="Init;
-                        Layout;
-                        SetupGenerateDebInputsOutputs;
-                        GenerateSdkDeb;
-                        TestSdkDeb;"
-      Condition=" '$(OSName)' == 'ubuntu' " />
+  <Target Name="PrepareDotnetDebDirectories">
+    <PropertyGroup>
+      <DebLayoutPackageRootDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutPackageRootDirName)</DebLayoutPackageRootDirName>
+      <DebLayoutAbsolutePlacementDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutAbsolutePlacementDirName)</DebLayoutAbsolutePlacementDir>
+      <DebLayoutSamplesDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutSamplesDirName)</DebLayoutSamplesDir>
+      <DebLayoutDocsDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutDocsDirName)</DebLayoutDocsDir>
+      <DebLayoutDebianFilesDir>$(SdkDebianLayoutOutputDirectory)/$(DebLayoutDebianFilesDirName)</DebLayoutDebianFilesDir>
+    </PropertyGroup>
+
+    <!-- Clean the workspace -->
+    <ItemGroup>
+      <SdkDebianFilesToClean Remove="*" />
+      <SdkDebianFilesToClean Include="$(SdkInstallerFile)" />
+
+      <SdkDebianDirectoriesToClean Remove="*" />
+      <SdkDebianDirectoriesToClean Include="$(SdkDebianIntermediateDirectory);
+                                            $(SdkDebianLayoutOutputDirectory)" />
+
+      <SdkDebianLayoutSubDirectories Remove="*" />
+      <SdkDebianLayoutSubDirectories Include="$(DebLayoutPackageRootDir);
+                                              $(DebLayoutAbsolutePlacementDir);
+                                              $(DebLayoutSamplesDir);
+                                              $(DebLayoutDocsDir);
+                                              $(DebLayoutDebianFilesDir)" />
+    </ItemGroup>
+
+    <Delete Condition=" 'Exists(%(SdkDebianFilesToClean))' " Files="@(SdkDebianFilesToClean)" />
+    <RemoveDir Condition=" 'Exists(%(SdkDebianDirectoriesToClean))' " Directories="@(SdkDebianDirectoriesToClean)" />
+    <MakeDir Directories="@(SdkDebianDirectoriesToClean)" />
+    <MakeDir Directories="@(SdkDebianLayoutSubDirectories)" />
+  </Target>

  <Target Name="PrepareDotnetDebTool"
          DependsOnTargets="WriteDotnetDebToolProjectJson;">

+    <DotNetRestore  FallbackSource="$(DotnetDebToolPackageSource)"
+                    ToolPath="$(Stage2Directory)"
+                    WorkingDirectory="$(DotnetDebToolDir)" />
  </Target>

-  <Target Name="WriteDotnetDebToolProjectJson" >
-    <ItemGroup>
-      <AssemblyInfoLines Include="{" />
-      <AssemblyInfoLines Include="%20%20%20%20&quot;version&quot;: &quot;1.0.0-*&quot;," />
-      <AssemblyInfoLines Include="%20%20%20%20&quot;name&quot;: &quot;$(DotnetDebToolConsumerProjectName)&quot;," />
-      <AssemblyInfoLines Include="%20%20%20%20&quot;frameworks&quot;: { &quot;netcoreapp1.0&quot;: {} }," />
-      <AssemblyInfoLines Include="%20%20%20%20&quot;tools&quot;: {{&quot;$(DotnetDebToolPackageId)&quot;: &quot;$(DotnetDebToolVersion)&quot; }}" />
-      <AssemblyInfoLines Include="}" />
-    </ItemGroup>
+  <Target Name="WriteDotnetDebToolProjectJson"
+          Inputs="$(MSBuildThisFile);$(MSBuildThisFileDirectory)/Microsoft.DotNet.Cli.Installer.DEB.props"
+          Outputs="$(DotnetDebToolDir)/project.json">
+
+    <WriteLinesToFile File="$(DotnetDebToolDir)/project.json" Lines="@(DotnetDebToolProjectJsonLines)" />
  </Target>
 </Project>
--- a/build_projects/dotnet-cli-build/DotNetDebTool.cs
+++ b/build_projects/dotnet-cli-build/DotNetDebTool.cs
@ -0,0 +1,50 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.DotNet.Cli.Build
+{
+    public class DotNetDebTool : DotNetTool
+    {
+        protected override string Command
+        {
+            get { return "deb-tool"; }
+        }
+
+        protected override string Args
+        {
+            get { return $"{GetInputDir()} {GetOutputFile()} {GetPackageName()} {GetPackageVersion()}"; }
+        }
+
+        [Required]
+        public string InputDir { get; set; }
+
+        [Required]
+        public string OutputFile { get; set; }
+
+        [Required]
+        public string PackageName { get; set; }
+
+        [Required]
+        public string PackageVersion { get; set; }
+
+        private string GetInputDir()
+        {
+            return $"-i {InputDir}";
+        }
+
+        private string GetOutputFile()
+        {
+            return $"-o {OutputFile}";
+        }
+
+        private string GetPackageName()
+        {
+            return $"-n {PackageName}";
+        }
+
+        private string GetPackageVersion()
+        {
+            return $"-v {PackageVersion}";
+        }
+    }
+}
--- a/build_projects/shared-build-targets-utils/Utils/DebPackageCreator.cs
+++ b/build_projects/shared-build-targets-utils/Utils/DebPackageCreator.cs
@ -11,22 +11,6 @@ using Microsoft.DotNet.Cli.Build.Framework;

 namespace Microsoft.DotNet.Cli.Build
 {
-    public class DebPackageCreator
-    {
-        private string _dotnet;
-        private string _intermediateDirectory;
-        private string _dotnetDebToolVersion;
-        private string _dotnetDebToolPackageSource;
-        private string _consumingProjectDirectory;
-
-        public DebPackageCreator(
-            string dotnet,
-            string intermediateDirectory,
-            string dotnetDebToolVersion,
-            string dotnetDebToolPackageSource = null)
-        {
-            InitializeDotnetDebTool();
-        }

        public void CreateDeb(
            string debianConfigJsonFile,
@ -57,15 +41,6 @@ namespace Microsoft.DotNet.Cli.Build
            CreateDebianPackage(debianLayoutDirectories, debIntermediatesDirectory, outputFile, packageName, packageVersion);
        }

-        private void CreateEmptyDebianLayout(DebianLayoutDirectories layoutDirectories)
-        {
-            Directory.CreateDirectory(layoutDirectories.AbsolutePlacement);
-            Directory.CreateDirectory(layoutDirectories.PackageRoot);
-            Directory.CreateDirectory(layoutDirectories.Samples);
-            Directory.CreateDirectory(layoutDirectories.Docs);
-            Directory.CreateDirectory(layoutDirectories.DebianFiles);
-        }
-
        private void CopyFilesToDebianLayout(
            DebianLayoutDirectories layoutDirectories,
            string packageVersion,
@ -128,81 +103,5 @@ namespace Microsoft.DotNet.Cli.Build

            File.WriteAllText(debianConfigFile, debianConfigFileContents);
        }
-
-        private void CreateDebianPackage(
-            DebianLayoutDirectories debianLayoutDirectories,
-            string intermediatesOutputDirectory,
-            string outputFile,
-            string packageName,
-            string packageVersion)
-        {
-            _dotnet.Exec("deb-tool",
-                "-i", debianLayoutDirectories.LayoutDirectory,
-                "-o", intermediatesOutputDirectory,
-                "-n", packageName,
-                "-v", packageVersion)
-                .WorkingDirectory(_consumingProjectDirectory)
-                .Execute()
-                .EnsureSuccessful();
-
-            var debianFile = Directory.EnumerateFiles(intermediatesOutputDirectory, "*.deb").First();
-            File.Copy(debianFile, outputFile, true);
-        }
-
-        private void InitializeDotnetDebTool()
-        {
-            CreateAndRestoreToolConsumingProject();
-        }
-
-        private void CreateAndRestoreToolConsumingProject()
-        {
-            if (Directory.Exists(_consumingProjectDirectory))
-            {
-                FS.Rmdir(_consumingProjectDirectory);
-            }
-            FS.Mkdirp(_consumingProjectDirectory);
-
-            var projectJsonFile = Path.Combine(_consumingProjectDirectory, "project.json");
-            File.WriteAllText(projectJsonFile, GetDotnetDebProjectJsonContents());
-
-            Command restore = _dotnetDebToolPackageSource == null 
-                ? _dotnet.Restore()
-                : _dotnet.Restore("-f", $"{_dotnetDebToolPackageSource}");
-
-            restore
-                .WorkingDirectory(Path.GetDirectoryName(projectJsonFile))
-                .Execute()
-                .EnsureSuccessful();
-        }
-
-        private string GetDotnetDebProjectJsonContents()
-        {
-            var projectJson = new StringBuilder();
-            projectJson.Append("{");
-            projectJson.Append($"  \"version\": \"1.0.0-*\",");
-            projectJson.Append($"  \"name\": \"{s_toolConsumerProjectName}\",");
-            projectJson.Append("  \"frameworks\": { \"netcoreapp1.0\": { } },");
-            projectJson.Append($"  \"tools\": {{ \"{s_dotnetDebToolPackageId}\": \"{_dotnetDebToolVersion}\" }},");
-            projectJson.Append("}");
-
-            return projectJson.ToString();
-        }
-
-        private class DebianLayoutDirectories
-        {
-            private string _layoutDirectory;
-
-            public DebianLayoutDirectories(string layoutDirectory)
-            {
-                _layoutDirectory = layoutDirectory;
-            }
-
-            public string LayoutDirectory => _layoutDirectory;
-            public string PackageRoot => Path.Combine(_layoutDirectory, "package_root");
-            public string AbsolutePlacement => Path.Combine(_layoutDirectory, "$");
-            public string Samples => Path.Combine(_layoutDirectory, "samples");
-            public string Docs => Path.Combine(_layoutDirectory, "docs");
-            public string DebianFiles => Path.Combine(_layoutDirectory, "debian");
-        }
    }
 }