Merge pull request #115 from BranchMetrics/CORE-2516

Branch Win32 SDK 1.2.4
BranchMetrics · Jan 11, 2022 · 558d5fa · 558d5fa
2 parents c83ee98 + f1e1a89
commit 558d5fa
Show file tree

Hide file tree

Showing 133 changed files with 1,646 additions and 4,811 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 Debug
 Release
 /build
+/stage
 /bin
 /cmake-build-debug
 /cmake-build-release
@@ -21,3 +22,5 @@ Thumbs.db
 
 docs
 obj
+
+lib
diff --git a/BranchInstaller/BranchInstaller.sln b/BranchInstaller/BranchInstaller.sln
@@ -0,0 +1,29 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "BranchInstaller", "BranchInstaller.wixproj", "{CF182D2E-244F-411E-BFB5-4E19F859804C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CF182D2E-244F-411E-BFB5-4E19F859804C}.Debug|x64.ActiveCfg = Debug|x86
+		{CF182D2E-244F-411E-BFB5-4E19F859804C}.Debug|x86.ActiveCfg = Debug|x86
+		{CF182D2E-244F-411E-BFB5-4E19F859804C}.Debug|x86.Build.0 = Debug|x86
+		{CF182D2E-244F-411E-BFB5-4E19F859804C}.Release|x64.ActiveCfg = Release|x86
+		{CF182D2E-244F-411E-BFB5-4E19F859804C}.Release|x86.ActiveCfg = Release|x86
+		{CF182D2E-244F-411E-BFB5-4E19F859804C}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {15ADA861-9404-43EA-A10E-B5CC0E297D55}
+	EndGlobalSection
+EndGlobal
diff --git a/...s/BranchInstaller/BranchInstaller.wixproj → BranchInstaller/BranchInstaller.wixproj b/...s/BranchInstaller/BranchInstaller.wixproj → BranchInstaller/BranchInstaller.wixproj
@@ -20,7 +20,7 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Components.wxs" />
+    <Compile Include="Branch.wxs" />
     <Compile Include="Product.wxs" />
     <Compile Include="WixUI_FeatureTree_NoLic.wxs" />
   </ItemGroup>
@@ -40,18 +40,20 @@
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
   <!-- https://wixtoolset.org/documentation/manual/v3/overview/insignia.html for these targets and the SignOutput property -->
+  <!--
   <Target Name="SignCabs">
     <Exec Command="&quot;C:\Program Files (x86)\Windows Kits\10\App Certification Kit\Signtool.exe&quot; sign /a &quot;%(SignCabs.FullPath)&quot;" />
   </Target>
   <Target Name="SignMsi">
     <Exec Command="&quot;C:\Program Files (x86)\Windows Kits\10\App Certification Kit\Signtool.exe&quot; sign /a &quot;%(SignMsi.FullPath)&quot;" />
   </Target>
+  -->
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.
 	<Target Name="BeforeBuild">
 	</Target>
 	<Target Name="AfterBuild">
 	</Target>
-	-->
+  -->
 </Project>
diff --git a/BranchInstaller/Product.wxs b/BranchInstaller/Product.wxs
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='windows-1252'?>
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id="*" Language="1033" Manufacturer="Branch Metrics, Inc." Name="Branch C++ SDK for Windows" UpgradeCode="29b1dc08-2190-48f0-bc3c-7455381f2156" Version="1.2.4">
+    <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200"/>
+    <MajorUpgrade DowngradeErrorMessage="A newer version of Branch C++ SDK for Windows is already installed."/>
+    <Media Id="1" Cabinet="cab1.cab" EmbedCab="yes"/>
+    <Icon Id="branch.ico" SourceFile="branch-badge-dark.ico"/>
+    <Property Id="ARPPRODUCTICON" Value="branch.ico"/>
+    <Property Id="ARPHELPLINK" Value="https://help.branch.io/developers-hub/docs/windows-cpp-sdk-overview"/>
+
+    <!-- UI Definition -->
+    <UI>
+      <UIRef Id="WixUI_FeatureTree_NoLic"/>
+    </UI>
+
+    <!-- Install location -->
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="Branch SDK"/>
+      </Directory>
+    </Directory>
+
+    <!-- Library files -->
+    <WixVariable Id="WixUIDialogBmp" Value="branch-background.bmp"/>
+    <WixVariable Id="WixUIBannerBmp" Value="branch-banner.bmp"/>
+    <Feature Id="BranchSDKFeature" Title="Branch SDK" Description="Branch SDK">
+      <Feature Id="BranchSDK" Title="Branch SDK" Description="Branch SDK library and dependencies" Absent="disallow">
+        <ComponentGroupRef Id="BranchLibrary"/>
+      </Feature>
+    </Feature>
+  </Product>
+
+</Wix> 
diff --git a/BranchSDK-Samples/TestBed-Basic/Welcome.html → BranchInstaller/Welcome.html b/BranchSDK-Samples/TestBed-Basic/Welcome.html → BranchInstaller/Welcome.html
@@ -44,27 +44,27 @@ <h2>Release 1.2.3</h2>
         <table>
             <tr>
                 <td>
-                    <a href="https://help.branch.io/developers-hub/docs/windows-cpp-sdk-overview" target="_blank"><span class="link">SDK Documentation</span></a>
+                    <a href="https://help.branch.io/developers-hub/docs/windows-cpp-sdk-overview" target="_blank"><span class="link">Getting Started</span></a>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a href="https://0vzx2.app.link/opSPRMKeFdb" target="_blank"><span class="link">Open Demo App from a Branch Link</span></a>
+                    <a href="https://dashboard.branch.io" target="_blank"><span class="link">Branch Dashboard</span></a>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a href="https://dashboard.branch.io" target="_blank"><span class="link">Branch Dashboard</span></a>
+                    <a href="https://github.com/BranchMetrics/cpp-branch-deep-linking-attribution" target="_blank"><span class="link">Source Code (GitHub)</span></a>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a href="https://github.com/BranchMetrics/cpp-branch-deep-linking-attribution" target="_blank"><span class="link">Source Code (GitHub)</span></a>
+                    <a href="https://help.branch.io/using-branch/page/submit-a-ticket" target="_blank"><span class="link">Branch Support</span></a>
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a href="https://help.branch.io/using-branch/page/submit-a-ticket" target="_blank"><span class="link">Branch Support</span></a>
+                    <a href="C:\Program Files (x86)\Branch SDK\docs\html\index.html" target="_blank"><span class="link">SDK Reference Documentation</span></a>
                 </td>
             </tr>
         </table>

diff --git a/...anchInstaller/WixUI_FeatureTree_NoLic.wxs → BranchInstaller/WixUI_FeatureTree_NoLic.wxs b/...anchInstaller/WixUI_FeatureTree_NoLic.wxs → BranchInstaller/WixUI_FeatureTree_NoLic.wxs
diff --git a/...ows/BranchInstaller/branch-background.bmp → BranchInstaller/branch-background.bmp b/...ows/BranchInstaller/branch-background.bmp → BranchInstaller/branch-background.bmp
diff --git a/...stBed-Basic-Package/branch-badge-dark.ico → BranchInstaller/branch-badge-dark.ico b/...stBed-Basic-Package/branch-badge-dark.ico → BranchInstaller/branch-badge-dark.ico
diff --git a/...c/TestBed-Basic-Package/branch-banner.bmp → BranchInstaller/branch-banner.bmp b/...c/TestBed-Basic-Package/branch-banner.bmp → BranchInstaller/branch-banner.bmp
diff --git a/BranchSDK-Samples/TestBed-Basic/small.ico → BranchInstaller/small.ico b/BranchSDK-Samples/TestBed-Basic/small.ico → BranchInstaller/small.ico