Move packaging to internal/buildscripts (#1274)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
dynatrace-oss-contrib · Jul 7, 2020 · d6c29c2 · d6c29c2
1 parent e3fa0c1
commit d6c29c2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -305,15 +305,15 @@ jobs:
       - attach_to_workspace
       - run:
           name: Install Wix Toolset
-          command: .\packaging\msi\make.ps1 Install-Tools
+          command: .\internal\buildscripts\packaging\msi\make.ps1 Install-Tools
       - run:
           name: Build MSI
           command: |
             $Version = if ($env:CIRCLE_TAG -match '^v(\d+\.\d+\.\d+)') { $Matches[1] } else { "0.0.1" }
-            .\packaging\msi\make.ps1 New-MSI -Version $Version
+            .\internal\buildscripts\packaging\msi\make.ps1 New-MSI -Version $Version
       - run:
           name: Validate MSI
-          command: .\packaging\msi\make.ps1 Confirm-MSI
+          command: .\internal\buildscripts\packaging\msi\make.ps1 Confirm-MSI
       - persist_to_workspace:
           root: ~/
           paths: project/bin
diff --git a/packaging/msi/make.ps1 → internal/buildscripts/packaging/msi/make.ps1 b/packaging/msi/make.ps1 → internal/buildscripts/packaging/msi/make.ps1
@@ -37,7 +37,7 @@ function New-MSI(
     [string]$Version="0.0.1",
     [string]$Config="./examples/otel-local-config.yaml"
 ) {
-    candle -arch x64 -dVersion="$Version" -dConfig="$Config" packaging/msi/opentelemetry-collector.wxs
+    candle -arch x64 -dVersion="$Version" -dConfig="$Config" internal/buildscripts/packaging/msi/opentelemetry-collector.wxs
     light opentelemetry-collector.wixobj
     Move-Item -Force opentelemetry-collector.msi bin/opentelemetry-collector.msi
 }

diff --git a/packaging/msi/opentelemetry-collector.wxs → ...packaging/msi/opentelemetry-collector.wxs b/packaging/msi/opentelemetry-collector.wxs → ...packaging/msi/opentelemetry-collector.wxs
@@ -2,7 +2,7 @@
    <Product Id="*" UpgradeCode="B7C263DD-95A5-436A-A025-DCA5200C2BE3" Name="OpenTelemetry Collector" Version="$(var.Version)" Manufacturer="OpenTelemetry" Language="1033">
       <Package InstallerVersion="200" Compressed="yes" Comments="Windows Installer Package"/>
       <Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
-      <Icon Id="ProductIcon" SourceFile="./packaging/msi/opentelemetry.ico"/>
+      <Icon Id="ProductIcon" SourceFile="./internal/buildscripts/packaging/msi/opentelemetry.ico"/>
       <Property Id="ARPPRODUCTICON" Value="ProductIcon"/>
       <Property Id="ARPHELPLINK" Value="https://opentelemetry.io/"/>
       <Property Id="ARPURLINFOABOUT" Value="https://opentelemetry.io/"/>

diff --git a/packaging/msi/opentelemetry.ico → ...ldscripts/packaging/msi/opentelemetry.ico b/packaging/msi/opentelemetry.ico → ...ldscripts/packaging/msi/opentelemetry.ico