From e80307a33588f1e2ea94a99566413a320568435c Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Sun, 1 Jul 2018 17:42:44 -0400 Subject: [PATCH] Moving packaging related files to dev-tools/packaging --- dev-tools/mage/dmgbuilder.go | 10 ++++---- dev-tools/mage/pkgspecs.go | 2 +- .../files/linux/systemd-daemon-reload.sh | 0 dev-tools/{ => packaging}/package_test.go | 2 +- .../{mage/files => packaging}/packages.yml | 24 +++++++++--------- .../preference-pane/.gitignore | 0 .../project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDETemplateMacros.plist | 0 .../xcschemes/xcschememanagement.plist | 0 .../beats-preference-pane/Authorization.h | 0 .../Base.lproj/BeatView.xib | 0 .../Base.lproj/BeatsPrefPane.xib | 0 .../Base.lproj/EditorWindow.xib | 0 .../beats-preference-pane/Base.lproj/pane.xib | 0 .../beats-preference-pane/BeatManager.m | 0 .../BeatViewController.h | 0 .../BeatViewController.m | 0 .../beats-preference-pane/Beats.icns | Bin .../beats-preference-pane/BeatsPrefPane.h | 0 .../beats-preference-pane/BeatsPrefPane.m | 0 .../beats-preference-pane/EditorWindow.h | 0 .../beats-preference-pane/EditorWindow.m | 0 .../beats-preference-pane/Info.plist | 0 .../beats-preference-pane/TabViewDelegate.h | 0 .../beats-preference-pane/TabViewDelegate.m | 0 .../beats-preference-pane/beats/Beats.h | 0 .../beats/BeatsService.h | 0 .../beats/BeatsService.m | 0 .../beats-preference-pane/common/common.h | 0 .../beats-preference-pane/common/common.m | 0 .../beats-preference-pane/config.h | 0 .../en.lproj/beats_preference_pane.strings | 0 .../preference-pane/helper/main.m | 0 .../preference-pane/helper/setboot.m | 0 .../preference-pane/magefile.go | 0 .../templates/common/README.md.tmpl | 0 .../templates/common/magefile.go.tmpl | 0 .../templates/darwin/README.html.tmpl | 0 .../templates/darwin/component.plist.tmpl | 0 .../templates/darwin/distribution.plist.tmpl | 0 .../Uninstall.app/Contents/Info.plist.tmpl | 0 .../Contents/MacOS/uninstall.sh.tmpl | 0 .../Contents/Resources/uninstaller.icns | Bin .../templates/darwin/icons/auditbeat.icns | Bin .../templates/darwin/icons/filebeat.icns | Bin .../templates/darwin/icons/heartbeat.icns | Bin .../templates/darwin/icons/metricbeat.icns | Bin .../templates/darwin/icons/packetbeat.icns | Bin .../templates/darwin/icons/winlogbeat.icns | Bin .../darwin/launchd-daemon.plist.tmpl | 0 .../templates/darwin/requirements.plist.tmpl | 0 .../templates/darwin/scripts/postinstall.tmpl | 0 .../templates/darwin/scripts/preinstall.tmpl | 0 .../templates/deb/init.sh.tmpl | 0 .../templates/linux/beatname.sh.tmpl | 0 .../templates/linux/systemd.unit.tmpl | 0 .../templates/rpm/init.sh.tmpl | 0 .../windows/install-service.ps1.tmpl | 0 .../windows/uninstall-service.ps1.tmpl | 0 60 files changed, 19 insertions(+), 19 deletions(-) rename dev-tools/{mage => packaging}/files/linux/systemd-daemon-reload.sh (100%) rename dev-tools/{ => packaging}/package_test.go (98%) rename dev-tools/{mage/files => packaging}/packages.yml (86%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/.gitignore (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane.xcodeproj/project.pbxproj (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane.xcodeproj/xcshareddata/IDETemplateMacros.plist (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane.xcodeproj/xcuserdata/adrian.xcuserdatad/xcschemes/xcschememanagement.plist (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/Authorization.h (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/Base.lproj/BeatView.xib (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/Base.lproj/BeatsPrefPane.xib (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/Base.lproj/EditorWindow.xib (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/Base.lproj/pane.xib (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/BeatManager.m (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/BeatViewController.h (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/BeatViewController.m (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/Beats.icns (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/BeatsPrefPane.h (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/BeatsPrefPane.m (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/EditorWindow.h (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/EditorWindow.m (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/Info.plist (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/TabViewDelegate.h (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/TabViewDelegate.m (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/beats/Beats.h (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/beats/BeatsService.h (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/beats/BeatsService.m (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/common/common.h (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/common/common.m (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/config.h (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/beats-preference-pane/en.lproj/beats_preference_pane.strings (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/helper/main.m (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/helper/setboot.m (100%) rename dev-tools/{packer/platforms/darwin => packaging}/preference-pane/magefile.go (100%) rename dev-tools/{mage => packaging}/templates/common/README.md.tmpl (100%) rename dev-tools/{mage => packaging}/templates/common/magefile.go.tmpl (100%) rename dev-tools/{mage => packaging}/templates/darwin/README.html.tmpl (100%) rename dev-tools/{mage => packaging}/templates/darwin/component.plist.tmpl (100%) rename dev-tools/{mage => packaging}/templates/darwin/distribution.plist.tmpl (100%) rename dev-tools/{mage => packaging}/templates/darwin/dmg/Uninstall.app/Contents/Info.plist.tmpl (100%) rename dev-tools/{mage => packaging}/templates/darwin/dmg/Uninstall.app/Contents/MacOS/uninstall.sh.tmpl (100%) rename dev-tools/{mage => packaging}/templates/darwin/dmg/Uninstall.app/Contents/Resources/uninstaller.icns (100%) rename dev-tools/{mage => packaging}/templates/darwin/icons/auditbeat.icns (100%) rename dev-tools/{mage => packaging}/templates/darwin/icons/filebeat.icns (100%) rename dev-tools/{mage => packaging}/templates/darwin/icons/heartbeat.icns (100%) rename dev-tools/{mage => packaging}/templates/darwin/icons/metricbeat.icns (100%) rename dev-tools/{mage => packaging}/templates/darwin/icons/packetbeat.icns (100%) rename dev-tools/{mage => packaging}/templates/darwin/icons/winlogbeat.icns (100%) rename dev-tools/{mage => packaging}/templates/darwin/launchd-daemon.plist.tmpl (100%) rename dev-tools/{mage => packaging}/templates/darwin/requirements.plist.tmpl (100%) rename dev-tools/{mage => packaging}/templates/darwin/scripts/postinstall.tmpl (100%) rename dev-tools/{mage => packaging}/templates/darwin/scripts/preinstall.tmpl (100%) rename dev-tools/{mage => packaging}/templates/deb/init.sh.tmpl (100%) rename dev-tools/{mage => packaging}/templates/linux/beatname.sh.tmpl (100%) rename dev-tools/{mage => packaging}/templates/linux/systemd.unit.tmpl (100%) rename dev-tools/{mage => packaging}/templates/rpm/init.sh.tmpl (100%) rename dev-tools/{mage => packaging}/templates/windows/install-service.ps1.tmpl (100%) rename dev-tools/{mage => packaging}/templates/windows/uninstall-service.ps1.tmpl (100%) diff --git a/dev-tools/mage/dmgbuilder.go b/dev-tools/mage/dmgbuilder.go index f5ce45ecffa..8c7df259b23 100644 --- a/dev-tools/mage/dmgbuilder.go +++ b/dev-tools/mage/dmgbuilder.go @@ -61,7 +61,7 @@ func newDMGBuilder(spec PackageSpec) (*dmgBuilder, error) { return nil, err } - preferencePaneDir := filepath.Join(beatsDir, "dev-tools/packer/platforms/darwin/preference-pane") + preferencePaneDir := filepath.Join(beatsDir, "dev-tools/packaging/preference-pane") preferencePanePkgFile := filepath.Join(preferencePaneDir, "build/BeatsPrefPane.pkg") beatIdentifier, ok := spec.evalContext["identifier"].(string) if !ok { @@ -152,10 +152,10 @@ func (b *dmgBuilder) buildProductPkg() error { ) b.MustExpandFile( - filepath.Join(b.beatsDir, "dev-tools/mage/templates/darwin/distribution.plist.tmpl"), + filepath.Join(b.beatsDir, "dev-tools/packaging/templates/darwin/distribution.plist.tmpl"), distributionPlist) b.MustExpandFile( - filepath.Join(b.beatsDir, "dev-tools/mage/templates/darwin/README.html.tmpl"), + filepath.Join(b.beatsDir, "dev-tools/packaging/templates/darwin/README.html.tmpl"), filepath.Join(resourcesDir, "README.html")) for t, pf := range b.Files { if strings.HasSuffix(t, "LICENSE.txt") { @@ -164,7 +164,7 @@ func (b *dmgBuilder) buildProductPkg() error { } } b.MustExpandFile( - filepath.Join(b.beatsDir, "dev-tools/mage/templates/darwin/README.html.tmpl"), + filepath.Join(b.beatsDir, "dev-tools/packaging/templates/darwin/README.html.tmpl"), filepath.Join(resourcesDir, "README.html")) if err := os.RemoveAll(b.dmgDir); err != nil { @@ -204,7 +204,7 @@ func (b *dmgBuilder) buildUninstallApp() error { infoPlist = "Uninstall.app/Contents/Info.plist" ) - inputDir := filepath.Join(b.beatsDir, "dev-tools/mage/templates/darwin/dmg") + inputDir := filepath.Join(b.beatsDir, "dev-tools/packaging/templates/darwin/dmg") Copy( filepath.Join(inputDir, uninstallerIcons), diff --git a/dev-tools/mage/pkgspecs.go b/dev-tools/mage/pkgspecs.go index ee6c38a025a..11dda2e49f7 100644 --- a/dev-tools/mage/pkgspecs.go +++ b/dev-tools/mage/pkgspecs.go @@ -26,7 +26,7 @@ import ( "gopkg.in/yaml.v2" ) -const packageSpecFile = "dev-tools/mage/files/packages.yml" +const packageSpecFile = "dev-tools/packaging/packages.yml" // Packages defines the set of packages to be built when the package target is // executed. diff --git a/dev-tools/mage/files/linux/systemd-daemon-reload.sh b/dev-tools/packaging/files/linux/systemd-daemon-reload.sh similarity index 100% rename from dev-tools/mage/files/linux/systemd-daemon-reload.sh rename to dev-tools/packaging/files/linux/systemd-daemon-reload.sh diff --git a/dev-tools/package_test.go b/dev-tools/packaging/package_test.go similarity index 98% rename from dev-tools/package_test.go rename to dev-tools/packaging/package_test.go index 2021a42a4a2..1227acd6a3a 100644 --- a/dev-tools/package_test.go +++ b/dev-tools/packaging/package_test.go @@ -54,7 +54,7 @@ var ( ) var ( - files = flag.String("files", "../build/upload/*/*", "filepath glob containing package files") + files = flag.String("files", "../build/distributions/*/*", "filepath glob containing package files") ) func TestRPM(t *testing.T) { diff --git a/dev-tools/mage/files/packages.yml b/dev-tools/packaging/packages.yml similarity index 86% rename from dev-tools/mage/files/packages.yml rename to dev-tools/packaging/packages.yml index b5e75a5ce6f..aba1e720bbb 100644 --- a/dev-tools/mage/files/packages.yml +++ b/dev-tools/packaging/packages.yml @@ -19,7 +19,7 @@ shared: # Deb/RPM spec for community beats. - &deb_rpm_spec <<: *common - post_install_script: '{{ elastic_beats_dir }}/dev-tools/mage/files/linux/systemd-daemon-reload.sh' + post_install_script: '{{ elastic_beats_dir }}/dev-tools/packaging/files/linux/systemd-daemon-reload.sh' files: /usr/share/{{.BeatName}}/bin/{{.BeatName}}{{.BinaryExt}}: source: build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}} @@ -34,7 +34,7 @@ shared: source: '{{ repo.RootDir }}/NOTICE.txt' mode: 0644 /usr/share/{{.BeatName}}/README.md: - template: '{{ elastic_beats_dir }}/dev-tools/mage/templates/common/README.md.tmpl' + template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/common/README.md.tmpl' mode: 0644 /usr/share/{{.BeatName}}/.build_hash.txt: content: > @@ -54,13 +54,13 @@ shared: source: build/golang-crossbuild/god-{{.GOOS}}-{{.Platform.Arch}} mode: 0755 /usr/bin/{{.BeatName}}: - template: '{{ elastic_beats_dir }}/dev-tools/mage/templates/linux/beatname.sh.tmpl' + template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/linux/beatname.sh.tmpl' mode: 0755 /lib/systemd/system/{{.BeatServiceName}}.service: - template: '{{ elastic_beats_dir }}/dev-tools/mage/templates/linux/systemd.unit.tmpl' + template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/linux/systemd.unit.tmpl' mode: 0755 /etc/init.d/{{.BeatServiceName}}: - template: '{{ elastic_beats_dir }}/dev-tools/mage/templates/{{.PackageType}}/init.sh.tmpl' + template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/{{.PackageType}}/init.sh.tmpl' mode: 0755 # MacOS pkg spec for community beats. @@ -72,8 +72,8 @@ shared: min_supported_osx_version: 10.8 identifier: 'co.{{.BeatVendor | tolower}}.beats.{{.BeatName}}' install_path: /Library/Application Support - pre_install_script: '{{ elastic_beats_dir }}/dev-tools/mage/templates/darwin/scripts/preinstall.tmpl' - post_install_script: '{{ elastic_beats_dir }}/dev-tools/mage/templates/darwin/scripts/postinstall.tmpl' + pre_install_script: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/darwin/scripts/preinstall.tmpl' + post_install_script: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/darwin/scripts/postinstall.tmpl' files: /Library/Application Support/{{.BeatVendor}}/{{.BeatName}}/bin/{{.BeatName}}{{.BinaryExt}}: source: build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}} @@ -85,14 +85,14 @@ shared: source: '{{ repo.RootDir }}/NOTICE.txt' mode: 0644 /Library/Application Support/{{.BeatVendor}}/{{.BeatName}}/README.md: - template: '{{ elastic_beats_dir }}/dev-tools/mage/templates/common/README.md.tmpl' + template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/common/README.md.tmpl' mode: 0644 /Library/Application Support/{{.BeatVendor}}/{{.BeatName}}/.build_hash.txt: content: > {{ commit }} mode: 0644 /Library/Application Support/{{.BeatVendor}}/{{.BeatName}}/{{.identifier}}.plist: - template: '{{ elastic_beats_dir }}/dev-tools/mage/templates/darwin/launchd-daemon.plist.tmpl' + template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/darwin/launchd-daemon.plist.tmpl' mode: 0644 /Library/Application Support/{{.BeatVendor}}/{{.BeatName}}/kibana: source: _meta/kibana.generated @@ -122,7 +122,7 @@ shared: source: '{{ repo.RootDir }}/NOTICE.txt' mode: 0644 README.md: - template: '{{ elastic_beats_dir }}/dev-tools/mage/templates/common/README.md.tmpl' + template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/common/README.md.tmpl' mode: 0644 .build_hash.txt: content: > @@ -151,10 +151,10 @@ shared: files: <<: *binary_files install-service-{{.BeatName}}.ps1: - template: '{{ elastic_beats_dir }}/dev-tools/mage/templates/windows/install-service.ps1.tmpl' + template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/windows/install-service.ps1.tmpl' mode: 0755 uninstall-service-{{.BeatName}}.ps1: - template: '{{ elastic_beats_dir }}/dev-tools/mage/templates/windows/uninstall-service.ps1.tmpl' + template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/windows/uninstall-service.ps1.tmpl' mode: 0755 # diff --git a/dev-tools/packer/platforms/darwin/preference-pane/.gitignore b/dev-tools/packaging/preference-pane/.gitignore similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/.gitignore rename to dev-tools/packaging/preference-pane/.gitignore diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane.xcodeproj/project.pbxproj b/dev-tools/packaging/preference-pane/beats-preference-pane.xcodeproj/project.pbxproj similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane.xcodeproj/project.pbxproj rename to dev-tools/packaging/preference-pane/beats-preference-pane.xcodeproj/project.pbxproj diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/dev-tools/packaging/preference-pane/beats-preference-pane.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to dev-tools/packaging/preference-pane/beats-preference-pane.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane.xcodeproj/xcshareddata/IDETemplateMacros.plist b/dev-tools/packaging/preference-pane/beats-preference-pane.xcodeproj/xcshareddata/IDETemplateMacros.plist similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane.xcodeproj/xcshareddata/IDETemplateMacros.plist rename to dev-tools/packaging/preference-pane/beats-preference-pane.xcodeproj/xcshareddata/IDETemplateMacros.plist diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane.xcodeproj/xcuserdata/adrian.xcuserdatad/xcschemes/xcschememanagement.plist b/dev-tools/packaging/preference-pane/beats-preference-pane.xcodeproj/xcuserdata/adrian.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane.xcodeproj/xcuserdata/adrian.xcuserdatad/xcschemes/xcschememanagement.plist rename to dev-tools/packaging/preference-pane/beats-preference-pane.xcodeproj/xcuserdata/adrian.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Authorization.h b/dev-tools/packaging/preference-pane/beats-preference-pane/Authorization.h similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Authorization.h rename to dev-tools/packaging/preference-pane/beats-preference-pane/Authorization.h diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Base.lproj/BeatView.xib b/dev-tools/packaging/preference-pane/beats-preference-pane/Base.lproj/BeatView.xib similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Base.lproj/BeatView.xib rename to dev-tools/packaging/preference-pane/beats-preference-pane/Base.lproj/BeatView.xib diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Base.lproj/BeatsPrefPane.xib b/dev-tools/packaging/preference-pane/beats-preference-pane/Base.lproj/BeatsPrefPane.xib similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Base.lproj/BeatsPrefPane.xib rename to dev-tools/packaging/preference-pane/beats-preference-pane/Base.lproj/BeatsPrefPane.xib diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Base.lproj/EditorWindow.xib b/dev-tools/packaging/preference-pane/beats-preference-pane/Base.lproj/EditorWindow.xib similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Base.lproj/EditorWindow.xib rename to dev-tools/packaging/preference-pane/beats-preference-pane/Base.lproj/EditorWindow.xib diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Base.lproj/pane.xib b/dev-tools/packaging/preference-pane/beats-preference-pane/Base.lproj/pane.xib similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Base.lproj/pane.xib rename to dev-tools/packaging/preference-pane/beats-preference-pane/Base.lproj/pane.xib diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/BeatManager.m b/dev-tools/packaging/preference-pane/beats-preference-pane/BeatManager.m similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/BeatManager.m rename to dev-tools/packaging/preference-pane/beats-preference-pane/BeatManager.m diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/BeatViewController.h b/dev-tools/packaging/preference-pane/beats-preference-pane/BeatViewController.h similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/BeatViewController.h rename to dev-tools/packaging/preference-pane/beats-preference-pane/BeatViewController.h diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/BeatViewController.m b/dev-tools/packaging/preference-pane/beats-preference-pane/BeatViewController.m similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/BeatViewController.m rename to dev-tools/packaging/preference-pane/beats-preference-pane/BeatViewController.m diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Beats.icns b/dev-tools/packaging/preference-pane/beats-preference-pane/Beats.icns similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Beats.icns rename to dev-tools/packaging/preference-pane/beats-preference-pane/Beats.icns diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/BeatsPrefPane.h b/dev-tools/packaging/preference-pane/beats-preference-pane/BeatsPrefPane.h similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/BeatsPrefPane.h rename to dev-tools/packaging/preference-pane/beats-preference-pane/BeatsPrefPane.h diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/BeatsPrefPane.m b/dev-tools/packaging/preference-pane/beats-preference-pane/BeatsPrefPane.m similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/BeatsPrefPane.m rename to dev-tools/packaging/preference-pane/beats-preference-pane/BeatsPrefPane.m diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/EditorWindow.h b/dev-tools/packaging/preference-pane/beats-preference-pane/EditorWindow.h similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/EditorWindow.h rename to dev-tools/packaging/preference-pane/beats-preference-pane/EditorWindow.h diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/EditorWindow.m b/dev-tools/packaging/preference-pane/beats-preference-pane/EditorWindow.m similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/EditorWindow.m rename to dev-tools/packaging/preference-pane/beats-preference-pane/EditorWindow.m diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Info.plist b/dev-tools/packaging/preference-pane/beats-preference-pane/Info.plist similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/Info.plist rename to dev-tools/packaging/preference-pane/beats-preference-pane/Info.plist diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/TabViewDelegate.h b/dev-tools/packaging/preference-pane/beats-preference-pane/TabViewDelegate.h similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/TabViewDelegate.h rename to dev-tools/packaging/preference-pane/beats-preference-pane/TabViewDelegate.h diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/TabViewDelegate.m b/dev-tools/packaging/preference-pane/beats-preference-pane/TabViewDelegate.m similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/TabViewDelegate.m rename to dev-tools/packaging/preference-pane/beats-preference-pane/TabViewDelegate.m diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/beats/Beats.h b/dev-tools/packaging/preference-pane/beats-preference-pane/beats/Beats.h similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/beats/Beats.h rename to dev-tools/packaging/preference-pane/beats-preference-pane/beats/Beats.h diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/beats/BeatsService.h b/dev-tools/packaging/preference-pane/beats-preference-pane/beats/BeatsService.h similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/beats/BeatsService.h rename to dev-tools/packaging/preference-pane/beats-preference-pane/beats/BeatsService.h diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/beats/BeatsService.m b/dev-tools/packaging/preference-pane/beats-preference-pane/beats/BeatsService.m similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/beats/BeatsService.m rename to dev-tools/packaging/preference-pane/beats-preference-pane/beats/BeatsService.m diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/common/common.h b/dev-tools/packaging/preference-pane/beats-preference-pane/common/common.h similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/common/common.h rename to dev-tools/packaging/preference-pane/beats-preference-pane/common/common.h diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/common/common.m b/dev-tools/packaging/preference-pane/beats-preference-pane/common/common.m similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/common/common.m rename to dev-tools/packaging/preference-pane/beats-preference-pane/common/common.m diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/config.h b/dev-tools/packaging/preference-pane/beats-preference-pane/config.h similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/config.h rename to dev-tools/packaging/preference-pane/beats-preference-pane/config.h diff --git a/dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/en.lproj/beats_preference_pane.strings b/dev-tools/packaging/preference-pane/beats-preference-pane/en.lproj/beats_preference_pane.strings similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/beats-preference-pane/en.lproj/beats_preference_pane.strings rename to dev-tools/packaging/preference-pane/beats-preference-pane/en.lproj/beats_preference_pane.strings diff --git a/dev-tools/packer/platforms/darwin/preference-pane/helper/main.m b/dev-tools/packaging/preference-pane/helper/main.m similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/helper/main.m rename to dev-tools/packaging/preference-pane/helper/main.m diff --git a/dev-tools/packer/platforms/darwin/preference-pane/helper/setboot.m b/dev-tools/packaging/preference-pane/helper/setboot.m similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/helper/setboot.m rename to dev-tools/packaging/preference-pane/helper/setboot.m diff --git a/dev-tools/packer/platforms/darwin/preference-pane/magefile.go b/dev-tools/packaging/preference-pane/magefile.go similarity index 100% rename from dev-tools/packer/platforms/darwin/preference-pane/magefile.go rename to dev-tools/packaging/preference-pane/magefile.go diff --git a/dev-tools/mage/templates/common/README.md.tmpl b/dev-tools/packaging/templates/common/README.md.tmpl similarity index 100% rename from dev-tools/mage/templates/common/README.md.tmpl rename to dev-tools/packaging/templates/common/README.md.tmpl diff --git a/dev-tools/mage/templates/common/magefile.go.tmpl b/dev-tools/packaging/templates/common/magefile.go.tmpl similarity index 100% rename from dev-tools/mage/templates/common/magefile.go.tmpl rename to dev-tools/packaging/templates/common/magefile.go.tmpl diff --git a/dev-tools/mage/templates/darwin/README.html.tmpl b/dev-tools/packaging/templates/darwin/README.html.tmpl similarity index 100% rename from dev-tools/mage/templates/darwin/README.html.tmpl rename to dev-tools/packaging/templates/darwin/README.html.tmpl diff --git a/dev-tools/mage/templates/darwin/component.plist.tmpl b/dev-tools/packaging/templates/darwin/component.plist.tmpl similarity index 100% rename from dev-tools/mage/templates/darwin/component.plist.tmpl rename to dev-tools/packaging/templates/darwin/component.plist.tmpl diff --git a/dev-tools/mage/templates/darwin/distribution.plist.tmpl b/dev-tools/packaging/templates/darwin/distribution.plist.tmpl similarity index 100% rename from dev-tools/mage/templates/darwin/distribution.plist.tmpl rename to dev-tools/packaging/templates/darwin/distribution.plist.tmpl diff --git a/dev-tools/mage/templates/darwin/dmg/Uninstall.app/Contents/Info.plist.tmpl b/dev-tools/packaging/templates/darwin/dmg/Uninstall.app/Contents/Info.plist.tmpl similarity index 100% rename from dev-tools/mage/templates/darwin/dmg/Uninstall.app/Contents/Info.plist.tmpl rename to dev-tools/packaging/templates/darwin/dmg/Uninstall.app/Contents/Info.plist.tmpl diff --git a/dev-tools/mage/templates/darwin/dmg/Uninstall.app/Contents/MacOS/uninstall.sh.tmpl b/dev-tools/packaging/templates/darwin/dmg/Uninstall.app/Contents/MacOS/uninstall.sh.tmpl similarity index 100% rename from dev-tools/mage/templates/darwin/dmg/Uninstall.app/Contents/MacOS/uninstall.sh.tmpl rename to dev-tools/packaging/templates/darwin/dmg/Uninstall.app/Contents/MacOS/uninstall.sh.tmpl diff --git a/dev-tools/mage/templates/darwin/dmg/Uninstall.app/Contents/Resources/uninstaller.icns b/dev-tools/packaging/templates/darwin/dmg/Uninstall.app/Contents/Resources/uninstaller.icns similarity index 100% rename from dev-tools/mage/templates/darwin/dmg/Uninstall.app/Contents/Resources/uninstaller.icns rename to dev-tools/packaging/templates/darwin/dmg/Uninstall.app/Contents/Resources/uninstaller.icns diff --git a/dev-tools/mage/templates/darwin/icons/auditbeat.icns b/dev-tools/packaging/templates/darwin/icons/auditbeat.icns similarity index 100% rename from dev-tools/mage/templates/darwin/icons/auditbeat.icns rename to dev-tools/packaging/templates/darwin/icons/auditbeat.icns diff --git a/dev-tools/mage/templates/darwin/icons/filebeat.icns b/dev-tools/packaging/templates/darwin/icons/filebeat.icns similarity index 100% rename from dev-tools/mage/templates/darwin/icons/filebeat.icns rename to dev-tools/packaging/templates/darwin/icons/filebeat.icns diff --git a/dev-tools/mage/templates/darwin/icons/heartbeat.icns b/dev-tools/packaging/templates/darwin/icons/heartbeat.icns similarity index 100% rename from dev-tools/mage/templates/darwin/icons/heartbeat.icns rename to dev-tools/packaging/templates/darwin/icons/heartbeat.icns diff --git a/dev-tools/mage/templates/darwin/icons/metricbeat.icns b/dev-tools/packaging/templates/darwin/icons/metricbeat.icns similarity index 100% rename from dev-tools/mage/templates/darwin/icons/metricbeat.icns rename to dev-tools/packaging/templates/darwin/icons/metricbeat.icns diff --git a/dev-tools/mage/templates/darwin/icons/packetbeat.icns b/dev-tools/packaging/templates/darwin/icons/packetbeat.icns similarity index 100% rename from dev-tools/mage/templates/darwin/icons/packetbeat.icns rename to dev-tools/packaging/templates/darwin/icons/packetbeat.icns diff --git a/dev-tools/mage/templates/darwin/icons/winlogbeat.icns b/dev-tools/packaging/templates/darwin/icons/winlogbeat.icns similarity index 100% rename from dev-tools/mage/templates/darwin/icons/winlogbeat.icns rename to dev-tools/packaging/templates/darwin/icons/winlogbeat.icns diff --git a/dev-tools/mage/templates/darwin/launchd-daemon.plist.tmpl b/dev-tools/packaging/templates/darwin/launchd-daemon.plist.tmpl similarity index 100% rename from dev-tools/mage/templates/darwin/launchd-daemon.plist.tmpl rename to dev-tools/packaging/templates/darwin/launchd-daemon.plist.tmpl diff --git a/dev-tools/mage/templates/darwin/requirements.plist.tmpl b/dev-tools/packaging/templates/darwin/requirements.plist.tmpl similarity index 100% rename from dev-tools/mage/templates/darwin/requirements.plist.tmpl rename to dev-tools/packaging/templates/darwin/requirements.plist.tmpl diff --git a/dev-tools/mage/templates/darwin/scripts/postinstall.tmpl b/dev-tools/packaging/templates/darwin/scripts/postinstall.tmpl similarity index 100% rename from dev-tools/mage/templates/darwin/scripts/postinstall.tmpl rename to dev-tools/packaging/templates/darwin/scripts/postinstall.tmpl diff --git a/dev-tools/mage/templates/darwin/scripts/preinstall.tmpl b/dev-tools/packaging/templates/darwin/scripts/preinstall.tmpl similarity index 100% rename from dev-tools/mage/templates/darwin/scripts/preinstall.tmpl rename to dev-tools/packaging/templates/darwin/scripts/preinstall.tmpl diff --git a/dev-tools/mage/templates/deb/init.sh.tmpl b/dev-tools/packaging/templates/deb/init.sh.tmpl similarity index 100% rename from dev-tools/mage/templates/deb/init.sh.tmpl rename to dev-tools/packaging/templates/deb/init.sh.tmpl diff --git a/dev-tools/mage/templates/linux/beatname.sh.tmpl b/dev-tools/packaging/templates/linux/beatname.sh.tmpl similarity index 100% rename from dev-tools/mage/templates/linux/beatname.sh.tmpl rename to dev-tools/packaging/templates/linux/beatname.sh.tmpl diff --git a/dev-tools/mage/templates/linux/systemd.unit.tmpl b/dev-tools/packaging/templates/linux/systemd.unit.tmpl similarity index 100% rename from dev-tools/mage/templates/linux/systemd.unit.tmpl rename to dev-tools/packaging/templates/linux/systemd.unit.tmpl diff --git a/dev-tools/mage/templates/rpm/init.sh.tmpl b/dev-tools/packaging/templates/rpm/init.sh.tmpl similarity index 100% rename from dev-tools/mage/templates/rpm/init.sh.tmpl rename to dev-tools/packaging/templates/rpm/init.sh.tmpl diff --git a/dev-tools/mage/templates/windows/install-service.ps1.tmpl b/dev-tools/packaging/templates/windows/install-service.ps1.tmpl similarity index 100% rename from dev-tools/mage/templates/windows/install-service.ps1.tmpl rename to dev-tools/packaging/templates/windows/install-service.ps1.tmpl diff --git a/dev-tools/mage/templates/windows/uninstall-service.ps1.tmpl b/dev-tools/packaging/templates/windows/uninstall-service.ps1.tmpl similarity index 100% rename from dev-tools/mage/templates/windows/uninstall-service.ps1.tmpl rename to dev-tools/packaging/templates/windows/uninstall-service.ps1.tmpl