Skip to content

Commit 558d5fa

Browse files
echo-branchecho-branch
authored
Merge pull request #115 from BranchMetrics/CORE-2516
Branch Win32 SDK 1.2.4
2 parents c83ee98 + f1e1a89 commit 558d5fa

File tree

133 files changed

+1646
-4811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+1646
-4811
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Debug
66
Release
77
/build
8+
/stage
89
/bin
910
/cmake-build-debug
1011
/cmake-build-release
@@ -21,3 +22,5 @@ Thumbs.db
2122

2223
docs
2324
obj
25+
26+
lib

‎BranchInstaller/BranchInstaller.sln‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29123.88
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "BranchInstaller", "BranchInstaller.wixproj", "{CF182D2E-244F-411E-BFB5-4E19F859804C}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|x64 = Debug|x64
11+
Debug|x86 = Debug|x86
12+
Release|x64 = Release|x64
13+
Release|x86 = Release|x86
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{CF182D2E-244F-411E-BFB5-4E19F859804C}.Debug|x64.ActiveCfg = Debug|x86
17+
{CF182D2E-244F-411E-BFB5-4E19F859804C}.Debug|x86.ActiveCfg = Debug|x86
18+
{CF182D2E-244F-411E-BFB5-4E19F859804C}.Debug|x86.Build.0 = Debug|x86
19+
{CF182D2E-244F-411E-BFB5-4E19F859804C}.Release|x64.ActiveCfg = Release|x86
20+
{CF182D2E-244F-411E-BFB5-4E19F859804C}.Release|x86.ActiveCfg = Release|x86
21+
{CF182D2E-244F-411E-BFB5-4E19F859804C}.Release|x86.Build.0 = Release|x86
22+
EndGlobalSection
23+
GlobalSection(SolutionProperties) = preSolution
24+
HideSolutionNode = FALSE
25+
EndGlobalSection
26+
GlobalSection(ExtensibilityGlobals) = postSolution
27+
SolutionGuid = {15ADA861-9404-43EA-A10E-B5CC0E297D55}
28+
EndGlobalSection
29+
EndGlobal

BranchSDK/Windows/BranchInstaller/BranchInstaller.wixproj renamed to BranchInstaller/BranchInstaller.wixproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<Compile Include="Components.wxs" />
23+
<Compile Include="Branch.wxs" />
2424
<Compile Include="Product.wxs" />
2525
<Compile Include="WixUI_FeatureTree_NoLic.wxs" />
2626
</ItemGroup>
@@ -40,18 +40,20 @@
4040
<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/" />
4141
</Target>
4242
<!-- https://wixtoolset.org/documentation/manual/v3/overview/insignia.html for these targets and the SignOutput property -->
43+
<!--
4344
<Target Name="SignCabs">
4445
<Exec Command="&quot;C:\Program Files (x86)\Windows Kits\10\App Certification Kit\Signtool.exe&quot; sign /a &quot;%(SignCabs.FullPath)&quot;" />
4546
</Target>
4647
<Target Name="SignMsi">
4748
<Exec Command="&quot;C:\Program Files (x86)\Windows Kits\10\App Certification Kit\Signtool.exe&quot; sign /a &quot;%(SignMsi.FullPath)&quot;" />
4849
</Target>
50+
-->
4951
<!--
5052
To modify your build process, add your task inside one of the targets below and uncomment it.
5153
Other similar extension points exist, see Wix.targets.
5254
<Target Name="BeforeBuild">
5355
</Target>
5456
<Target Name="AfterBuild">
5557
</Target>
56-
-->
58+
-->
5759
</Project>

‎BranchInstaller/Product.wxs‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version='1.0' encoding='windows-1252'?>
2+
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
3+
<Product Id="*" Language="1033" Manufacturer="Branch Metrics, Inc." Name="Branch C++ SDK for Windows" UpgradeCode="29b1dc08-2190-48f0-bc3c-7455381f2156" Version="1.2.4">
4+
<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200"/>
5+
<MajorUpgrade DowngradeErrorMessage="A newer version of Branch C++ SDK for Windows is already installed."/>
6+
<Media Id="1" Cabinet="cab1.cab" EmbedCab="yes"/>
7+
<Icon Id="branch.ico" SourceFile="branch-badge-dark.ico"/>
8+
<Property Id="ARPPRODUCTICON" Value="branch.ico"/>
9+
<Property Id="ARPHELPLINK" Value="https://help.branch.io/developers-hub/docs/windows-cpp-sdk-overview"/>
10+
11+
<!-- UI Definition -->
12+
<UI>
13+
<UIRef Id="WixUI_FeatureTree_NoLic"/>
14+
</UI>
15+
16+
<!-- Install location -->
17+
<Directory Id="TARGETDIR" Name="SourceDir">
18+
<Directory Id="ProgramFilesFolder">
19+
<Directory Id="INSTALLFOLDER" Name="Branch SDK"/>
20+
</Directory>
21+
</Directory>
22+
23+
<!-- Library files -->
24+
<WixVariable Id="WixUIDialogBmp" Value="branch-background.bmp"/>
25+
<WixVariable Id="WixUIBannerBmp" Value="branch-banner.bmp"/>
26+
<Feature Id="BranchSDKFeature" Title="Branch SDK" Description="Branch SDK">
27+
<Feature Id="BranchSDK" Title="Branch SDK" Description="Branch SDK library and dependencies" Absent="disallow">
28+
<ComponentGroupRef Id="BranchLibrary"/>
29+
</Feature>
30+
</Feature>
31+
</Product>
32+
33+
</Wix>

BranchSDK-Samples/TestBed-Basic/Welcome.html renamed to BranchInstaller/Welcome.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,27 @@ <h2>Release 1.2.3</h2>
4444
<table>
4545
<tr>
4646
<td>
47-
<a href="https://help.branch.io/developers-hub/docs/windows-cpp-sdk-overview" target="_blank"><span class="link">SDK Documentation</span></a>
47+
<a href="https://help.branch.io/developers-hub/docs/windows-cpp-sdk-overview" target="_blank"><span class="link">Getting Started</span></a>
4848
</td>
4949
</tr>
5050
<tr>
5151
<td>
52-
<a href="https://0vzx2.app.link/opSPRMKeFdb" target="_blank"><span class="link">Open Demo App from a Branch Link</span></a>
52+
<a href="https://dashboard.branch.io" target="_blank"><span class="link">Branch Dashboard</span></a>
5353
</td>
5454
</tr>
5555
<tr>
5656
<td>
57-
<a href="https://dashboard.branch.io" target="_blank"><span class="link">Branch Dashboard</span></a>
57+
<a href="https://github.com/BranchMetrics/cpp-branch-deep-linking-attribution" target="_blank"><span class="link">Source Code (GitHub)</span></a>
5858
</td>
5959
</tr>
6060
<tr>
6161
<td>
62-
<a href="https://github.com/BranchMetrics/cpp-branch-deep-linking-attribution" target="_blank"><span class="link">Source Code (GitHub)</span></a>
62+
<a href="https://help.branch.io/using-branch/page/submit-a-ticket" target="_blank"><span class="link">Branch Support</span></a>
6363
</td>
6464
</tr>
6565
<tr>
6666
<td>
67-
<a href="https://help.branch.io/using-branch/page/submit-a-ticket" target="_blank"><span class="link">Branch Support</span></a>
67+
<a href="C:\Program Files (x86)\Branch SDK\docs\html\index.html" target="_blank"><span class="link">SDK Reference Documentation</span></a>
6868
</td>
6969
</tr>
7070
</table>

BranchSDK/Windows/BranchInstaller/WixUI_FeatureTree_NoLic.wxs renamed to BranchInstaller/WixUI_FeatureTree_NoLic.wxs

File renamed without changes.

BranchSDK/Windows/BranchInstaller/branch-background.bmp renamed to BranchInstaller/branch-background.bmp

File renamed without changes.

BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/branch-badge-dark.ico renamed to BranchInstaller/branch-badge-dark.ico

File renamed without changes.

BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/branch-banner.bmp renamed to BranchInstaller/branch-banner.bmp

File renamed without changes.

BranchSDK-Samples/TestBed-Basic/small.ico renamed to BranchInstaller/small.ico

File renamed without changes.

0 commit comments

Comments
 (0)