From 7b09f3fcac1a876087aab468265a50fb12d6d5ad Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 9 Feb 2016 13:57:43 -0600
Subject: [PATCH] Move the debian package_tool into our \tools directory.

The package_tool isn't really part of our product, so moving it to the tools directory.
---
 scripts/package/package-debian.sh                              | 3 ++-
 .../debian/package_tool => tools/DebianPackageTool}/README.md  | 0
 .../DebianPackageTool}/example_config.json                     | 0
 .../DebianPackageTool}/package_files/debian/compat             | 0
 .../DebianPackageTool}/package_files/debian/rules              | 0
 .../DebianPackageTool}/package_files/debian/source/format      | 0
 .../package_tool => tools/DebianPackageTool}/package_tool      | 0
 .../DebianPackageTool}/scripts/config_template_generator.py    | 0
 .../DebianPackageTool}/scripts/debian_build_lib.sh             | 0
 .../DebianPackageTool}/scripts/extract_json_value.py           | 0
 .../DebianPackageTool}/scripts/manpage_generator.py            | 0
 .../DebianPackageTool}/setup/build_setup.sh                    | 0
 .../DebianPackageTool}/setup/test_setup.sh                     | 0
 .../DebianPackageTool}/templates/debian/changelog              | 0
 .../DebianPackageTool}/templates/debian/control                | 0
 .../DebianPackageTool}/templates/debian/copyright              | 0
 .../debian/package_tool => tools/DebianPackageTool}/test.sh    | 0
 .../test/integration_tests/test_package.bats                   | 0
 .../DebianPackageTool}/test/test_assets/lkgtestman.1           | 0
 .../test/test_assets/test_package_layout/debian_config.json    | 0
 .../test/test_assets/test_package_layout/docs.json             | 0
 .../test/test_assets/test_package_layout/docs/testdocs.1       | 0
 .../package_root/path_relative_to_package_root/test_exe.sh     | 0
 .../test_package_layout/package_root/test_called.sh            | 0
 .../test/test_assets/test_package_layout/samples/testsample.cs | 0
 .../DebianPackageTool}/test/test_assets/testdocs.json          | 0
 .../test/unit_tests/test_debian_build_lib.bats                 | 0
 .../DebianPackageTool}/test/unit_tests/test_scripts.bats       | 0
 28 files changed, 2 insertions(+), 1 deletion(-)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/README.md (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/example_config.json (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/package_files/debian/compat (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/package_files/debian/rules (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/package_files/debian/source/format (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/package_tool (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/scripts/config_template_generator.py (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/scripts/debian_build_lib.sh (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/scripts/extract_json_value.py (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/scripts/manpage_generator.py (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/setup/build_setup.sh (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/setup/test_setup.sh (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/templates/debian/changelog (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/templates/debian/control (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/templates/debian/copyright (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test.sh (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/integration_tests/test_package.bats (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/test_assets/lkgtestman.1 (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/test_assets/test_package_layout/debian_config.json (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/test_assets/test_package_layout/docs.json (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/test_assets/test_package_layout/docs/testdocs.1 (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/test_assets/test_package_layout/package_root/test_called.sh (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/test_assets/test_package_layout/samples/testsample.cs (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/test_assets/testdocs.json (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/unit_tests/test_debian_build_lib.bats (100%)
 rename {packaging/debian/package_tool => tools/DebianPackageTool}/test/unit_tests/test_scripts.bats (100%)

diff --git a/scripts/package/package-debian.sh b/scripts/package/package-debian.sh
index c8f8b2a6e..2ec08707e 100755
--- a/scripts/package/package-debian.sh
+++ b/scripts/package/package-debian.sh
@@ -24,6 +24,7 @@ if [ "$OSNAME" != "ubuntu" ]; then
 fi
 
 PACKAGING_ROOT="$REPOROOT/packaging/debian"
+PACKAGING_TOOL_DIR="$REPOROOT/tools/DebianPackageTool"
 
 OUTPUT_DIR="$REPOROOT/artifacts"
 PACKAGE_LAYOUT_DIR="$OUTPUT_DIR/deb_intermediate"
@@ -90,7 +91,7 @@ create_debian_package(){
 
     mkdir -p "$PACKAGE_OUTPUT_DIR"
     
-    "$PACKAGING_ROOT/package_tool/package_tool" -i "$PACKAGE_LAYOUT_DIR" -o "$PACKAGE_OUTPUT_DIR" -v $DOTNET_CLI_VERSION -n $DOTNET_DEB_PACKAGE_NAME
+    "$PACKAGING_TOOL_DIR/package_tool" -i "$PACKAGE_LAYOUT_DIR" -o "$PACKAGE_OUTPUT_DIR" -v $DOTNET_CLI_VERSION -n $DOTNET_DEB_PACKAGE_NAME
 }
 
 test_debian_package(){
diff --git a/packaging/debian/package_tool/README.md b/tools/DebianPackageTool/README.md
similarity index 100%
rename from packaging/debian/package_tool/README.md
rename to tools/DebianPackageTool/README.md
diff --git a/packaging/debian/package_tool/example_config.json b/tools/DebianPackageTool/example_config.json
similarity index 100%
rename from packaging/debian/package_tool/example_config.json
rename to tools/DebianPackageTool/example_config.json
diff --git a/packaging/debian/package_tool/package_files/debian/compat b/tools/DebianPackageTool/package_files/debian/compat
similarity index 100%
rename from packaging/debian/package_tool/package_files/debian/compat
rename to tools/DebianPackageTool/package_files/debian/compat
diff --git a/packaging/debian/package_tool/package_files/debian/rules b/tools/DebianPackageTool/package_files/debian/rules
similarity index 100%
rename from packaging/debian/package_tool/package_files/debian/rules
rename to tools/DebianPackageTool/package_files/debian/rules
diff --git a/packaging/debian/package_tool/package_files/debian/source/format b/tools/DebianPackageTool/package_files/debian/source/format
similarity index 100%
rename from packaging/debian/package_tool/package_files/debian/source/format
rename to tools/DebianPackageTool/package_files/debian/source/format
diff --git a/packaging/debian/package_tool/package_tool b/tools/DebianPackageTool/package_tool
similarity index 100%
rename from packaging/debian/package_tool/package_tool
rename to tools/DebianPackageTool/package_tool
diff --git a/packaging/debian/package_tool/scripts/config_template_generator.py b/tools/DebianPackageTool/scripts/config_template_generator.py
similarity index 100%
rename from packaging/debian/package_tool/scripts/config_template_generator.py
rename to tools/DebianPackageTool/scripts/config_template_generator.py
diff --git a/packaging/debian/package_tool/scripts/debian_build_lib.sh b/tools/DebianPackageTool/scripts/debian_build_lib.sh
similarity index 100%
rename from packaging/debian/package_tool/scripts/debian_build_lib.sh
rename to tools/DebianPackageTool/scripts/debian_build_lib.sh
diff --git a/packaging/debian/package_tool/scripts/extract_json_value.py b/tools/DebianPackageTool/scripts/extract_json_value.py
similarity index 100%
rename from packaging/debian/package_tool/scripts/extract_json_value.py
rename to tools/DebianPackageTool/scripts/extract_json_value.py
diff --git a/packaging/debian/package_tool/scripts/manpage_generator.py b/tools/DebianPackageTool/scripts/manpage_generator.py
similarity index 100%
rename from packaging/debian/package_tool/scripts/manpage_generator.py
rename to tools/DebianPackageTool/scripts/manpage_generator.py
diff --git a/packaging/debian/package_tool/setup/build_setup.sh b/tools/DebianPackageTool/setup/build_setup.sh
similarity index 100%
rename from packaging/debian/package_tool/setup/build_setup.sh
rename to tools/DebianPackageTool/setup/build_setup.sh
diff --git a/packaging/debian/package_tool/setup/test_setup.sh b/tools/DebianPackageTool/setup/test_setup.sh
similarity index 100%
rename from packaging/debian/package_tool/setup/test_setup.sh
rename to tools/DebianPackageTool/setup/test_setup.sh
diff --git a/packaging/debian/package_tool/templates/debian/changelog b/tools/DebianPackageTool/templates/debian/changelog
similarity index 100%
rename from packaging/debian/package_tool/templates/debian/changelog
rename to tools/DebianPackageTool/templates/debian/changelog
diff --git a/packaging/debian/package_tool/templates/debian/control b/tools/DebianPackageTool/templates/debian/control
similarity index 100%
rename from packaging/debian/package_tool/templates/debian/control
rename to tools/DebianPackageTool/templates/debian/control
diff --git a/packaging/debian/package_tool/templates/debian/copyright b/tools/DebianPackageTool/templates/debian/copyright
similarity index 100%
rename from packaging/debian/package_tool/templates/debian/copyright
rename to tools/DebianPackageTool/templates/debian/copyright
diff --git a/packaging/debian/package_tool/test.sh b/tools/DebianPackageTool/test.sh
similarity index 100%
rename from packaging/debian/package_tool/test.sh
rename to tools/DebianPackageTool/test.sh
diff --git a/packaging/debian/package_tool/test/integration_tests/test_package.bats b/tools/DebianPackageTool/test/integration_tests/test_package.bats
similarity index 100%
rename from packaging/debian/package_tool/test/integration_tests/test_package.bats
rename to tools/DebianPackageTool/test/integration_tests/test_package.bats
diff --git a/packaging/debian/package_tool/test/test_assets/lkgtestman.1 b/tools/DebianPackageTool/test/test_assets/lkgtestman.1
similarity index 100%
rename from packaging/debian/package_tool/test/test_assets/lkgtestman.1
rename to tools/DebianPackageTool/test/test_assets/lkgtestman.1
diff --git a/packaging/debian/package_tool/test/test_assets/test_package_layout/debian_config.json b/tools/DebianPackageTool/test/test_assets/test_package_layout/debian_config.json
similarity index 100%
rename from packaging/debian/package_tool/test/test_assets/test_package_layout/debian_config.json
rename to tools/DebianPackageTool/test/test_assets/test_package_layout/debian_config.json
diff --git a/packaging/debian/package_tool/test/test_assets/test_package_layout/docs.json b/tools/DebianPackageTool/test/test_assets/test_package_layout/docs.json
similarity index 100%
rename from packaging/debian/package_tool/test/test_assets/test_package_layout/docs.json
rename to tools/DebianPackageTool/test/test_assets/test_package_layout/docs.json
diff --git a/packaging/debian/package_tool/test/test_assets/test_package_layout/docs/testdocs.1 b/tools/DebianPackageTool/test/test_assets/test_package_layout/docs/testdocs.1
similarity index 100%
rename from packaging/debian/package_tool/test/test_assets/test_package_layout/docs/testdocs.1
rename to tools/DebianPackageTool/test/test_assets/test_package_layout/docs/testdocs.1
diff --git a/packaging/debian/package_tool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh b/tools/DebianPackageTool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh
similarity index 100%
rename from packaging/debian/package_tool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh
rename to tools/DebianPackageTool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh
diff --git a/packaging/debian/package_tool/test/test_assets/test_package_layout/package_root/test_called.sh b/tools/DebianPackageTool/test/test_assets/test_package_layout/package_root/test_called.sh
similarity index 100%
rename from packaging/debian/package_tool/test/test_assets/test_package_layout/package_root/test_called.sh
rename to tools/DebianPackageTool/test/test_assets/test_package_layout/package_root/test_called.sh
diff --git a/packaging/debian/package_tool/test/test_assets/test_package_layout/samples/testsample.cs b/tools/DebianPackageTool/test/test_assets/test_package_layout/samples/testsample.cs
similarity index 100%
rename from packaging/debian/package_tool/test/test_assets/test_package_layout/samples/testsample.cs
rename to tools/DebianPackageTool/test/test_assets/test_package_layout/samples/testsample.cs
diff --git a/packaging/debian/package_tool/test/test_assets/testdocs.json b/tools/DebianPackageTool/test/test_assets/testdocs.json
similarity index 100%
rename from packaging/debian/package_tool/test/test_assets/testdocs.json
rename to tools/DebianPackageTool/test/test_assets/testdocs.json
diff --git a/packaging/debian/package_tool/test/unit_tests/test_debian_build_lib.bats b/tools/DebianPackageTool/test/unit_tests/test_debian_build_lib.bats
similarity index 100%
rename from packaging/debian/package_tool/test/unit_tests/test_debian_build_lib.bats
rename to tools/DebianPackageTool/test/unit_tests/test_debian_build_lib.bats
diff --git a/packaging/debian/package_tool/test/unit_tests/test_scripts.bats b/tools/DebianPackageTool/test/unit_tests/test_scripts.bats
similarity index 100%
rename from packaging/debian/package_tool/test/unit_tests/test_scripts.bats
rename to tools/DebianPackageTool/test/unit_tests/test_scripts.bats