diff --git a/packaging/debian/dotnet-debian_config.json b/packaging/debian/dotnet-debian_config.json index 18d4ae212..117d4cd67 100644 --- a/packaging/debian/dotnet-debian_config.json +++ b/packaging/debian/dotnet-debian_config.json @@ -5,7 +5,7 @@ "package_name": "dotnet-dev-%SDK_NUGET_VERSION%", "install_root": "/usr/share/dotnet", - "short_description": ".NET Core CLI", + "short_description": "%CLI_SDK_BRAND_NAME%", "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", "homepage": "https://dotnet.github.io/core", diff --git a/packaging/debian/dotnet-nightly-debian_config.json b/packaging/debian/dotnet-nightly-debian_config.json deleted file mode 100644 index 0a4d6380a..000000000 --- a/packaging/debian/dotnet-nightly-debian_config.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "maintainer_name":"Microsoft", - "maintainer_email": "dotnetcore@microsoft.com", - - "package_name": "dotnet-nightly", - - "short_description": "Unstable Developer Build of .NET Core CLI", - "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", - "homepage": "https://dotnet.github.io/core", - - "release":{ - "package_version":"0.0.0.0", - "package_revision":"1", - "urgency" : "low", - "changelog_message" : "Bootstrap loop package" - }, - - "control": { - "priority":"standard", - "section":"devel", - "architecture":"any" - }, - - "copyright": "2015 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2015 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "debian_dependencies":{ - "clang-3.5" : {}, - "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {} - }, - - "package_conflicts" : [ - "dotnet" - ], - - "symlinks": { - "bin/dotnet-compile-native" : "/usr/bin/dotnet-compile-native" - } -} diff --git a/packaging/host/debian/dotnet-sharedhost-debian_config.json b/packaging/host/debian/dotnet-sharedhost-debian_config.json index 609ef44b3..e144623ab 100644 --- a/packaging/host/debian/dotnet-sharedhost-debian_config.json +++ b/packaging/host/debian/dotnet-sharedhost-debian_config.json @@ -5,7 +5,7 @@ "package_name": "dotnet-host", "install_root": "/usr/share/dotnet", - "short_description": ".NET Core Host", + "short_description": "%SHARED_HOST_BRAND_NAME%", "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", "homepage": "https://dotnet.github.io/core", diff --git a/packaging/sharedframework/debian/dotnet-sharedframework-debian_config.json b/packaging/sharedframework/debian/dotnet-sharedframework-debian_config.json index 9414aaf1c..570290cc5 100644 --- a/packaging/sharedframework/debian/dotnet-sharedframework-debian_config.json +++ b/packaging/sharedframework/debian/dotnet-sharedframework-debian_config.json @@ -5,7 +5,7 @@ "package_name": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%", "install_root": "/usr/share/dotnet", - "short_description": ".NET Core %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%", + "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%", "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", "homepage": "https://dotnet.github.io/core", diff --git a/scripts/dotnet-cli-build/DebTargets.cs b/scripts/dotnet-cli-build/DebTargets.cs index 685e0d4f0..37ff9211e 100644 --- a/scripts/dotnet-cli-build/DebTargets.cs +++ b/scripts/dotnet-cli-build/DebTargets.cs @@ -47,7 +47,8 @@ namespace Microsoft.DotNet.Cli.Build "-v", version, "-i", sdkPublishRoot, "-o", debFile, - "-p", packageName, + "-p", packageName, + "-b", Monikers.CLISdkBrandName, "-m", manPagesDir, "--framework-debian-package-name", sharedFxDebianPackageName, "--framework-nuget-name", Monikers.SharedFrameworkName, @@ -78,7 +79,8 @@ namespace Microsoft.DotNet.Cli.Build Directory.CreateDirectory(objRoot); Cmd(Path.Combine(Dirs.RepoRoot, "scripts", "package", "package-sharedhost-debian.sh"), - "--input", inputRoot, "--output", debFile, "--obj-root", objRoot, "--version", version, "-m", manPagesDir) + "--input", inputRoot, "--output", debFile, "-b", Monikers.SharedFxBrandName, + "--obj-root", objRoot, "--version", version, "-m", manPagesDir) .Execute() .EnsureSuccessful(); return c.Success(); @@ -102,7 +104,7 @@ namespace Microsoft.DotNet.Cli.Build Directory.CreateDirectory(objRoot); Cmd(Path.Combine(Dirs.RepoRoot, "scripts", "package", "package-sharedframework-debian.sh"), - "--input", inputRoot, "--output", debFile, "--package-name", packageName, + "--input", inputRoot, "--output", debFile, "--package-name", packageName, "-b", Monikers.SharedFxBrandName, "--framework-nuget-name", Monikers.SharedFrameworkName, "--framework-nuget-version", c.BuildContext.Get("SharedFrameworkNugetVersion"), "--obj-root", objRoot, "--version", version) diff --git a/scripts/package/package-debian.sh b/scripts/package/package-debian.sh index 361c0c524..190cae05c 100755 --- a/scripts/package/package-debian.sh +++ b/scripts/package/package-debian.sh @@ -28,9 +28,10 @@ help(){ echo " --manpages Directory containing man pages for the package (Optional)." echo " --output The full path to which the package will be written." echo " --package-name Package to identify during installation. Example - 'dotnet-nightly', 'dotnet'" + echo " --brand-name Brand name of the package, used for 'short_description' of the deb file. Example - '.NET CLI SDK'" echo " --framework-nuget-name The name of the nuget package that produced this shared framework." echo " --framework-nuget-version The versionf of the nuget package that produced this shared framework." - echo " --previous-version-url Url to the previous version of the debian packge against which to run the upgrade tests." + echo " --previous-version-url Url to the previous version of the debian packge against which to run the upgrade tests." echo " --obj-root Root folder for intermediate objects." exit 1 } @@ -56,6 +57,10 @@ parseargs(){ DOTNET_DEB_PACKAGE_NAME=$2 shift ;; + -b|--brand-name) + DOTNET_CLI_BRAND_NAME=$2 + shift + ;; -v|--version) DOTNET_CLI_VERSION=$2 shift @@ -196,6 +201,7 @@ update_debian_json() sed -i "s/%SHARED_FRAMEWORK_NUGET_NAME%/$SHARED_FRAMEWORK_NUGET_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json sed -i "s/%SHARED_FRAMEWORK_NUGET_VERSION%/$SHARED_FRAMEWORK_NUGET_VERSION/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json sed -i "s/%SDK_NUGET_VERSION%/$DOTNET_CLI_VERSION/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json + sed -i "s/%CLI_SDK_BRAND_NAME%/$DOTNET_CLI_BRAND_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json } test_debian_package(){ diff --git a/scripts/package/package-sharedframework-debian.sh b/scripts/package/package-sharedframework-debian.sh index bb2d07a4a..aad8101c2 100755 --- a/scripts/package/package-sharedframework-debian.sh +++ b/scripts/package/package-sharedframework-debian.sh @@ -26,6 +26,7 @@ help(){ echo " --input Package the entire contents of the directory tree." echo " --output The full path to which the package will be written." echo " --package-name Package to identify during installation. Example - 'dotnet-sharedframework'" + echo " --brand-name Brand name of the package, used for 'short_description' of the deb file. Example - '.NET Core'" echo " --framework-nuget-name The name of the nuget package that produced this shared framework." echo " --framework-nuget-version The versionf of the nuget package that produced this shared framework." echo " --obj-root Root folder for intermediate objects." @@ -48,6 +49,10 @@ while [[ $# > 0 ]]; do SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME=$2 shift ;; + -b|--brand-name) + SHARED_FRAMEWORK_BRAND_NAME=$2 + shift + ;; --framework-nuget-name) SHARED_FRAMEWORK_NUGET_NAME=$2 shift @@ -124,6 +129,7 @@ update_debian_json() sed -i "s/%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%/$SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json sed -i "s/%SHARED_FRAMEWORK_NUGET_NAME%/$SHARED_FRAMEWORK_NUGET_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json sed -i "s/%SHARED_FRAMEWORK_NUGET_VERSION%/$SHARED_FRAMEWORK_NUGET_VERSION/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json + sed -i "s/%SHARED_FRAMEWORK_BRAND_NAME%/$SHARED_FRAMEWORK_BRAND_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json } test_debian_package(){ diff --git a/scripts/package/package-sharedhost-debian.sh b/scripts/package/package-sharedhost-debian.sh index 92f543468..64e6f1347 100755 --- a/scripts/package/package-sharedhost-debian.sh +++ b/scripts/package/package-sharedhost-debian.sh @@ -26,6 +26,7 @@ help(){ echo " --input Package the entire contents of the directory tree." echo " --output The full path to which the package will be written." echo " --package-name Package to identify during installation. Example - 'dotnet-sharedhost'" + echo " --brand-name Brand name of the package, used for 'short_description' of the deb file. Example - '.NET Core Host'" echo " --obj-root Root folder for intermediate objects." echo " --version Version for the debain package." exit 1 @@ -46,6 +47,10 @@ while [[ $# > 0 ]]; do SHARED_HOST_DEBIAN_PACKAGE_NAME=$2 shift ;; + -b|--brand-name) + SHARED_HOST_BRAND_NAME=$2 + shift + ;; --obj-root) OBJECT_DIR=$2 shift @@ -78,6 +83,7 @@ TEST_STAGE_DIR="$OBJECT_DIR/debian_tests" execute_build(){ create_empty_debian_layout copy_files_to_debian_layout + update_debian_json create_debian_package } @@ -114,6 +120,12 @@ create_debian_package(){ "$PACKAGING_TOOL_DIR/package_tool" -i "$PACKAGE_LAYOUT_DIR" -o "$PACKAGE_OUTPUT_DIR" -n "$SHARED_HOST_DEBIAN_PACKAGE_NAME" -v "$SHARED_HOST_DEBIAN_VERSION" } +update_debian_json() +{ + header "Updating debian.json file" + sed -i "s/%SHARED_HOST_BRAND_NAME%/$SHARED_HOST_BRAND_NAME/g" "$PACKAGE_LAYOUT_DIR"/debian_config.json +} + test_debian_package(){ header "Testing debian Shared Host package"