diff --git a/package_tool/test/test_assets/test_package_layout/$/usr/bin/test_exe2.sh b/package_tool/test/test_assets/test_package_layout/$/usr/bin/test_exe2.sh deleted file mode 100644 index 1e492dcaf..000000000 --- a/package_tool/test/test_assets/test_package_layout/$/usr/bin/test_exe2.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# -# 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. -# - -# Example of something you shouldn't do, but is good for a testing scenario -exec bash /usr/share/packagetooltest/test_called.sh \ No newline at end of file diff --git a/packaging/debian/debian_config.json b/packaging/debian/debian_config.json new file mode 100644 index 000000000..935a8d65a --- /dev/null +++ b/packaging/debian/debian_config.json @@ -0,0 +1,46 @@ +{ + "maintainer_name":"Microsoft", + "maintainer_email": "dotnetcore@microsoft.com", + + "package_name": "dotnet", + + "short_description": "NOT FINAL debian package for dotnet cli", + "long_description": "NOT FINAL This package restores, compiles, and publishes.", + "homepage": "https://dotnet.github.io/core", + + "release":{ + "package_version":"0.201", + "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":{ + "libssl-dev" : {} + }, + + "symlinks": { + "bin/dotnet" : "usr/bin/dotnet", + "bin/dotnet-compile" : "usr/bin/dotnet-compile", + "bin/dotnet-compile-csc" : "usr/bin/dotnet-compile-csc", + "bin/dotnet-publish" : "usr/bin/dotnet-publish", + "bin/dotnet-repl" : "usr/bin/dotnet-repl", + "bin/dotnet-repl-csi" : "usr/bin/dotnet-repl-csi", + "bin/dotnet-restore" : "usr/bin/dotnet-restore", + "bin/dotnet-compile-native" : "/usr/bin/dotnet-compile-native", + "bin/resgen" : "usr/bin/resgen", + "bin/dotnet-init":"usr/bin/dotnet-init" + } +} diff --git a/package_tool/README.md b/packaging/debian/package_tool/README.md similarity index 100% rename from package_tool/README.md rename to packaging/debian/package_tool/README.md diff --git a/package_tool/example_config.json b/packaging/debian/package_tool/example_config.json similarity index 100% rename from package_tool/example_config.json rename to packaging/debian/package_tool/example_config.json diff --git a/package_tool/package_files/debian/compat b/packaging/debian/package_tool/package_files/debian/compat similarity index 100% rename from package_tool/package_files/debian/compat rename to packaging/debian/package_tool/package_files/debian/compat diff --git a/package_tool/package_files/debian/rules b/packaging/debian/package_tool/package_files/debian/rules similarity index 100% rename from package_tool/package_files/debian/rules rename to packaging/debian/package_tool/package_files/debian/rules diff --git a/package_tool/package_files/debian/source/format b/packaging/debian/package_tool/package_files/debian/source/format similarity index 100% rename from package_tool/package_files/debian/source/format rename to packaging/debian/package_tool/package_files/debian/source/format diff --git a/package_tool/package_tool b/packaging/debian/package_tool/package_tool old mode 100755 new mode 100644 similarity index 100% rename from package_tool/package_tool rename to packaging/debian/package_tool/package_tool diff --git a/package_tool/scripts/config_template_generator.py b/packaging/debian/package_tool/scripts/config_template_generator.py similarity index 100% rename from package_tool/scripts/config_template_generator.py rename to packaging/debian/package_tool/scripts/config_template_generator.py diff --git a/package_tool/scripts/debian_build_lib.sh b/packaging/debian/package_tool/scripts/debian_build_lib.sh similarity index 100% rename from package_tool/scripts/debian_build_lib.sh rename to packaging/debian/package_tool/scripts/debian_build_lib.sh diff --git a/package_tool/scripts/extract_json_value.py b/packaging/debian/package_tool/scripts/extract_json_value.py similarity index 100% rename from package_tool/scripts/extract_json_value.py rename to packaging/debian/package_tool/scripts/extract_json_value.py diff --git a/package_tool/scripts/manpage_generator.py b/packaging/debian/package_tool/scripts/manpage_generator.py similarity index 100% rename from package_tool/scripts/manpage_generator.py rename to packaging/debian/package_tool/scripts/manpage_generator.py diff --git a/package_tool/setup/build_setup.sh b/packaging/debian/package_tool/setup/build_setup.sh old mode 100755 new mode 100644 similarity index 100% rename from package_tool/setup/build_setup.sh rename to packaging/debian/package_tool/setup/build_setup.sh diff --git a/package_tool/setup/test_setup.sh b/packaging/debian/package_tool/setup/test_setup.sh old mode 100755 new mode 100644 similarity index 100% rename from package_tool/setup/test_setup.sh rename to packaging/debian/package_tool/setup/test_setup.sh diff --git a/package_tool/templates/debian/changelog b/packaging/debian/package_tool/templates/debian/changelog similarity index 100% rename from package_tool/templates/debian/changelog rename to packaging/debian/package_tool/templates/debian/changelog diff --git a/package_tool/templates/debian/control b/packaging/debian/package_tool/templates/debian/control similarity index 100% rename from package_tool/templates/debian/control rename to packaging/debian/package_tool/templates/debian/control diff --git a/package_tool/templates/debian/copyright b/packaging/debian/package_tool/templates/debian/copyright similarity index 100% rename from package_tool/templates/debian/copyright rename to packaging/debian/package_tool/templates/debian/copyright diff --git a/package_tool/test.sh b/packaging/debian/package_tool/test.sh old mode 100755 new mode 100644 similarity index 100% rename from package_tool/test.sh rename to packaging/debian/package_tool/test.sh diff --git a/package_tool/test/integration_tests/test_package.bats b/packaging/debian/package_tool/test/integration_tests/test_package.bats similarity index 100% rename from package_tool/test/integration_tests/test_package.bats rename to packaging/debian/package_tool/test/integration_tests/test_package.bats diff --git a/package_tool/test/test_assets/lkgtestman.1 b/packaging/debian/package_tool/test/test_assets/lkgtestman.1 similarity index 100% rename from package_tool/test/test_assets/lkgtestman.1 rename to packaging/debian/package_tool/test/test_assets/lkgtestman.1 diff --git a/package_tool/test/test_assets/test_package_layout/debian_config.json b/packaging/debian/package_tool/test/test_assets/test_package_layout/debian_config.json similarity index 100% rename from package_tool/test/test_assets/test_package_layout/debian_config.json rename to packaging/debian/package_tool/test/test_assets/test_package_layout/debian_config.json diff --git a/package_tool/test/test_assets/test_package_layout/docs.json b/packaging/debian/package_tool/test/test_assets/test_package_layout/docs.json similarity index 100% rename from package_tool/test/test_assets/test_package_layout/docs.json rename to packaging/debian/package_tool/test/test_assets/test_package_layout/docs.json diff --git a/package_tool/test/test_assets/test_package_layout/docs/testdocs.1 b/packaging/debian/package_tool/test/test_assets/test_package_layout/docs/testdocs.1 similarity index 100% rename from package_tool/test/test_assets/test_package_layout/docs/testdocs.1 rename to packaging/debian/package_tool/test/test_assets/test_package_layout/docs/testdocs.1 diff --git a/package_tool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh b/packaging/debian/package_tool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh similarity index 100% rename from package_tool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh rename to packaging/debian/package_tool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh diff --git a/package_tool/test/test_assets/test_package_layout/package_root/test_called.sh b/packaging/debian/package_tool/test/test_assets/test_package_layout/package_root/test_called.sh similarity index 100% rename from package_tool/test/test_assets/test_package_layout/package_root/test_called.sh rename to packaging/debian/package_tool/test/test_assets/test_package_layout/package_root/test_called.sh diff --git a/package_tool/test/test_assets/test_package_layout/samples/testsample.cs b/packaging/debian/package_tool/test/test_assets/test_package_layout/samples/testsample.cs similarity index 100% rename from package_tool/test/test_assets/test_package_layout/samples/testsample.cs rename to packaging/debian/package_tool/test/test_assets/test_package_layout/samples/testsample.cs diff --git a/package_tool/test/test_assets/testdocs.json b/packaging/debian/package_tool/test/test_assets/testdocs.json similarity index 100% rename from package_tool/test/test_assets/testdocs.json rename to packaging/debian/package_tool/test/test_assets/testdocs.json diff --git a/package_tool/test/unit_tests/test_debian_build_lib.bats b/packaging/debian/package_tool/test/unit_tests/test_debian_build_lib.bats similarity index 100% rename from package_tool/test/unit_tests/test_debian_build_lib.bats rename to packaging/debian/package_tool/test/unit_tests/test_debian_build_lib.bats diff --git a/package_tool/test/unit_tests/test_scripts.bats b/packaging/debian/package_tool/test/unit_tests/test_scripts.bats similarity index 100% rename from package_tool/test/unit_tests/test_scripts.bats rename to packaging/debian/package_tool/test/unit_tests/test_scripts.bats diff --git a/scripts/package/package-debian.sh b/scripts/package/package-debian.sh index c2eea92d7..2995b1ee3 100755 --- a/scripts/package/package-debian.sh +++ b/scripts/package/package-debian.sh @@ -22,6 +22,7 @@ if [ "$UNAME" != "Linux" ]; then fi REPO_ROOT=$(readlink -f $DIR/../..) +PACKAGING_ROOT=$REPO_ROOT/packaging/debian OUTPUT_DIR="$REPO_ROOT/artifacts" PACKAGE_LAYOUT_DIR="$OUTPUT_DIR/deb_intermediate" @@ -54,7 +55,7 @@ copy_files_to_debian_layout(){ cp -a "$REPO_BINARIES_DIR/." "$PACKAGE_LAYOUT_DIR/package_root" # Copy config file - cp "$REPO_ROOT/debian_config.json" "$PACKAGE_LAYOUT_DIR" + cp "$PACKAGING_ROOT/debian_config.json" "$PACKAGE_LAYOUT_DIR" } create_debian_package(){ @@ -62,7 +63,7 @@ create_debian_package(){ mkdir -p $PACKAGE_OUTPUT_DIR - $REPO_ROOT/package_tool/package_tool $PACKAGE_LAYOUT_DIR $PACKAGE_OUTPUT_DIR $DOTNET_BUILD_VERSION + $PACKAGING_ROOT/package_tool/package_tool $PACKAGE_LAYOUT_DIR $PACKAGE_OUTPUT_DIR $DOTNET_BUILD_VERSION } test_debian_package(){