diff --git a/.gitignore b/.gitignore index aa6f12b0..dc0d8847 100644 --- 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 new file mode 100644 index 00000000..38ba4c73 --- /dev/null +++ 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/BranchSDK/Windows/BranchInstaller/BranchInstaller.wixproj b/BranchInstaller/BranchInstaller.wixproj similarity index 98% rename from BranchSDK/Windows/BranchInstaller/BranchInstaller.wixproj rename to BranchInstaller/BranchInstaller.wixproj index e186b1c7..46a2837d 100644 --- a/BranchSDK/Windows/BranchInstaller/BranchInstaller.wixproj +++ b/BranchInstaller/BranchInstaller.wixproj @@ -20,7 +20,7 @@ obj\$(Configuration)\ - + @@ -40,12 +40,14 @@ + + --> \ No newline at end of file diff --git a/BranchInstaller/Product.wxs b/BranchInstaller/Product.wxs new file mode 100644 index 00000000..38e867d5 --- /dev/null +++ b/BranchInstaller/Product.wxs @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Basic/Welcome.html b/BranchInstaller/Welcome.html similarity index 92% rename from BranchSDK-Samples/TestBed-Basic/Welcome.html rename to BranchInstaller/Welcome.html index b66c29c0..19fed14d 100644 --- a/BranchSDK-Samples/TestBed-Basic/Welcome.html +++ b/BranchInstaller/Welcome.html @@ -44,27 +44,27 @@

Release 1.2.3

- SDK Documentation + Getting Started
- Open Demo App from a Branch Link + Branch Dashboard
- Branch Dashboard + Source Code (GitHub)
- Source Code (GitHub) + Branch Support
- Branch Support + SDK Reference Documentation
diff --git a/BranchSDK/Windows/BranchInstaller/WixUI_FeatureTree_NoLic.wxs b/BranchInstaller/WixUI_FeatureTree_NoLic.wxs similarity index 100% rename from BranchSDK/Windows/BranchInstaller/WixUI_FeatureTree_NoLic.wxs rename to BranchInstaller/WixUI_FeatureTree_NoLic.wxs diff --git a/BranchSDK/Windows/BranchInstaller/branch-background.bmp b/BranchInstaller/branch-background.bmp similarity index 100% rename from BranchSDK/Windows/BranchInstaller/branch-background.bmp rename to BranchInstaller/branch-background.bmp diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/branch-badge-dark.ico b/BranchInstaller/branch-badge-dark.ico similarity index 100% rename from BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/branch-badge-dark.ico rename to BranchInstaller/branch-badge-dark.ico diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/branch-banner.bmp b/BranchInstaller/branch-banner.bmp similarity index 100% rename from BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/branch-banner.bmp rename to BranchInstaller/branch-banner.bmp diff --git a/BranchSDK-Samples/TestBed-Basic/small.ico b/BranchInstaller/small.ico similarity index 100% rename from BranchSDK-Samples/TestBed-Basic/small.ico rename to BranchInstaller/small.ico diff --git a/BranchSDK-Samples/.gitignore b/BranchSDK-Samples/.gitignore index fc2ff537..c73f1968 100644 --- a/BranchSDK-Samples/.gitignore +++ b/BranchSDK-Samples/.gitignore @@ -1 +1,398 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ *.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Basic/Resource.h b/BranchSDK-Samples/TestBed-Basic/Resource.h deleted file mode 100644 index ddde3dae..00000000 --- a/BranchSDK-Samples/TestBed-Basic/Resource.h +++ /dev/null @@ -1,28 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by TestBed-Basic.rc -// -#define IDC_MYICON 2 -#define IDD_TESTBEDBASIC_DIALOG 102 -#define IDS_APP_TITLE 103 -#define IDD_ABOUTBOX 103 -#define IDM_ABOUT 104 -#define IDM_EXIT 105 -#define IDI_TESTBEDBASIC 107 -#define IDI_SMALL 108 -#define IDC_TESTBEDBASIC 109 -#define IDC_TESTBED 109 -#define IDR_MAINFRAME 128 -#define IDC_STATIC -1 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 129 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/Product.wxs b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/Product.wxs deleted file mode 100644 index 1f923944..00000000 --- a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/Product.wxs +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/TestBed-Basic-Package.wixproj b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/TestBed-Basic-Package.wixproj deleted file mode 100644 index 5fcedd9d..00000000 --- a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/TestBed-Basic-Package.wixproj +++ /dev/null @@ -1,62 +0,0 @@ - - - - Debug - x86 - 3.10 - ac67aa34-e2de-470d-bd7d-b87218da186d - 2.0 - TestBed-Basic - Package - true - - - bin\$(Configuration)\ - obj\$(Configuration)\ - Debug - - - bin\$(Configuration)\ - obj\$(Configuration)\ - - - - - - - - TestBed-Basic - {f3a5bf87-3e17-4fb9-9002-86a5aba3ab9c} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - - - - - - - - - - - - - - diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/WixUI_InstallDir_NoLic.wxs b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/WixUI_InstallDir_NoLic.wxs deleted file mode 100644 index 94d3c4c6..00000000 --- a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/WixUI_InstallDir_NoLic.wxs +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - "1"]]> - - 1 - - NOT Installed - Installed AND PATCH - - 1 - 1 - NOT WIXUI_DONTVALIDATEPATH - "1"]]> - WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" - 1 - 1 - - NOT Installed - Installed AND NOT PATCH - Installed AND PATCH - - 1 - - 1 - 1 - 1 - - - - - - - diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/branch-background.bmp b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/branch-background.bmp deleted file mode 100644 index 66ca08b4..00000000 Binary files a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/branch-background.bmp and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.h b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.h deleted file mode 100644 index d00d47e7..00000000 --- a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "resource.h" diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.ico b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.ico deleted file mode 100644 index cecb6085..00000000 Binary files a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.ico and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.rc b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.rc deleted file mode 100644 index e465c580..00000000 Binary files a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.rc and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.sln b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.sln deleted file mode 100644 index e0f996ac..00000000 --- a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.sln +++ /dev/null @@ -1,39 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30907.101 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestBed-Basic", "TestBed-Basic.vcxproj", "{F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}" -EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "TestBed-Basic-Package", "TestBed-Basic-Package\TestBed-Basic-Package.wixproj", "{AC67AA34-E2DE-470D-BD7D-B87218DA186D}" -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 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x64.ActiveCfg = Debug|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x64.Build.0 = Debug|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x86.ActiveCfg = Debug|Win32 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x86.Build.0 = Debug|Win32 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x64.ActiveCfg = Release|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x64.Build.0 = Release|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x86.ActiveCfg = Release|Win32 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x86.Build.0 = Release|Win32 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Debug|x64.ActiveCfg = Debug|x86 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Debug|x86.ActiveCfg = Debug|x86 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Debug|x86.Build.0 = Debug|x86 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Release|x64.ActiveCfg = Release|x86 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Release|x86.ActiveCfg = Release|x86 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DF001862-7726-4148-8302-0695AE7DE9AC} - EndGlobalSection -EndGlobal diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.vcxproj b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.vcxproj deleted file mode 100644 index c5557849..00000000 --- a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.vcxproj +++ /dev/null @@ -1,183 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {f3a5bf87-3e17-4fb9-9002-86a5aba3ab9c} - TestBedBasic - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - - - false - - - - Level3 - true - BRANCH_KEY=L"key_live_hp5dyh7NazIhzwW2x8HJJakosFaQcB7j";BRANCH_URI_SCHEME=L"testbedbasic";MUTEX_NAME=L"03f1e6bf-6b92-4990-aa8a-c7eda8ce31ed";DEBUG;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) - - - Windows - true - C:\Program Files (x86)\Branch SDK\lib\x86\Debug;%(AdditionalLibraryDirectories) - BranchIOmdd.lib;PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - true - BRANCH_KEY=L"key_live_hp5dyh7NazIhzwW2x8HJJakosFaQcB7j";BRANCH_URI_SCHEME=L"testbedbasic";MUTEX_NAME=L"03f1e6bf-6b92-4990-aa8a-c7eda8ce31ed";POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - C:\Program Files (x86)\Branch SDK\lib\x86\Release;%(AdditionalLibraryDirectories) - BranchIOmd.lib;PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level3 - true - BRANCH_KEY=L"key_live_hp5dyh7NazIhzwW2x8HJJakosFaQcB7j";BRANCH_URI_SCHEME=L"testbedbasic";MUTEX_NAME=L"03f1e6bf-6b92-4990-aa8a-c7eda8ce31ed";WIN32;DEBUG;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) - - - Windows - true - C:\Program Files (x86)\Branch SDK\lib\x64\Debug;%(AdditionalLibraryDirectories) - BranchIOmdd.lib;PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - true - BRANCH_KEY=L"key_live_hp5dyh7NazIhzwW2x8HJJakosFaQcB7j";BRANCH_URI_SCHEME=L"testbedbasic";MUTEX_NAME=L"03f1e6bf-6b92-4990-aa8a-c7eda8ce31ed";WIN32;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - C:\Program Files (x86)\Branch SDK\lib\x64\Release;%(AdditionalLibraryDirectories) - BranchIOmd.lib;PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.vcxproj.filters b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.vcxproj.filters deleted file mode 100644 index 8e5c92f6..00000000 --- a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.vcxproj.filters +++ /dev/null @@ -1,82 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - Resource Files - - - Resource Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Basic/branch-badge-dark.png b/BranchSDK-Samples/TestBed-Basic/branch-badge-dark.png deleted file mode 100644 index ad3513dd..00000000 Binary files a/BranchSDK-Samples/TestBed-Basic/branch-badge-dark.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Basic/framework.h b/BranchSDK-Samples/TestBed-Basic/framework.h deleted file mode 100644 index 33a6be64..00000000 --- a/BranchSDK-Samples/TestBed-Basic/framework.h +++ /dev/null @@ -1,15 +0,0 @@ -// header.h : include file for standard system include files, -// or project specific include files -// - -#pragma once - -#include "targetver.h" -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -// Windows Header Files -#include -// C RunTime Header Files -#include -#include -#include -#include diff --git a/BranchSDK-Samples/TestBed-Basic/targetver.h b/BranchSDK-Samples/TestBed-Basic/targetver.h deleted file mode 100644 index bf75e089..00000000 --- a/BranchSDK-Samples/TestBed-Basic/targetver.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -// // Including SDKDDKVer.h defines the highest available Windows platform. -// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and -// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. -#include diff --git a/BranchSDK-Samples/TestBed-Conan/Resource.h b/BranchSDK-Samples/TestBed-Conan/Resource.h deleted file mode 100644 index a4331f08..00000000 --- a/BranchSDK-Samples/TestBed-Conan/Resource.h +++ /dev/null @@ -1,28 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by TestBed-Conan.rc -// -#define IDC_MYICON 2 -#define IDD_TESTBEDCONAN_DIALOG 102 -#define IDS_APP_TITLE 103 -#define IDD_ABOUTBOX 103 -#define IDM_ABOUT 104 -#define IDM_EXIT 105 -#define IDI_TESTBEDCONAN 107 -#define IDI_SMALL 108 -#define IDC_TESTBEDCONAN 109 -#define IDC_TESTBED 109 -#define IDR_MAINFRAME 128 -#define IDC_STATIC -1 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 129 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Branch.pfx b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Branch.pfx deleted file mode 100644 index 57139d59..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Branch.pfx and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/LockScreenLogo.scale-200.png b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/LockScreenLogo.scale-200.png deleted file mode 100644 index 27abe9a8..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/SplashScreen.scale-200.png b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/SplashScreen.scale-200.png deleted file mode 100644 index 11453727..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/SplashScreen.scale-200.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Square150x150Logo.scale-200.png b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Square150x150Logo.scale-200.png deleted file mode 100644 index 8fdb52b7..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Square44x44Logo.scale-200.png b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Square44x44Logo.scale-200.png deleted file mode 100644 index 8832bf9c..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index 40870d39..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/StoreLogo.png b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/StoreLogo.png deleted file mode 100644 index a0788494..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/StoreLogo.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Wide310x150Logo.scale-200.png b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Wide310x150Logo.scale-200.png deleted file mode 100644 index 03cfbd8d..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Images/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Package.appxmanifest b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Package.appxmanifest deleted file mode 100644 index 94ff6bce..00000000 --- a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Package.appxmanifest +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - Branch TestBed (Conan) - Branch Metrics - Images\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/TestBed-Conan-Package.wapproj b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/TestBed-Conan-Package.wapproj deleted file mode 100644 index b601a4bc..00000000 --- a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/TestBed-Conan-Package.wapproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - 15.0 - - - - Debug - x86 - - - Release - x86 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM - - - Release - ARM - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - AnyCPU - - - Release - AnyCPU - - - - $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ - - - - b20ad100-c9b2-4804-a7b6-945022ec50f2 - 10.0.18362.0 - 10.0.17763.0 - en-US - True - 8132C1C16AAB24EB2CA9CC95BBA6ADA1C2C0A930 - Branch.pfx - ..\TestBed-Conan.vcxproj - - - - Designer - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/TestBed-Conan-Package.wapproj.user b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/TestBed-Conan-Package.wapproj.user deleted file mode 100644 index 88a55094..00000000 --- a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/TestBed-Conan-Package.wapproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.h b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.h deleted file mode 100644 index d00d47e7..00000000 --- a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "resource.h" diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.ico b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.ico deleted file mode 100644 index cecb6085..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.ico and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.rc b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.rc deleted file mode 100644 index f4779297..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.rc and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.sln b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.sln deleted file mode 100644 index dd6f952a..00000000 --- a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.sln +++ /dev/null @@ -1,94 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31105.61 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestBed-Conan", "TestBed-Conan.vcxproj", "{E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}" - ProjectSection(ProjectDependencies) = postProject - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4} = {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BranchIO-Static", "..\..\..\BranchSDK\Windows\BranchIO-Static\BranchIO-Static.vcxproj", "{4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}" -EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "TestBed-Conan-Package", "TestBed-Conan-Package\TestBed-Conan-Package.wapproj", "{B20AD100-C9B2-4804-A7B6-945022EC50F2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|ARM64 = Release|ARM64 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Debug|ARM.ActiveCfg = Debug|Win32 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Debug|ARM64.ActiveCfg = Debug|Win32 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Debug|x64.ActiveCfg = Debug|x64 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Debug|x64.Build.0 = Debug|x64 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Debug|x86.ActiveCfg = Debug|Win32 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Debug|x86.Build.0 = Debug|Win32 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Release|Any CPU.ActiveCfg = Release|Win32 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Release|ARM.ActiveCfg = Release|Win32 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Release|ARM64.ActiveCfg = Release|Win32 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Release|x64.ActiveCfg = Release|x64 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Release|x64.Build.0 = Release|x64 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Release|x86.ActiveCfg = Release|Win32 - {E586B3B1-9E4D-4B2F-A8DF-F743B7A7B17B}.Release|x86.Build.0 = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|ARM.ActiveCfg = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|ARM64.ActiveCfg = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x64.ActiveCfg = Debug|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x64.Build.0 = Debug|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x86.ActiveCfg = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x86.Build.0 = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|Any CPU.ActiveCfg = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|ARM.ActiveCfg = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|ARM64.ActiveCfg = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x64.ActiveCfg = Release|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x64.Build.0 = Release|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x86.ActiveCfg = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x86.Build.0 = Release|Win32 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|ARM.ActiveCfg = Debug|ARM - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|ARM.Build.0 = Debug|ARM - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|ARM.Deploy.0 = Debug|ARM - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|ARM64.Build.0 = Debug|ARM64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|x64.ActiveCfg = Debug|x64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|x64.Build.0 = Debug|x64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|x64.Deploy.0 = Debug|x64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|x86.ActiveCfg = Debug|x86 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|x86.Build.0 = Debug|x86 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Debug|x86.Deploy.0 = Debug|x86 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|Any CPU.Build.0 = Release|Any CPU - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|Any CPU.Deploy.0 = Release|Any CPU - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|ARM.ActiveCfg = Release|ARM - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|ARM.Build.0 = Release|ARM - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|ARM.Deploy.0 = Release|ARM - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|ARM64.ActiveCfg = Release|ARM64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|ARM64.Build.0 = Release|ARM64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|ARM64.Deploy.0 = Release|ARM64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|x64.ActiveCfg = Release|x64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|x64.Build.0 = Release|x64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|x64.Deploy.0 = Release|x64 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|x86.ActiveCfg = Release|x86 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|x86.Build.0 = Release|x86 - {B20AD100-C9B2-4804-A7B6-945022EC50F2}.Release|x86.Deploy.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7F7E7648-D234-4BFD-A178-D37047BADB50} - EndGlobalSection -EndGlobal diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.vcxproj b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.vcxproj deleted file mode 100644 index c1c48d29..00000000 --- a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.vcxproj +++ /dev/null @@ -1,180 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {e586b3b1-9e4d-4b2f-a8df-f743b7a7b17b} - TestBedConan - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - - - false - - - - Level3 - true - BRANCH_KEY=L"key_live_baZls7WShgt7WTbng8i58oibAtltTiuq";BRANCH_URI_SCHEME=L"testbedconan";MUTEX_NAME=L"6b10a31c-81c9-4642-aead-481f3705dd0b";WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\..\BranchSDK\src;%(AdditionalIncludeDirectories) - - - Windows - true - - - - - Level3 - true - true - true - BRANCH_KEY=L"key_live_baZls7WShgt7WTbng8i58oibAtltTiuq";BRANCH_URI_SCHEME=L"testbedconan";MUTEX_NAME=L"6b10a31c-81c9-4642-aead-481f3705dd0b";WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\..\BranchSDK\src;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - - - - - Level3 - true - BRANCH_KEY=L"key_live_baZls7WShgt7WTbng8i58oibAtltTiuq";BRANCH_URI_SCHEME=L"testbedconan";MUTEX_NAME=L"6b10a31c-81c9-4642-aead-481f3705dd0b";_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\..\BranchSDK\src;%(AdditionalIncludeDirectories) - - - Windows - true - - - - - Level3 - true - true - true - BRANCH_KEY=L"key_live_baZls7WShgt7WTbng8i58oibAtltTiuq";BRANCH_URI_SCHEME=L"testbedconan";MUTEX_NAME=L"6b10a31c-81c9-4642-aead-481f3705dd0b";NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\..\BranchSDK\src;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4f51dc46-1a0e-467d-8ca4-af37e134c0a4} - - - - - - diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.vcxproj.filters b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.vcxproj.filters deleted file mode 100644 index b5c4836a..00000000 --- a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.vcxproj.filters +++ /dev/null @@ -1,82 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - Resource Files - - - Resource Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.vcxproj.user b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.vcxproj.user deleted file mode 100644 index 88a55094..00000000 --- a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Conan/conanfile.txt b/BranchSDK-Samples/TestBed-Conan/conanfile.txt deleted file mode 100644 index b2f9e47e..00000000 --- a/BranchSDK-Samples/TestBed-Conan/conanfile.txt +++ /dev/null @@ -1,17 +0,0 @@ -[requires] -Poco/[~=1.10.1]@pocoproject/stable - -[options] -*:shared=False -Poco:enable_crypto=False -Poco:enable_data=False -Poco:enable_data_mysql=False -Poco:enable_data_odbc=False -Poco:enable_data_postgresql=False -Poco:enable_data_sqlite=False -Poco:enable_encodings=False -Poco:enable_jwt=False -Poco:enable_mongodb=False -Poco:enable_netssl=False -Poco:enable_redis=False -Poco:enable_zip=False diff --git a/BranchSDK-Samples/TestBed-Conan/example.html b/BranchSDK-Samples/TestBed-Conan/example.html deleted file mode 100644 index 36e93043..00000000 --- a/BranchSDK-Samples/TestBed-Conan/example.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - https://sptrs.app.link/87B92QU2Eeb - - diff --git a/BranchSDK-Samples/TestBed-Conan/framework.h b/BranchSDK-Samples/TestBed-Conan/framework.h deleted file mode 100644 index 33a6be64..00000000 --- a/BranchSDK-Samples/TestBed-Conan/framework.h +++ /dev/null @@ -1,15 +0,0 @@ -// header.h : include file for standard system include files, -// or project specific include files -// - -#pragma once - -#include "targetver.h" -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -// Windows Header Files -#include -// C RunTime Header Files -#include -#include -#include -#include diff --git a/BranchSDK-Samples/TestBed-Conan/small.ico b/BranchSDK-Samples/TestBed-Conan/small.ico deleted file mode 100644 index cecb6085..00000000 Binary files a/BranchSDK-Samples/TestBed-Conan/small.ico and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Conan/targetver.h b/BranchSDK-Samples/TestBed-Conan/targetver.h deleted file mode 100644 index bf75e089..00000000 --- a/BranchSDK-Samples/TestBed-Conan/targetver.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -// // Including SDKDDKVer.h defines the highest available Windows platform. -// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and -// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. -#include diff --git a/BranchSDK-Samples/TestBed-Distro/Resource.h b/BranchSDK-Samples/TestBed-Distro/Resource.h deleted file mode 100644 index 8fbade72..00000000 --- a/BranchSDK-Samples/TestBed-Distro/Resource.h +++ /dev/null @@ -1,28 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by TestBed-Distro.rc -// -#define IDC_MYICON 2 -#define IDD_TESTBEDDISTRO_DIALOG 102 -#define IDS_APP_TITLE 103 -#define IDD_ABOUTBOX 103 -#define IDM_ABOUT 104 -#define IDM_EXIT 105 -#define IDI_TESTBEDDISTRO 107 -#define IDI_SMALL 108 -#define IDC_TESTBEDDISTRO 109 -#define IDC_TESTBED 109 -#define IDR_MAINFRAME 128 -#define IDC_STATIC -1 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 129 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/Product.wxs b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/Product.wxs deleted file mode 100644 index 82db9797..00000000 --- a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/Product.wxs +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/TestBed-Distro-Package.wixproj b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/TestBed-Distro-Package.wixproj deleted file mode 100644 index 5fcedd9d..00000000 --- a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/TestBed-Distro-Package.wixproj +++ /dev/null @@ -1,62 +0,0 @@ - - - - Debug - x86 - 3.10 - ac67aa34-e2de-470d-bd7d-b87218da186d - 2.0 - TestBed-Basic - Package - true - - - bin\$(Configuration)\ - obj\$(Configuration)\ - Debug - - - bin\$(Configuration)\ - obj\$(Configuration)\ - - - - - - - - TestBed-Basic - {f3a5bf87-3e17-4fb9-9002-86a5aba3ab9c} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - - - - - - - - - - - - - - diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/WixUI_InstallDir_NoLic.wxs b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/WixUI_InstallDir_NoLic.wxs deleted file mode 100644 index 94d3c4c6..00000000 --- a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/WixUI_InstallDir_NoLic.wxs +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - "1"]]> - - 1 - - NOT Installed - Installed AND PATCH - - 1 - 1 - NOT WIXUI_DONTVALIDATEPATH - "1"]]> - WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" - 1 - 1 - - NOT Installed - Installed AND NOT PATCH - Installed AND PATCH - - 1 - - 1 - 1 - 1 - - - - - - - diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/branch-background.bmp b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/branch-background.bmp deleted file mode 100644 index 66ca08b4..00000000 Binary files a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/branch-background.bmp and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/branch-badge-dark.ico b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/branch-badge-dark.ico deleted file mode 100644 index 432dca48..00000000 Binary files a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/branch-badge-dark.ico and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/branch-banner.bmp b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/branch-banner.bmp deleted file mode 100644 index d2232833..00000000 Binary files a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/branch-banner.bmp and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.h b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.h deleted file mode 100644 index d00d47e7..00000000 --- a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "resource.h" diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.ico b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.ico deleted file mode 100644 index cecb6085..00000000 Binary files a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.ico and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.rc b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.rc deleted file mode 100644 index aa144da4..00000000 Binary files a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.rc and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.sln b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.sln deleted file mode 100644 index 27fb082b..00000000 --- a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.sln +++ /dev/null @@ -1,52 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30907.101 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestBed-Distro", "TestBed-Distro.vcxproj", "{F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}" - ProjectSection(ProjectDependencies) = postProject - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4} = {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4} - EndProjectSection -EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "TestBed-Distro-Package", "TestBed-Distro-Package\TestBed-Distro-Package.wixproj", "{AC67AA34-E2DE-470D-BD7D-B87218DA186D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BranchIO-Static", "..\..\BranchSDK\Windows\BranchIO-Static\BranchIO-Static.vcxproj", "{4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}" -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 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x64.ActiveCfg = Debug|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x64.Build.0 = Debug|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x86.ActiveCfg = Debug|Win32 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x86.Build.0 = Debug|Win32 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x64.ActiveCfg = Release|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x64.Build.0 = Release|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x86.ActiveCfg = Release|Win32 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x86.Build.0 = Release|Win32 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Debug|x64.ActiveCfg = Debug|x86 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Debug|x86.ActiveCfg = Debug|x86 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Debug|x86.Build.0 = Debug|x86 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Release|x64.ActiveCfg = Release|x86 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Release|x86.ActiveCfg = Release|x86 - {AC67AA34-E2DE-470D-BD7D-B87218DA186D}.Release|x86.Build.0 = Release|x86 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x64.ActiveCfg = Debug|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x64.Build.0 = Debug|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x86.ActiveCfg = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x86.Build.0 = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x64.ActiveCfg = Release|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x64.Build.0 = Release|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x86.ActiveCfg = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DF001862-7726-4148-8302-0695AE7DE9AC} - EndGlobalSection -EndGlobal diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.vcxproj b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.vcxproj deleted file mode 100644 index feed22cd..00000000 --- a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.vcxproj +++ /dev/null @@ -1,198 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {f3a5bf87-3e17-4fb9-9002-86a5aba3ab9c} - TestBedDistro - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - TestBed - - - false - TestBed - - - true - TestBed - - - false - TestBed - - - - Level3 - true - BRANCH_KEY=L"key_live_oiT8IkxqCmpGcDT35ttO1fkdExktZD1x";BRANCH_URI_SCHEME=L"testbed";MUTEX_NAME=L"48b0a2b3-2b0e-4fe1-af2e-da21cd050946";DEBUG;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) - - - Windows - true - C:\Program Files (x86)\Branch SDK\lib\x86\Debug;%(AdditionalLibraryDirectories) - PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - $(OutDir)TestBed$(TargetExt) - $(OutDir)TestBed.pdb - - - - - Level3 - true - true - true - BRANCH_KEY=L"key_live_oiT8IkxqCmpGcDT35ttO1fkdExktZD1x";BRANCH_URI_SCHEME=L"testbed";MUTEX_NAME=L"48b0a2b3-2b0e-4fe1-af2e-da21cd050946";POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - C:\Program Files (x86)\Branch SDK\lib\x86\Release;%(AdditionalLibraryDirectories) - PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - $(OutDir)TestBed$(TargetExt) - - - - - Level3 - true - BRANCH_KEY=L"key_live_oiT8IkxqCmpGcDT35ttO1fkdExktZD1x";BRANCH_URI_SCHEME=L"testbed";MUTEX_NAME=L"48b0a2b3-2b0e-4fe1-af2e-da21cd050946";DEBUG;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) - - - Windows - true - C:\Program Files (x86)\Branch SDK\lib\x64\Debug;%(AdditionalLibraryDirectories) - PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - $(OutDir)$(TargetName).pdb - - - - - Level3 - true - true - true - BRANCH_KEY=L"key_live_oiT8IkxqCmpGcDT35ttO1fkdExktZD1x";BRANCH_URI_SCHEME=L"testbed";MUTEX_NAME=L"48b0a2b3-2b0e-4fe1-af2e-da21cd050946";POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - C:\Program Files (x86)\Branch SDK\lib\x64\Release;%(AdditionalLibraryDirectories) - PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - $(OutDir)TestBed$(TargetExt) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4f51dc46-1a0e-467d-8ca4-af37e134c0a4} - - - - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.vcxproj.filters b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.vcxproj.filters deleted file mode 100644 index b8dcc6b8..00000000 --- a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.vcxproj.filters +++ /dev/null @@ -1,82 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - Resource Files - - - Resource Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.vcxproj.user b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.vcxproj.user deleted file mode 100644 index 88a55094..00000000 --- a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Distro/Welcome.html b/BranchSDK-Samples/TestBed-Distro/Welcome.html deleted file mode 100644 index 9bd4b650..00000000 --- a/BranchSDK-Samples/TestBed-Distro/Welcome.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - -

Welcome to the Branch Metrics C++/Win32 SDK

-

Release 1.2.3

- - - - - - - - - - - - - - - - - - - -
- Getting Started -
- Open Demo App from a Branch Link -
- Branch Dashboard -
- Source Code (GitHub) -
- Branch Support -
- SDK Reference Documentation -
- - diff --git a/BranchSDK-Samples/TestBed-Distro/branch-badge-dark.png b/BranchSDK-Samples/TestBed-Distro/branch-badge-dark.png deleted file mode 100644 index ad3513dd..00000000 Binary files a/BranchSDK-Samples/TestBed-Distro/branch-badge-dark.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Distro/framework.h b/BranchSDK-Samples/TestBed-Distro/framework.h deleted file mode 100644 index 33a6be64..00000000 --- a/BranchSDK-Samples/TestBed-Distro/framework.h +++ /dev/null @@ -1,15 +0,0 @@ -// header.h : include file for standard system include files, -// or project specific include files -// - -#pragma once - -#include "targetver.h" -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -// Windows Header Files -#include -// C RunTime Header Files -#include -#include -#include -#include diff --git a/BranchSDK-Samples/TestBed-Distro/small.ico b/BranchSDK-Samples/TestBed-Distro/small.ico deleted file mode 100644 index cecb6085..00000000 Binary files a/BranchSDK-Samples/TestBed-Distro/small.ico and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Distro/targetver.h b/BranchSDK-Samples/TestBed-Distro/targetver.h deleted file mode 100644 index bf75e089..00000000 --- a/BranchSDK-Samples/TestBed-Distro/targetver.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -// // Including SDKDDKVer.h defines the highest available Windows platform. -// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and -// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. -#include diff --git a/BranchSDK-Samples/TestBed-Local/Resource.h b/BranchSDK-Samples/TestBed-Local/Resource.h deleted file mode 100644 index 66c9d913..00000000 --- a/BranchSDK-Samples/TestBed-Local/Resource.h +++ /dev/null @@ -1,28 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by TestBed-Local.rc -// -#define IDC_MYICON 2 -#define IDD_TESTBEDLOCAL_DIALOG 102 -#define IDS_APP_TITLE 103 -#define IDD_ABOUTBOX 103 -#define IDM_ABOUT 104 -#define IDM_EXIT 105 -#define IDI_TESTBEDLOCAL 107 -#define IDI_SMALL 108 -#define IDC_TESTBEDLOCAL 109 -#define IDC_TESTBED 109 -#define IDR_MAINFRAME 128 -#define IDC_STATIC -1 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 129 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif diff --git a/BranchSDK-Samples/TestBed-Local/TestBed-Local.h b/BranchSDK-Samples/TestBed-Local/TestBed-Local.h deleted file mode 100644 index d00d47e7..00000000 --- a/BranchSDK-Samples/TestBed-Local/TestBed-Local.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "resource.h" diff --git a/BranchSDK-Samples/TestBed-Local/TestBed-Local.ico b/BranchSDK-Samples/TestBed-Local/TestBed-Local.ico deleted file mode 100644 index cecb6085..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/TestBed-Local.ico and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/TestBed-Local.rc b/BranchSDK-Samples/TestBed-Local/TestBed-Local.rc deleted file mode 100644 index ec804cc6..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/TestBed-Local.rc and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/TestBed-Local.sln b/BranchSDK-Samples/TestBed-Local/TestBed-Local.sln deleted file mode 100644 index 270c449e..00000000 --- a/BranchSDK-Samples/TestBed-Local/TestBed-Local.sln +++ /dev/null @@ -1,94 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30907.101 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestBed-Local", "TestBed-Local.vcxproj", "{A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}" - ProjectSection(ProjectDependencies) = postProject - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4} = {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4} - EndProjectSection -EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "TestBedLocalPackage", "TestBedLocalPackage\TestBedLocalPackage.wapproj", "{632B837A-0D8A-449A-B2C3-6A7297C965C4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BranchIO-Static", "..\..\BranchSDK\Windows\BranchIO-Static\BranchIO-Static.vcxproj", "{4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|ARM64 = Release|ARM64 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Debug|ARM.ActiveCfg = Debug|Win32 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Debug|ARM64.ActiveCfg = Debug|Win32 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Debug|x64.ActiveCfg = Debug|x64 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Debug|x64.Build.0 = Debug|x64 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Debug|x86.ActiveCfg = Debug|Win32 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Debug|x86.Build.0 = Debug|Win32 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Release|Any CPU.ActiveCfg = Release|Win32 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Release|ARM.ActiveCfg = Release|Win32 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Release|ARM64.ActiveCfg = Release|Win32 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Release|x64.ActiveCfg = Release|x64 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Release|x64.Build.0 = Release|x64 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Release|x86.ActiveCfg = Release|Win32 - {A0F2D1C6-88AD-4FBD-AF84-044B27F61AC9}.Release|x86.Build.0 = Release|Win32 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|ARM.ActiveCfg = Debug|ARM - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|ARM.Build.0 = Debug|ARM - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|ARM.Deploy.0 = Debug|ARM - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|ARM64.Build.0 = Debug|ARM64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|x64.ActiveCfg = Debug|x64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|x64.Build.0 = Debug|x64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|x64.Deploy.0 = Debug|x64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|x86.ActiveCfg = Debug|x86 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|x86.Build.0 = Debug|x86 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Debug|x86.Deploy.0 = Debug|x86 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|Any CPU.Build.0 = Release|Any CPU - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|Any CPU.Deploy.0 = Release|Any CPU - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|ARM.ActiveCfg = Release|ARM - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|ARM.Build.0 = Release|ARM - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|ARM.Deploy.0 = Release|ARM - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|ARM64.ActiveCfg = Release|ARM64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|ARM64.Build.0 = Release|ARM64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|ARM64.Deploy.0 = Release|ARM64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|x64.ActiveCfg = Release|x64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|x64.Build.0 = Release|x64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|x64.Deploy.0 = Release|x64 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|x86.ActiveCfg = Release|x86 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|x86.Build.0 = Release|x86 - {632B837A-0D8A-449A-B2C3-6A7297C965C4}.Release|x86.Deploy.0 = Release|x86 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|ARM.ActiveCfg = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|ARM64.ActiveCfg = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x64.ActiveCfg = Debug|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x64.Build.0 = Debug|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x86.ActiveCfg = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x86.Build.0 = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|Any CPU.ActiveCfg = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|ARM.ActiveCfg = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|ARM64.ActiveCfg = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x64.ActiveCfg = Release|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x64.Build.0 = Release|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x86.ActiveCfg = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9AD37D5B-1968-4EAB-9163-320CEEC7885E} - EndGlobalSection -EndGlobal diff --git a/BranchSDK-Samples/TestBed-Local/TestBed-Local.vcxproj b/BranchSDK-Samples/TestBed-Local/TestBed-Local.vcxproj deleted file mode 100644 index 47815c5b..00000000 --- a/BranchSDK-Samples/TestBed-Local/TestBed-Local.vcxproj +++ /dev/null @@ -1,188 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {a0f2d1c6-88ad-4fbd-af84-044b27f61ac9} - TestBedLocal - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - - - false - - - - Level3 - true - BRANCH_KEY=L"key_live_og1djX2V7XDJ7bWkeGnD5enbxAiq4hcG";BRANCH_URI_SCHEME=L"testbedlocal";MUTEX_NAME=L"0c1f7da5-579a-4e4d-99cc-b34b62712ab7";DEBUG;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include; - - - Windows - true - C:\Program Files (x86)\Branch SDK\lib\x86\Debug;%(AdditionalLibraryDirectories) - PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - true - BRANCH_KEY=L"key_live_og1djX2V7XDJ7bWkeGnD5enbxAiq4hcG";BRANCH_URI_SCHEME=L"testbedlocal";MUTEX_NAME=L"0c1f7da5-579a-4e4d-99cc-b34b62712ab7";POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include; - - - Windows - true - true - true - C:\Program Files (x86)\Branch SDK\lib\x86\Release;%(AdditionalLibraryDirectories) - PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level3 - true - BRANCH_KEY=L"key_live_og1djX2V7XDJ7bWkeGnD5enbxAiq4hcG";BRANCH_URI_SCHEME=L"testbedlocal";MUTEX_NAME=L"0c1f7da5-579a-4e4d-99cc-b34b62712ab7";WIN32;DEBUG;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) - - - Windows - true - C:\Program Files (x86)\Branch SDK\lib\x64\Debug;%(AdditionalLibraryDirectories) - PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level3 - true - true - true - BRANCH_KEY=L"key_live_og1djX2V7XDJ7bWkeGnD5enbxAiq4hcG";BRANCH_URI_SCHEME=L"testbedlocal";MUTEX_NAME=L"0c1f7da5-579a-4e4d-99cc-b34b62712ab7";WIN32;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - ..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include; - - - Windows - true - true - true - C:\Program Files (x86)\Branch SDK\lib\x64\Release;%(AdditionalLibraryDirectories) - PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4f51dc46-1a0e-467d-8ca4-af37e134c0a4} - - - - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Local/TestBed-Local.vcxproj.filters b/BranchSDK-Samples/TestBed-Local/TestBed-Local.vcxproj.filters deleted file mode 100644 index c97770fb..00000000 --- a/BranchSDK-Samples/TestBed-Local/TestBed-Local.vcxproj.filters +++ /dev/null @@ -1,82 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Local/TestBed-Local.vcxproj.user b/BranchSDK-Samples/TestBed-Local/TestBed-Local.vcxproj.user deleted file mode 100644 index 88a55094..00000000 --- a/BranchSDK-Samples/TestBed-Local/TestBed-Local.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Branch.pfx b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Branch.pfx deleted file mode 100644 index 57139d59..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Branch.pfx and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/LockScreenLogo.scale-200.png b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/LockScreenLogo.scale-200.png deleted file mode 100644 index 27abe9a8..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/SplashScreen.scale-200.png b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/SplashScreen.scale-200.png deleted file mode 100644 index 11453727..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/SplashScreen.scale-200.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Square150x150Logo.scale-200.png b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Square150x150Logo.scale-200.png deleted file mode 100644 index 8fdb52b7..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Square44x44Logo.scale-200.png b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Square44x44Logo.scale-200.png deleted file mode 100644 index 8832bf9c..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index 40870d39..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/StoreLogo.png b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/StoreLogo.png deleted file mode 100644 index a0788494..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/StoreLogo.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Wide310x150Logo.scale-200.png b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Wide310x150Logo.scale-200.png deleted file mode 100644 index 03cfbd8d..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Images/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Package.appxmanifest b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Package.appxmanifest deleted file mode 100644 index 65ca3839..00000000 --- a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Package.appxmanifest +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - Branch TestBed (Local) - Branch Metrics - Images\StoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/TestBedLocalPackage.wapproj b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/TestBedLocalPackage.wapproj deleted file mode 100644 index 0e7e62fb..00000000 --- a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/TestBedLocalPackage.wapproj +++ /dev/null @@ -1,81 +0,0 @@ - - - - 15.0 - - - - Debug - x86 - - - Release - x86 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM - - - Release - ARM - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - AnyCPU - - - Release - AnyCPU - - - - $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ - - - - 632b837a-0d8a-449a-b2c3-6a7297c965c4 - 10.0.18362.0 - 10.0.17763.0 - en-US - True - ..\TestBed-Local.vcxproj - 8132C1C16AAB24EB2CA9CC95BBA6ADA1C2C0A930 - Branch.pfx - - - - Designer - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/TestBedLocalPackage.wapproj.user b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/TestBedLocalPackage.wapproj.user deleted file mode 100644 index 88a55094..00000000 --- a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/TestBedLocalPackage.wapproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/BranchSDK-Samples/TestBed-Local/example.html b/BranchSDK-Samples/TestBed-Local/example.html deleted file mode 100644 index 29258b26..00000000 --- a/BranchSDK-Samples/TestBed-Local/example.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - https://rzc2g.app.link/KHxB9RHGldb - - diff --git a/BranchSDK-Samples/TestBed-Local/framework.h b/BranchSDK-Samples/TestBed-Local/framework.h deleted file mode 100644 index 33a6be64..00000000 --- a/BranchSDK-Samples/TestBed-Local/framework.h +++ /dev/null @@ -1,15 +0,0 @@ -// header.h : include file for standard system include files, -// or project specific include files -// - -#pragma once - -#include "targetver.h" -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -// Windows Header Files -#include -// C RunTime Header Files -#include -#include -#include -#include diff --git a/BranchSDK-Samples/TestBed-Local/small.ico b/BranchSDK-Samples/TestBed-Local/small.ico deleted file mode 100644 index cecb6085..00000000 Binary files a/BranchSDK-Samples/TestBed-Local/small.ico and /dev/null differ diff --git a/BranchSDK-Samples/TestBed-Local/targetver.h b/BranchSDK-Samples/TestBed-Local/targetver.h deleted file mode 100644 index bf75e089..00000000 --- a/BranchSDK-Samples/TestBed-Local/targetver.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -// // Including SDKDDKVer.h defines the highest available Windows platform. -// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and -// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. -#include diff --git a/BranchSDK-Samples/TestBed/BranchOperations.cpp b/BranchSDK-Samples/TestBed/BranchOperations.cpp index 9b1d4e53..28bd38a2 100644 --- a/BranchSDK-Samples/TestBed/BranchOperations.cpp +++ b/BranchSDK-Samples/TestBed/BranchOperations.cpp @@ -26,9 +26,12 @@ BranchOperations::setupSDKLogging(const std::string& filename) { // Note: Debug and Verbose levels compiled out in Release builds Log::setLevel(Log::Verbose); - const char* appDataPath = getenv("LocalAppData"); + char* appDataPath = nullptr; + size_t size = 0; + _dupenv_s(&appDataPath, &size, "LocalAppData"); + string branchLogFilePath; - if (appDataPath) { + if (appDataPath != nullptr) { /* * By default, put log file in %LocalAppData%\Branch, e.g. C:\Users\\AppData\Local\Branch */ diff --git a/BranchSDK-Samples/TestBed/TestBed.sln b/BranchSDK-Samples/TestBed/TestBed.sln index 26e1e62a..8dcef848 100644 --- a/BranchSDK-Samples/TestBed/TestBed.sln +++ b/BranchSDK-Samples/TestBed/TestBed.sln @@ -14,11 +14,21 @@ Global Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + DebugMT|Any CPU = DebugMT|Any CPU + DebugMT|ARM = DebugMT|ARM + DebugMT|ARM64 = DebugMT|ARM64 + DebugMT|x64 = DebugMT|x64 + DebugMT|x86 = DebugMT|x86 Release|Any CPU = Release|Any CPU Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 + ReleaseMT|Any CPU = ReleaseMT|Any CPU + ReleaseMT|ARM = ReleaseMT|ARM + ReleaseMT|ARM64 = ReleaseMT|ARM64 + ReleaseMT|x64 = ReleaseMT|x64 + ReleaseMT|x86 = ReleaseMT|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {331C6BD5-1CB9-47D9-8414-A85266F062D2}.Debug|Any CPU.ActiveCfg = Debug|Win32 @@ -28,6 +38,13 @@ Global {331C6BD5-1CB9-47D9-8414-A85266F062D2}.Debug|x64.Build.0 = Debug|x64 {331C6BD5-1CB9-47D9-8414-A85266F062D2}.Debug|x86.ActiveCfg = Debug|Win32 {331C6BD5-1CB9-47D9-8414-A85266F062D2}.Debug|x86.Build.0 = Debug|Win32 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.DebugMT|Any CPU.ActiveCfg = DebugMT|Win32 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.DebugMT|ARM.ActiveCfg = DebugMT|Win32 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.DebugMT|ARM64.ActiveCfg = DebugMT|Win32 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.DebugMT|x64.ActiveCfg = DebugMT|x64 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.DebugMT|x64.Build.0 = DebugMT|x64 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.DebugMT|x86.ActiveCfg = DebugMT|Win32 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.DebugMT|x86.Build.0 = DebugMT|Win32 {331C6BD5-1CB9-47D9-8414-A85266F062D2}.Release|Any CPU.ActiveCfg = Release|Win32 {331C6BD5-1CB9-47D9-8414-A85266F062D2}.Release|ARM.ActiveCfg = Release|Win32 {331C6BD5-1CB9-47D9-8414-A85266F062D2}.Release|ARM64.ActiveCfg = Release|Win32 @@ -35,6 +52,13 @@ Global {331C6BD5-1CB9-47D9-8414-A85266F062D2}.Release|x64.Build.0 = Release|x64 {331C6BD5-1CB9-47D9-8414-A85266F062D2}.Release|x86.ActiveCfg = Release|Win32 {331C6BD5-1CB9-47D9-8414-A85266F062D2}.Release|x86.Build.0 = Release|Win32 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.ReleaseMT|Any CPU.ActiveCfg = ReleaseMT|Win32 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.ReleaseMT|ARM.ActiveCfg = ReleaseMT|Win32 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.ReleaseMT|ARM64.ActiveCfg = ReleaseMT|Win32 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.ReleaseMT|x64.ActiveCfg = ReleaseMT|x64 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.ReleaseMT|x64.Build.0 = ReleaseMT|x64 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.ReleaseMT|x86.ActiveCfg = ReleaseMT|Win32 + {331C6BD5-1CB9-47D9-8414-A85266F062D2}.ReleaseMT|x86.Build.0 = ReleaseMT|Win32 {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -50,6 +74,21 @@ Global {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Debug|x86.ActiveCfg = Debug|x86 {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Debug|x86.Build.0 = Debug|x86 {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Debug|x86.Deploy.0 = Debug|x86 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|Any CPU.ActiveCfg = DebugMT|Any CPU + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|Any CPU.Build.0 = DebugMT|Any CPU + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|Any CPU.Deploy.0 = DebugMT|Any CPU + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|ARM.ActiveCfg = DebugMT|ARM + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|ARM.Build.0 = DebugMT|ARM + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|ARM.Deploy.0 = DebugMT|ARM + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|ARM64.ActiveCfg = DebugMT|ARM64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|ARM64.Build.0 = DebugMT|ARM64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|ARM64.Deploy.0 = DebugMT|ARM64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|x64.ActiveCfg = DebugMT|x64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|x64.Build.0 = DebugMT|x64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|x64.Deploy.0 = DebugMT|x64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|x86.ActiveCfg = DebugMT|x86 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|x86.Build.0 = DebugMT|x86 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.DebugMT|x86.Deploy.0 = DebugMT|x86 {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Release|Any CPU.Build.0 = Release|Any CPU {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Release|Any CPU.Deploy.0 = Release|Any CPU @@ -65,6 +104,21 @@ Global {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Release|x86.ActiveCfg = Release|x86 {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Release|x86.Build.0 = Release|x86 {2273973C-F44B-426A-BFF6-F24ECBB353D8}.Release|x86.Deploy.0 = Release|x86 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|Any CPU.ActiveCfg = ReleaseMT|Any CPU + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|Any CPU.Build.0 = ReleaseMT|Any CPU + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|Any CPU.Deploy.0 = ReleaseMT|Any CPU + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|ARM.ActiveCfg = ReleaseMT|ARM + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|ARM.Build.0 = ReleaseMT|ARM + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|ARM.Deploy.0 = ReleaseMT|ARM + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|ARM64.ActiveCfg = ReleaseMT|ARM64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|ARM64.Build.0 = ReleaseMT|ARM64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|ARM64.Deploy.0 = ReleaseMT|ARM64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|x64.ActiveCfg = ReleaseMT|x64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|x64.Build.0 = ReleaseMT|x64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|x64.Deploy.0 = ReleaseMT|x64 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|x86.ActiveCfg = ReleaseMT|x86 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|x86.Build.0 = ReleaseMT|x86 + {2273973C-F44B-426A-BFF6-F24ECBB353D8}.ReleaseMT|x86.Deploy.0 = ReleaseMT|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BranchSDK-Samples/TestBed/TestBed.vcxproj b/BranchSDK-Samples/TestBed/TestBed.vcxproj index 61a5fb6f..845b8b58 100644 --- a/BranchSDK-Samples/TestBed/TestBed.vcxproj +++ b/BranchSDK-Samples/TestBed/TestBed.vcxproj @@ -1,10 +1,26 @@ + + DebugMT + Win32 + + + DebugMT + x64 + Debug Win32 + + ReleaseMT + Win32 + + + ReleaseMT + x64 + Release Win32 @@ -32,6 +48,12 @@ v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -39,12 +61,25 @@ true Unicode + + Application + false + v142 + true + Unicode + Application true v142 Unicode + + Application + true + v142 + Unicode + Application false @@ -52,6 +87,13 @@ true Unicode + + Application + false + v142 + true + Unicode + @@ -60,28 +102,52 @@ + + + + + + + + + + + + true + + true + false + + false + true + + true + false + + false + Level3 @@ -97,6 +163,21 @@ BranchIOmdd.lib;PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) + + + Level3 + true + BRANCH_KEY=L"key_live_oiT8IkxqCmpGcDT35ttO1fkdExktZD1x";BRANCH_URI_SCHEME=L"testbed";MUTEX_NAME=L"48b0a2b3-2b0e-4fe1-af2e-da21cd050946";WIN32;DEBUG;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) + + + Windows + true + C:\Program Files %28x86%29\Branch SDK\lib\x86\Debug;%(AdditionalLibraryDirectories) + BranchIOmdd.lib;PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) + + Level3 @@ -116,6 +197,25 @@ BranchIOmd.lib;PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) + + + Level3 + true + true + true + BRANCH_KEY=L"key_live_oiT8IkxqCmpGcDT35ttO1fkdExktZD1x";BRANCH_URI_SCHEME=L"testbed";MUTEX_NAME=L"48b0a2b3-2b0e-4fe1-af2e-da21cd050946";WIN32;NDEBUG;POCO_STATIC=ON;POCO_NO_DYNAMIC_LIBS;_WINDOWS;%(PreprocessorDefinitions) + true + C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + C:\Program Files %28x86%29\Branch SDK\lib\x86\Release;%(AdditionalLibraryDirectories) + BranchIOmd.lib;PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) + + Level3 @@ -127,10 +227,26 @@ Windows true - C:\Program Files %28x86%29\Branch SDK\lib\x64\Debug;%(AdditionalLibraryDirectories) + C:\Program Files %28x86%29\Branch SDK\lib\MDd_64;%(AdditionalLibraryDirectories) BranchIOmdd.lib;PocoNetSSLWinmdd.lib;PocoJSONmdd.lib;PocoFoundationmdd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) + + + Level3 + true + BRANCH_KEY=L"key_live_oiT8IkxqCmpGcDT35ttO1fkdExktZD1x";BRANCH_URI_SCHEME=L"testbed";MUTEX_NAME=L"48b0a2b3-2b0e-4fe1-af2e-da21cd050946";DEBUG;POCO_STATIC=ON;POCO_NO_AUTOMATIC_LIBS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Windows + true + C:\Program Files %28x86%29\Branch SDK\lib\MTd_64;%(AdditionalLibraryDirectories) + BranchIOmtd.lib;PocoNetSSLWinmtd.lib;PocoJSONmtd.lib;PocoFoundationmtd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) + + Level3 @@ -146,10 +262,30 @@ true true true - C:\Program Files %28x86%29\Branch SDK\lib\x64\Release;%(AdditionalLibraryDirectories) + C:\Program Files %28x86%29\Branch SDK\lib\MD_64;%(AdditionalLibraryDirectories) BranchIOmd.lib;PocoNetSSLWinmd.lib;PocoJSONmd.lib;PocoFoundationmd.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) + + + Level3 + true + true + true + BRANCH_KEY=L"key_live_oiT8IkxqCmpGcDT35ttO1fkdExktZD1x";BRANCH_URI_SCHEME=L"testbed";MUTEX_NAME=L"48b0a2b3-2b0e-4fe1-af2e-da21cd050946";NDEBUG;POCO_STATIC=ON;POCO_NO_DYNAMIC_LIBS;_WINDOWS;%(PreprocessorDefinitions) + true + C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Windows + true + true + true + C:\Program Files %28x86%29\Branch SDK\lib\MT_64;%(AdditionalLibraryDirectories) + BranchIOmt.lib;PocoNetSSLWinmt.lib;PocoJSONmt.lib;PocoFoundationmt.lib;Iphlpapi.lib;crypt32.lib;ws2_32.lib;%(AdditionalDependencies) + + diff --git a/BranchSDK-Samples/TestBed/TestBedPackage/TestBedPackage.wapproj b/BranchSDK-Samples/TestBed/TestBedPackage/TestBedPackage.wapproj index 9686a3f9..ee59a927 100644 --- a/BranchSDK-Samples/TestBed/TestBedPackage/TestBedPackage.wapproj +++ b/BranchSDK-Samples/TestBed/TestBedPackage/TestBedPackage.wapproj @@ -4,10 +4,50 @@ 15.0 + + DebugMT + AnyCPU + + + DebugMT + ARM + + + DebugMT + ARM64 + + + DebugMT + x64 + + + DebugMT + x86 + Debug x86 + + ReleaseMT + AnyCPU + + + ReleaseMT + ARM + + + ReleaseMT + ARM64 + + + ReleaseMT + x64 + + + ReleaseMT + x86 + Release x86 diff --git a/BranchSDK-Samples/TestBed/TestBedPackage/TestBedPackage.wapproj.user b/BranchSDK-Samples/TestBed/TestBedPackage/TestBedPackage.wapproj.user index 77c565b6..9c853974 100644 --- a/BranchSDK-Samples/TestBed/TestBedPackage/TestBedPackage.wapproj.user +++ b/BranchSDK-Samples/TestBed/TestBedPackage/TestBedPackage.wapproj.user @@ -4,4 +4,8 @@ AppHostLocalDebugger False + + AppHostLocalDebugger + False + \ No newline at end of file diff --git a/BranchSDK/CMakeLists.txt b/BranchSDK/CMakeLists.txt index 0b7a0b6a..45410183 100644 --- a/BranchSDK/CMakeLists.txt +++ b/BranchSDK/CMakeLists.txt @@ -1,80 +1,88 @@ +cmake_minimum_required(VERSION 3.15) + +# Enables setting the MSVC runtime library +# https://cmake.org/cmake/help/latest/prop_tgt/MSVC_RUNTIME_LIBRARY.html +cmake_policy(SET CMP0091 NEW) + +# Debug or Release settings +# cmake/Debug.cmake, cmake/Release.cmake +include(cmake/${CMAKE_BUILD_TYPE}.cmake OPTIONAL) + project(BranchIO) +# Enable C++ exceptions +add_compile_options(/EHsc) + +# Make dependencies available via conan +# TODO: TARGETS based version does not work, why? +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +conan_basic_setup() +#conan_basic_setup(TARGETS) + # ------------ # BranchIO SDK # ------------ -# Scan for source code +# BranchIO library include_directories(src) -file(GLOB ALL_BRANCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/BranchIO/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/BranchIO/**/*.cpp) -set(BRANCH_SOURCE "") - -# Scan all file names looking specifically for "Windows" or "Unix", and exclude from the other type of build. -# i.e. exclude Unix files from Windows builds, and vice versa. -# TODO(jdee): Clean this up -if(${CMAKE_SYSTEM_NAME} MATCHES "Win") - add_definitions(-DWIN32) - foreach(FILE ${ALL_BRANCH_SOURCE}) - if (NOT ${FILE} MATCHES "Unix") - set(BRANCH_SOURCE ${BRANCH_SOURCE} ${FILE}) - endif() - endforeach() -else() - foreach(FILE ${ALL_BRANCH_SOURCE}) - if (NOT ${FILE} MATCHES "Windows") - set(BRANCH_SOURCE ${BRANCH_SOURCE} ${FILE}) - endif() - endforeach() -endif() - -# Static/Shared controlled by BUILD_SHARED_LIBS -# BUILD_SHARED_LIBS is passed in through the initial configure step (cmake ../.. -G ...) in rmake[.bat]. -# It is enabled by Conan using the shared option (conan install -o BranchIO:shared=true). -# true: BranchIO.lib/BranchIO.dll on Windows, libBranchIO.dylib on Mac, libBranchIO.so on Linux -# false: BranchIO.lib on Windows, libBranchIO.a on Unix +file(GLOB BRANCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/src/BranchIO/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/BranchIO/**/*.cpp) add_library(BranchIO ${BRANCH_SOURCE}) -target_include_directories(BranchIO PRIVATE ${CONAN_INCLUDE_DIRS}) +# Links against Poco via conan +# TODO: TARGETS based version does not work, why? +target_link_libraries(BranchIO ${CONAN_LIBS}) +#target_link_libraries(BranchIO CONAN_PKG::Poco) -# Link the shared lib against Conan deps (ignored when BUILD_SHARED_LIBS=false) -target_link_libraries(BranchIO CONAN_PKG::Poco) +# Set C++ version +target_compile_features(BranchIO PUBLIC cxx_std_11) -# -------- -# Settings -# -------- +# Set MSVC runtime +# TODO: Can this be done via configuration? +if (RUNTIME STREQUAL "MD") + set_property(TARGET BranchIO PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDLL") -# Specialize build settings for libraries by platform -include(cmake/${CMAKE_SYSTEM_NAME}.cmake OPTIONAL) + # TODO: release postfix does not work, rename the binary later + set_target_properties(BranchIO PROPERTIES RELEASE_POSTFIX "md") +endif() -# ------------ -# Installation -# ------------ +if (RUNTIME STREQUAL "MDd") + set_property(TARGET BranchIO PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDebugDLL") + set_target_properties(BranchIO PROPERTIES DEBUG_POSTFIX "mdd") +endif() -if(NOT SKIP_INSTALL_ALL) - message(STATUS "Installing to ${CMAKE_INSTALL_PREFIX}") +if (RUNTIME STREQUAL "MT") + set_property(TARGET BranchIO PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded") - # https://cmake.org/cmake/help/v3.14/command/install.html - include(GNUInstallDirs) - install(TARGETS BranchIO) + # TODO: release postfix does not work, rename the binary later + set_target_properties(BranchIO PROPERTIES RELEASE_POSTFIX "mt") +endif() - # TODO(jdee): Refine public/internal header distinction. For now, recursively install everything as public. - install(DIRECTORY BranchIO DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/BranchIO FILES_MATCHING PATTERN "*.h") +if (RUNTIME STREQUAL "MTd") + set_property(TARGET BranchIO PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDebug") + set_target_properties(BranchIO PROPERTIES DEBUG_POSTFIX "mtd") endif() +# TODO: support DLLs. Check if LD and LDd are needed +#if (BUILD_SHARED_LIBS) +# set_target_properties(BranchIO PROPERTIES DEFINE_SYMBOL BRANCHIO_BUILD_DLL) +#endif() + # ---------- # Unit tests # ---------- +# TODO: fix the unit test setup + # Include test code -file(GLOB TEST ${CMAKE_CURRENT_SOURCE_DIR}/test/*.cpp) +#file(GLOB TEST ${CMAKE_CURRENT_SOURCE_DIR}/test/*.cpp) # When building a DLL on Windows, there are visibility issues. We'll always # have the need to unit-test internal stuff that we don't want to make # public with BRANCHIO_DLL_EXPORT. So we can't link unit tests against the # DLL. We could always build static, at least on Windows, even when building # shared libraries, but for now it seems best to build against source. -add_executable(unit_tests ${TEST} ${BRANCH_SOURCE}) -target_link_libraries(unit_tests CONAN_PKG::Poco CONAN_PKG::OpenSSL CONAN_PKG::gtest) +#add_executable(unit_tests ${TEST} ${BRANCH_SOURCE}) +#target_link_libraries(unit_tests CONAN_PKG::Poco CONAN_PKG::gtest) # Generates JUnit-style output in test_detail.xml, e.g. build/Debug/test_detail.xml. -add_test(NAME UnitTests COMMAND unit_tests --gtest_output=xml) +#add_test(NAME UnitTests COMMAND unit_tests --gtest_output=xml) diff --git a/BranchSDK/Doxyfile b/BranchSDK/Doxyfile index 1be42140..08eebdf8 100644 --- a/BranchSDK/Doxyfile +++ b/BranchSDK/Doxyfile @@ -1712,7 +1712,7 @@ EXTRA_SEARCH_MAPPINGS = # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output. # The default value is: YES. -GENERATE_LATEX = YES +GENERATE_LATEX = NO # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of diff --git a/BranchSDK/Visual Studio/BranchIO/BranchIO.sln b/BranchSDK/Visual Studio/BranchIO/BranchIO.sln new file mode 100644 index 00000000..371f5af2 --- /dev/null +++ b/BranchSDK/Visual Studio/BranchIO/BranchIO.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31911.196 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BranchIO", "BranchIO.vcxproj", "{4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + MD|x64 = MD|x64 + MDd|x64 = MDd|x64 + MT|x64 = MT|x64 + MTd|x64 = MTd|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.MD|x64.ActiveCfg = MD|x64 + {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.MD|x64.Build.0 = MD|x64 + {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.MDd|x64.ActiveCfg = MDd|x64 + {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.MDd|x64.Build.0 = MDd|x64 + {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.MT|x64.ActiveCfg = MT|x64 + {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.MT|x64.Build.0 = MT|x64 + {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.MTd|x64.ActiveCfg = MTd|x64 + {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.MTd|x64.Build.0 = MTd|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D374F95F-13B6-43D2-A65E-27625D8BA186} + EndGlobalSection +EndGlobal diff --git a/BranchSDK/Windows/BranchIO-Static/BranchIO-Static.vcxproj b/BranchSDK/Visual Studio/BranchIO/BranchIO.vcxproj similarity index 55% rename from BranchSDK/Windows/BranchIO-Static/BranchIO-Static.vcxproj rename to BranchSDK/Visual Studio/BranchIO/BranchIO.vcxproj index f322d0e5..54ddcfc2 100644 --- a/BranchSDK/Windows/BranchIO-Static/BranchIO-Static.vcxproj +++ b/BranchSDK/Visual Studio/BranchIO/BranchIO.vcxproj @@ -1,20 +1,36 @@ - - Debug + + MDd Win32 - - Release + + MTd Win32 - - Debug + + MTd x64 - - Release + + MT + Win32 + + + MT + x64 + + + MD + Win32 + + + MDd + x64 + + + MD x64 @@ -84,30 +100,56 @@ 16.0 Win32Proj {4f51dc46-1a0e-467d-8ca4-af37e134c0a4} - BranchIOStatic + BranchIO 10.0 - + StaticLibrary true v142 Unicode - + + StaticLibrary + true + v142 + Unicode + + + StaticLibrary + false + v142 + true + Unicode + + StaticLibrary false v142 true Unicode - + + StaticLibrary + true + v142 + Unicode + + StaticLibrary true v142 Unicode - + + StaticLibrary + false + v142 + true + Unicode + + StaticLibrary false v142 @@ -119,32 +161,57 @@ - + + + + - + - + - + + + + + + + + + + - + + true + + true - + false - + + false + + + true + + true + $(ProjectName) - + false - + + false + + Level3 true @@ -161,7 +228,45 @@ true - + + + Level3 + true + WIN32;POCO_NO_AUTOMATIC_LIBS;POCO_STATIC=ON;DEBUG;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + + + ..\..\BranchSDK\src;..\..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;$(ConanIncludeDirectories)%(AdditionalIncludeDirectories) + + + + + true + + + + + Level3 + true + true + true + WIN32;POCO_NO_AUTOMATIC_LIBS;POCO_STATIC=ON;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + + + ..\..\BranchSDK\src;..\..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) + + + + + true + true + true + + + Level3 true @@ -182,11 +287,11 @@ true - + Level3 true - WIN32;POCO_NO_AUTOMATIC_LIBS;POCO_STATIC=ON;DEBUG;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;BUILD_SHARED_LIBS=OFF;DEBUG;_DEBUG;_LIB;%(PreprocessorDefinitions) true NotUsing @@ -207,18 +312,66 @@ - + + + Level3 + true + WIN32;BUILD_SHARED_LIBS=OFF;POCO_MT=ON;DEBUG;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + + + ..\..\BranchSDK\src;..\..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + + + true + + + + + + + + + + + Level3 true true true - WIN32;POCO_NO_AUTOMATIC_LIBS;POCO_STATIC=ON;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;NDEBUG;BUILD_SHARED_LIBS=OFF;_LIB;%(PreprocessorDefinitions) + true + NotUsing + + + ..\..\BranchSDK\src;..\..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) + + + + + true + true + true + + + + + Level3 + true + true + true + WIN32;BUILD_SHARED_LIBS=OFF;POCO_MT=ON;NDEBUG;_LIB;%(PreprocessorDefinitions) true NotUsing ..\..\BranchSDK\src;..\..\..\BranchSDK\src;C:\Program Files (x86)\Branch SDK\include;%(AdditionalIncludeDirectories) + MultiThreaded diff --git a/BranchSDK/Windows/BranchIO-Static/BranchIO-Static.vcxproj.filters b/BranchSDK/Visual Studio/BranchIO/BranchIO.vcxproj.filters similarity index 100% rename from BranchSDK/Windows/BranchIO-Static/BranchIO-Static.vcxproj.filters rename to BranchSDK/Visual Studio/BranchIO/BranchIO.vcxproj.filters diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.vcxproj.user b/BranchSDK/Visual Studio/BranchIO/BranchIO.vcxproj.user similarity index 100% rename from BranchSDK-Samples/TestBed-Basic/TestBed-Basic.vcxproj.user rename to BranchSDK/Visual Studio/BranchIO/BranchIO.vcxproj.user diff --git a/BranchSDK/Windows/BranchIO-Static/BranchIO-Static.vcxproj.user b/BranchSDK/Windows/BranchIO-Static/BranchIO-Static.vcxproj.user deleted file mode 100644 index 88a55094..00000000 --- a/BranchSDK/Windows/BranchIO-Static/BranchIO-Static.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/BranchSDK/Windows/BranchInstaller/BranchInstaller.sln b/BranchSDK/Windows/BranchInstaller/BranchInstaller.sln deleted file mode 100644 index bef5837a..00000000 --- a/BranchSDK/Windows/BranchInstaller/BranchInstaller.sln +++ /dev/null @@ -1,55 +0,0 @@ - -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}" - ProjectSection(ProjectDependencies) = postProject - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C} = {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BranchIO-Static", "..\BranchIO-Static\BranchIO-Static.vcxproj", "{4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestBed-Distro", "..\..\..\BranchSDK-Samples\TestBed-Distro\TestBed-Distro.vcxproj", "{F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}" - ProjectSection(ProjectDependencies) = postProject - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4} = {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4} - EndProjectSection -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 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x64.ActiveCfg = Debug|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x64.Build.0 = Debug|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x86.ActiveCfg = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Debug|x86.Build.0 = Debug|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x64.ActiveCfg = Release|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x64.Build.0 = Release|x64 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x86.ActiveCfg = Release|Win32 - {4F51DC46-1A0E-467D-8CA4-AF37E134C0A4}.Release|x86.Build.0 = Release|Win32 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x64.ActiveCfg = Debug|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x64.Build.0 = Debug|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x86.ActiveCfg = Debug|Win32 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Debug|x86.Build.0 = Debug|Win32 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x64.ActiveCfg = Release|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x64.Build.0 = Release|x64 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x86.ActiveCfg = Release|Win32 - {F3A5BF87-3E17-4FB9-9002-86A5ABA3AB9C}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {15ADA861-9404-43EA-A10E-B5CC0E297D55} - EndGlobalSection -EndGlobal diff --git a/BranchSDK/Windows/BranchInstaller/Components.wxs b/BranchSDK/Windows/BranchInstaller/Components.wxs deleted file mode 100644 index e89ad4d1..00000000 --- a/BranchSDK/Windows/BranchInstaller/Components.wxs +++ /dev/null @@ -1,1347 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BranchSDK/Windows/BranchInstaller/Product.wxs b/BranchSDK/Windows/BranchInstaller/Product.wxs deleted file mode 100644 index ad91eafa..00000000 --- a/BranchSDK/Windows/BranchInstaller/Product.wxs +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BranchSDK/Windows/BranchInstaller/README.md b/BranchSDK/Windows/BranchInstaller/README.md deleted file mode 100644 index 4a8d2b0c..00000000 --- a/BranchSDK/Windows/BranchInstaller/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# BranchInstaller - -## Prerequisites - -The [WiX Toolset build tools](https://wixtoolset.org/releases) -The [WiX extension for Visual Studio](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2019Extension) - -## Build first with rmake - -It is necessary to build both Debug and Release for x86 and x64. To build -for each platform, use the appropriate Native Tools Command Prompt (x86 or x64). -In each window, run: - -``` -rmake Debug -rmake Release -``` - -This generates a `stage` folder under each build type (build\Debugx64, -build\Release, etc.). This is the content that will be packaged. - -## Build from BranchInstaller.sln - -Select Release and Build Solution (F7). This generates the MSI at bin/Release/BranchSDK.msi. diff --git a/BranchSDK/Windows/BranchInstaller/branch-badge-dark.ico b/BranchSDK/Windows/BranchInstaller/branch-badge-dark.ico deleted file mode 100644 index 432dca48..00000000 Binary files a/BranchSDK/Windows/BranchInstaller/branch-badge-dark.ico and /dev/null differ diff --git a/BranchSDK/Windows/BranchInstaller/branch-banner.bmp b/BranchSDK/Windows/BranchInstaller/branch-banner.bmp deleted file mode 100644 index d2232833..00000000 Binary files a/BranchSDK/Windows/BranchInstaller/branch-banner.bmp and /dev/null differ diff --git a/BranchSDK/cmake/Windows.cmake b/BranchSDK/cmake/Windows.cmake deleted file mode 100644 index db9c6c25..00000000 --- a/BranchSDK/cmake/Windows.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# On Windows, link against BranchIO.lib for the DLL -# or BranchIOStatic.lib for the static library. -# Must define BRANCHIO_DLL when including headers and building against the DLL (as opposed to the static lib) - -# Define when building the DLL on Windows -if (BUILD_SHARED_LIBS) - set_target_properties(BranchIO PROPERTIES DEFINE_SYMBOL BRANCHIO_BUILD_DLL) -endif() diff --git a/BranchSDK/src/BranchIO/Util/Log.cpp b/BranchSDK/src/BranchIO/Util/Log.cpp index bcf39e73..c3eb2790 100644 --- a/BranchSDK/src/BranchIO/Util/Log.cpp +++ b/BranchSDK/src/BranchIO/Util/Log.cpp @@ -241,7 +241,6 @@ Log::makeConsoleLoggingChannel(bool enableColors) { */ Log::Level Log::getDefaultLogLevel() { - const char* const envValue(getenv("BRANCHIO_LOG_LEVEL")); static const Level DefaultLevel( #ifdef DEBUG Debug @@ -250,7 +249,13 @@ Log::getDefaultLogLevel() { #endif ); // NOLINT(whitespace/parens) - if (!envValue) return DefaultLevel; + char* envValue = nullptr; + size_t size = 0; + _dupenv_s(&envValue, &size, "BRANCHIO_LOG_LEVEL"); + + if (envValue == nullptr) { + return DefaultLevel; + } try { Level level; @@ -268,8 +273,13 @@ Log::getDefaultLogLevel() { */ std::string Log::getDefaultLogFile() { - const char* const envValue(getenv("BRANCHIO_LOG_FILE")); - if (!envValue) return string(); + char* envValue = nullptr; + size_t size = 0; + _dupenv_s(&envValue, &size, "BRANCHIO_LOG_LEVEL"); + + if (envValue == nullptr) { + return string(); + } return envValue; } diff --git a/BranchSDK/src/BranchIO/Version.h b/BranchSDK/src/BranchIO/Version.h index d29f89c5..246f5452 100644 --- a/BranchSDK/src/BranchIO/Version.h +++ b/BranchSDK/src/BranchIO/Version.h @@ -5,6 +5,6 @@ #define BRANCHIO_VERSION_MAJOR 1 #define BRANCHIO_VERSION_MINOR 2 -#define BRANCHIO_VERSION_REVISION 3 +#define BRANCHIO_VERSION_REVISION 4 #endif // BRANCHIO_VERSION_H__ diff --git a/BranchSDK/tools/README.md b/BranchSDK/tools/README.md deleted file mode 100644 index 913dccb7..00000000 --- a/BranchSDK/tools/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# CPPLINT -https://github.com/cpplint/cpplint/blob/master/cpplint.py - -This is a forked (and maintained) version of Google's cpplint. - -# stage.py -Called from rmake.bat to collect Poco headers and libraries for MSI packaging. - -# build_wix.py - -Run manually after any build to regenerate `BranchSDK\Windows\BranchInstaller\Components.wxs` -based on output of stage.py. This generates changes to be committed. Run from this directory. - -``` -> cd BranchSDK\tools -> python build_wix.py -``` - -# component-ids.json - -Used and generated by build_wix.py to ensure consistent UUIDs for components from build to -build. Can also be imported into the build_wix.py script from the existing Components.wxs at -runtime. - -# version_bump.py - -Performs a version bump throughout the repo, updating source code, packaging & example apps. -The new version must be supplied at the command line. Suffixes such as `-beta.1` are supported. - -``` -> cd BranchSDK\tools -> python version_bump.py 1.2.2-beta.1 -``` diff --git a/BranchSDK/tools/build_wix.py b/BranchSDK/tools/build_wix.py deleted file mode 100755 index d4ab83e1..00000000 --- a/BranchSDK/tools/build_wix.py +++ /dev/null @@ -1,306 +0,0 @@ -#! /usr/bin/env python - -""" -Script to build BranchSDK\Windows\BranchInstaller\Components.wxs for -Wix installer using the products of stage.py under build\*\stage. - -Works best when run from the same directory (BranchSDK\tools), e.g.: - - cd BranchSDK\tools - python build_wix.py -""" - -# TODO: Don't necessarily need ET here, since we're just generating -# text, but this may be more flexible. - -# TODO: Use heat.exe to replace all or most of this script. -# https://wixtoolset.org/documentation/manual/v3/overview/heat.html - -import json, os, shutil -from uuid import uuid4 -from xml.dom import minidom -import xml.etree.ElementTree as ET -from xml.etree.ElementTree import Comment, Element, SubElement - -# ----- -# ----- JSON Guid map -# ----- - -def guid_for_id(identifier): - file_path = "component-ids.json" - - # load stored component IDs from disk if any - component_ids = json.load(open(file_path, "r")) - - component_id = component_ids.get(identifier, None) - if not component_id: - component_id = str(uuid4()) - component_ids[identifier] = component_id - f = open(file_path, "w") - json.dump(component_ids, f) - f.close() - - return component_id - -# ----- -# ----- Utilities used below -# ----- - -# https://pymotw.com/2/xml/etree/ElementTree/create.html -def prettify(elem): - """Return a pretty-printed XML string for the Element. - """ - rough_string = ET.tostring(elem, 'utf-8') - reparsed = minidom.parseString(rough_string) - return reparsed.toprettyxml(indent=" ") - -# Method used to generate a unique identifier for a file or directory. -def file_identifier(path): - repo_root = os.path.abspath(os.path.dirname(__file__) + "../..") - build_root = os.path.join(repo_root, "build") - # Wix error message: - # Identifiers may contain ASCII characters A-Z, a-z, digits, - # underscores (_), or periods (.). Every identifier must - # begin with either a letter or an underscore. - # Also limited to 72 chars. - file_id = path.replace(build_root + os.sep, "").replace(repo_root + os.sep, "").replace("BranchSDK" + os.sep, "").replace("~", "_").replace("-", "").replace(os.sep, ".") - - # Just truncate for now. - return file_id[:72] if len(file_id) > 72 else file_id - -# Find all subdirectories to all depths. Returns a flat list, for -# a ComponentGroup. -def all_subdirs(path): - if not os.path.isdir(path): - return [] - - # Now path must be a directory - - # List of full paths to all immediate children of path - all_paths = [os.path.join(path, f) for f in os.listdir(path)] - - # Filter out only directories. - # List of full paths to all immediate subdirectories of path - all_dirs = [f for f in all_paths if os.path.isdir(f)] - - # Now all_nested is a list of lists. Flatten it out. There's no - # possibility of repetition of elements. - result = all_dirs - for d in all_dirs: - nested = all_subdirs(d) - result = result + nested - return result - -# ----- -# ----- Conveniences to make specific ET elements -# ----- - -def make_directory_elem(elem, identifier, name=None): - if name: - return SubElement(elem, "Directory", {"Id": identifier, "Name": name}) - else: - return SubElement(elem, "Directory", {"Id": identifier}) - -def make_component_elem(elem, identifier, directory): - return SubElement(elem, "Component", { - "Id": identifier, - "Directory": directory, - "Guid": guid_for_id(identifier) - }) - -def make_file_elem(elem, identifier, source, name=None): - if name: - return SubElement(elem, "File", {"Id": identifier, "Name": name, "Source": source}) - else: - return SubElement(elem, "File", {"Id": identifier, "Source": source}) - -# ----- -# ----- Methods to generate Wix XML from the contents of a given path -# ----- - -""" -Produces a nested tree of Directory elements like: - - - - - - -""" -def wix_directory(elem, path): - basepath = os.path.basename(path) - directory_id = file_identifier(path) - wdir = make_directory_elem(elem, directory_id, basepath) - - files = os.listdir(path) - for f in files: - full_path = os.path.join(path, f) - if not os.path.isdir(full_path): - continue - wix_directory(wdir, full_path) - - return wdir - -""" -Generates a single Component element with all child File elements. -Used by wix_components. -""" -def wix_component(elem, path, identifier=None): - # TODO: Determine a better Id (2nd arg to make_component_elem) - # to use for each folder automatically. - # The Directory property refers to the Id of one of the - # Directory elements generated by wix_directory, so must use - # the file_identifier for the path. - # For now, also use that for the Id property. - path_id = identifier or file_identifier(path) - component = make_component_elem(elem, path_id, path_id) - - repo_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")) - for f in os.listdir(path): - # Hack: BranchIO.lib goes into its own manually-created ComponentGroup. - # Just ignore that library for now, if we're in a folder that has it. - # Otherwise, this has no effect. - if f == "BranchIO.lib" or f == "BranchIO.pdb": - continue - - fullpath = os.path.join(path, f) - if os.path.isdir(fullpath): - continue - source = fullpath.replace(repo_root, "$(var.ProjectDir)\\..\\..\\..") - make_file_elem(component, file_identifier(fullpath), source) - -""" -Recursively generates a flat, unnested list of Component elements -within a component group. -""" -def wix_components(elem, paths, include_subdirs=True): - if not type(paths) is list: - paths = [paths] - - alldirs = [] - for path in paths: - alldirs.append(path) - if include_subdirs: - alldirs = alldirs + all_subdirs(path) - - return [wix_component(elem, d) for d in alldirs] - -# ----- -# ----- Begin XML generation -# ----- - -root = Element("Wix", {"xmlns": "http://schemas.microsoft.com/wix/2006/wi"}) -root.append(Comment(" Generated by build_wix.py. Do not edit by hand. ")) - -# os.path.abspath & os.path.join build the right kind of path for the os, -# using backslashes on Windows without typing \\ every time here. -build_root = os.path.abspath(os.path.dirname(__file__) + "../../build") - -# Take all header files from Releasex64 arbitrarily, since they -# don't vary by build. -stage_root = os.path.join(build_root, "Releasex64", "stage") -include_root = os.path.join(stage_root, "include") -lib_root = os.path.join(stage_root, "lib") -license_root = os.path.join(stage_root, "licenses") - -# ----- -# ----- Directory tree Fragment. -# ----- Defines directories to be populated on install. -# ----- - -dir_fragment = SubElement(root, "Fragment") -source_dir = make_directory_elem(dir_fragment, "TARGETDIR", "SourceDir") -# C:\Program Files (x86) -program_files_folder = make_directory_elem(source_dir, "ProgramFilesFolder") -# C:\Program Files (x86)\Branch SDK -branch_sdk_install_folder = make_directory_elem(program_files_folder, "INSTALLFOLDER", "Branch SDK") - -# Recursively build a nested tree of Directory elements to describe -# all header folders to be installed. -wix_directory(branch_sdk_install_folder, include_root) - -lib_folder = make_directory_elem(branch_sdk_install_folder, "LIBFOLDER", "lib") -license_folder = make_directory_elem(branch_sdk_install_folder, "LICENSEFOLDER", "licenses") -docs_folder = make_directory_elem(branch_sdk_install_folder, "docs", "docs") -html_folder = make_directory_elem(docs_folder, "docs.html", "html") -make_directory_elem(html_folder, "docs.html.search", "search") -x64_lib_folder = make_directory_elem(lib_folder, "X64LIBFOLDER", "x64") -x86_lib_folder = make_directory_elem(lib_folder, "X86LIBFOLDER", "x86") -make_directory_elem(x64_lib_folder, "X64DEBUGLIBFOLDER", "Debug") -make_directory_elem(x86_lib_folder, "X86DEBUGLIBFOLDER", "Debug") -make_directory_elem(x64_lib_folder, "X64RELEASELIBFOLDER", "Release") -make_directory_elem(x86_lib_folder, "X86RELEASELIBFOLDER", "Release") - -# ----- -# ----- ComponentGroup list Fragment -# ----- Defines individual files to be installed. -# ----- - -cg_fragment = SubElement(root, "Fragment") -branch_headers = SubElement(cg_fragment, "ComponentGroup", {"Id": "BranchHeaders"}) -branch_license = make_component_elem(branch_headers, "BranchLicense", "LICENSEFOLDER") -make_file_elem(branch_license, "BranchLicense", "$(var.ProjectDir)\\..\\..\\..\\LICENSE", "LICENSE.txt") - -third_party_headers = SubElement(cg_fragment, "ComponentGroup", {"Id": "ThirdPartyHeaders"}) -branch_libraries_x64 = SubElement(cg_fragment, "ComponentGroup", {"Id": "BranchLibrariesX64"}) -third_party_libraries_x64 = SubElement(cg_fragment, "ComponentGroup", {"Id": "ThirdPartyLibrariesX64"}) -branch_libraries_x86 = SubElement(cg_fragment, "ComponentGroup", {"Id": "BranchLibrariesX86"}) -third_party_libraries_x86 = SubElement(cg_fragment, "ComponentGroup", {"Id": "ThirdPartyLibrariesX86"}) -docs = SubElement(cg_fragment, "ComponentGroup", {"Id": "BranchDocs"}) - -# Use wix_components to generate the contents of each of the -# CG elements above. -wix_components(branch_headers, os.path.join(include_root, "BranchIO")) -wix_components(third_party_headers, os.path.join(include_root, "Poco")) -third_party_licenses = make_component_elem(third_party_headers, "ThirdPartyLicenses", "LICENSEFOLDER") -make_file_elem(third_party_licenses, "PocoLicense", "$(var.ProjectDir)\\..\\..\\..\\build\\Releasex64\\stage\\licenses\\LICENSE-Poco.txt") - -wix_components(docs, os.path.abspath("..\\docs\\html")) -# The File element for C:\Program Files (x86)\Branch SDK\docs\html\index.html, to be opened by the start menu shortcut -file_component = docs.find("./Component/File[@Id='docs.html.index.html']") -file_component.set("KeyPath", "yes") -# Add a Shortcut subelement to make the start menu shortcut entry -SubElement(file_component, "Shortcut", {"Id": "SDKReferenceShortcut", "Name": "Branch SDK Reference Documentation", "Description": "Generated Branch SDK reference documentation.", "Advertise": "yes", "Icon": "branch.exe", "Directory": "ApplicationProgramsFolder"}) - -# The BranchIO.lib sits in the same lib folder with the third-party libs. This -# is as it should be, to avoid making devs pass multiple library paths at -# link time. Manually add it to its own ComponentGroups and ignore it in -# wix_component to allow the rest to be scooped up into the third-party -# CGs. -branch_debug_lib64_folder = make_component_elem(branch_libraries_x64, "BranchLibrariesDebugX64", "X64DEBUGLIBFOLDER") -branch_release_lib64_folder = make_component_elem(branch_libraries_x64, "BranchLibrariesReleaseX64", "X64RELEASELIBFOLDER") -branch_debug_lib86_folder = make_component_elem(branch_libraries_x86, "BranchLibrariesDebugX86", "X86DEBUGLIBFOLDER") -branch_release_lib86_folder = make_component_elem(branch_libraries_x86, "BranchLibrariesReleaseX86", "X86RELEASELIBFOLDER") - -make_file_elem(branch_debug_lib64_folder, "BranchDebugX64Library", "$(var.ProjectDir)\\..\\..\\..\\build\\Debugx64\\lib\\BranchIO.lib", "BranchIOmdd.lib") -make_file_elem(branch_debug_lib64_folder, "BranchDebugX64PDB", "$(var.ProjectDir)\\..\\..\\..\\build\\Debugx64\\stage\\lib\\BranchIO.pdb") -make_file_elem(branch_release_lib64_folder, "BranchReleaseX64Library", "$(var.ProjectDir)\\..\\..\\..\\build\\Releasex64\\lib\\BranchIO.lib", "BranchIOmd.lib") -make_file_elem(branch_debug_lib86_folder, "BranchDebugX86Library", "$(var.ProjectDir)\\..\\..\\..\\build\\Debug\\lib\\BranchIO.lib", "BranchIOmdd.lib") -make_file_elem(branch_debug_lib86_folder, "BranchDebugX86PDB", "$(var.ProjectDir)\\..\\..\\..\\build\\Debug\\stage\\lib\\BranchIO.pdb") -make_file_elem(branch_release_lib86_folder, "BranchReleaseX86Library", "$(var.ProjectDir)\\..\\..\\..\\build\\Release\\lib\\BranchIO.lib", "BranchIOmd.lib") - -x64_debug_lib_path = os.path.join(build_root, "Debugx64", "stage", "lib") -x64_release_lib_path = os.path.join(build_root, "Releasex64", "stage", "lib") -x86_debug_lib_path = os.path.join(build_root, "Debug", "stage", "lib") -x86_release_lib_path = os.path.join(build_root, "Release", "stage", "lib") - -wix_component(third_party_libraries_x64, x64_debug_lib_path, "X64DEBUGLIBFOLDER") -wix_component(third_party_libraries_x64, x64_release_lib_path, "X64RELEASELIBFOLDER") -wix_component(third_party_libraries_x86, x86_debug_lib_path, "X86DEBUGLIBFOLDER") -wix_component(third_party_libraries_x86, x86_release_lib_path, "X86RELEASELIBFOLDER") - -# ----- -# ----- End XML generation -# ----- - -# ----- -# ----- Generate output -# ----- - -output = prettify(root) - -# Useful for debugging -# print(output) - -output_path = os.path.abspath(build_root + "/../BranchSDK/Windows/BranchInstaller/Components.wxs") -open(output_path, "w").write(output) diff --git a/BranchSDK/tools/stage.py b/BranchSDK/tools/stage.py deleted file mode 100755 index 04b216fa..00000000 --- a/BranchSDK/tools/stage.py +++ /dev/null @@ -1,110 +0,0 @@ -#! /usr/bin/env python - -import json, os, shutil -from os import makedirs - -# Recursively copy src directory into dst directory -# excludes is a list of patterns to exclude -def copyall(src, dst, excludes=[]): - # ignores is a function to be passed to copytree - ignores = shutil.ignore_patterns(*excludes) - all_files = os.listdir(src) - # rejects is a set of all files matching the excludes - rejected = ignores(src, all_files) - files = [f for f in all_files if f not in rejected] - - for f in files: - path = os.path.join(src, f) - destination = os.path.join(dst, f) - if os.path.isdir(path) and os.path.exists(destination): - # copytree fails if the destination directory already exists. - # That's the purpose of this function. Call it recursively in - # this case. - copyall(path, destination, excludes=excludes) - elif os.path.isdir(path): - shutil.copytree(path, destination, ignore=ignores) - else: - shutil.copy(path, dst) - -# TODO: Collapse this and the above and/or rethink this whole idea, remove conan -# from build process. Makes a flat copy of all *.pdb files from a recursive search. -def copy_pdbs(src, dst, excludes=[]): - if not os.path.exists(src): - return - - ignores = shutil.ignore_patterns(*excludes) - all_files = os.listdir(src) - # rejects is a set of all files matching the excludes - rejected = ignores(src, all_files) - files = [f for f in all_files if f not in rejected] - - # TODO: Use a re with os.path.splitext or something - for f in [f for f in files if f.endswith(".pdb") or f.endswith(".PDB")]: - path = os.path.join(src, f) - shutil.copy(path, dst) - - for d in [f for f in files if os.path.isdir(os.path.join(src, f))]: - path = os.path.join(src, d) - copy_pdbs(path, dst, excludes=excludes) - -# TODO: Collapse this and the above and/or rethink this whole idea, remove conan -# from build process. Makes a copy of all LICENSE files from the conan source cache. -def copy_licenses(src, dst): - if not os.path.exists(src): - return - all_files = os.listdir(src) - - # TODO: Use a re with os.path.splitext or something - for f in [f for f in all_files if f == "LICENSE"]: - path = os.path.join(src, f) - shutil.copy(path, dst) - # Expect one LICENSE per package - return - - for d in [f for f in all_files if os.path.isdir(os.path.join(src, f))]: - path = os.path.join(src, d) - copy_licenses(path, dst) - -# Generated by conan create -f = open("conan-install.json", "r") -install_data = json.loads(f.read()) - -installed = install_data["installed"] - -# Copy everything under stage (e.g. build\Debugx64\stage) - -# Always start fresh -shutil.rmtree("stage", ignore_errors=True) -makedirs("stage/include") -makedirs("stage/lib") -makedirs("stage/licenses") - -# Skip Poco's MongoDB and SQLiteData modules, which we don't require. -# Also CppUnit, which one of our deps uses. -excludes = ["CppUnit", "*gtest*", "*gmock*", "*MongoDB*", "*SQLite*", "*Redis*", "*unit_test*", "openssl", "OpenSSL", "zlib", "libpq"] - -for item in installed: - recipe = item["recipe"] - recipe_id = recipe["id"] - if recipe_id.startswith("OpenSSL") or recipe_id.startswith("zlib") or recipe_id.startswith("gtest"): - continue - - print(recipe_id) - - package_name = recipe["name"] - - for package in item["packages"]: - # headers and libs are under rootpath - rootpath = package["cpp_info"]["rootpath"] - build_id = package["id"] - - print(" " + rootpath + " -> stage") - - copyall(rootpath + "/include", "stage/include", excludes=excludes) - copyall(rootpath + "/lib", "stage/lib", excludes=excludes) - - copy_licenses(rootpath, "stage/licenses/LICENSE-" + package_name + ".txt") - - # pdbs are under build_path - build_path = os.path.join((os.path.dirname(os.path.dirname(rootpath))), "build", build_id) - copy_pdbs(build_path, "stage/lib", excludes=excludes) diff --git a/BranchSDK/tools/version_bump.py b/BranchSDK/tools/version_bump.py deleted file mode 100644 index 9fd2b0e6..00000000 --- a/BranchSDK/tools/version_bump.py +++ /dev/null @@ -1,95 +0,0 @@ -# Usage: -# python version_bump.py 1.2.2 -# -# The version number is required and never inferred. Suffixes such as -beta.1 are supported. - -import os, re, sys - -# Substitutes replacement for \2 in any match -def update_file(path, regex, replacement): - updated_lines = [] - with open(path) as f: - for line in f.readlines(): - match = re.search(regex, line) - if match: - line = match.group(1) + replacement + match.group(3) + "\n" - updated_lines.append(line) - - with open(path, "w") as f: - f.write("".join(updated_lines)) - -def update_binary_file(path, regex, replacement, encoding): - updated_lines = [] - with open(path, "rb") as f: - text = f.read().decode(encoding) - for line in text.split("\r\n"): - match = re.search(regex, line) - if match: - line = match.group(1) + replacement + match.group(3) - updated_lines.append(line) - - with open(path, "wb") as f: - for l in updated_lines: - f.write((l + "\r\n").encode(encoding)) - -if len(sys.argv) < 2: - print("Please provide a new version number as a command-line argument, e.g. version_bump.py 1.2.1-alpha.3") - exit(1) - -full_version = sys.argv[1] - -# Not all versioning systems involved support a suffix like -alpha.3, so remove it for those cases. -reduced_version = full_version -match = re.search(r'^(\d+\.\d+\.\d+)', full_version) -if not match: - print("Version must begin with /^\d+\.\d+\.\d+/, e.g. 1.2.1-alpha.3. The suffix is optional.") - exit(1) - -# Now reduced_version is all digits. full_version may have a suffix. -reduced_version = match.group(0) - -version_components = reduced_version.split(".") - -print("Bumping to " + full_version) - -# conan package version -update_file("../../conanfile.py", r'^(\s*version\s*=\s*")(.*)(")$', full_version) - -# version in CMakeLists.txt -update_file("../../CMakeLists.txt", r'^(\s*project\(root\s+VERSION\s+)(\d+\.\d+\.\d+)(.*)$', reduced_version) - -# version in MSI package -update_file("../Windows/BranchInstaller/Product.wxs", r'^(\s* (for x86) or build\x64 (for x64) -REM e.g. build\Debugx64, build\Release. Target architecture is determined by environment. +@ECHO OFF + +REM rmake [RUNTIME [ARCHITECTURE [CONAN_PROFILE]]] +REM default: rmake MDd x64 default REM ----- Argument parsing ----- -REM BUILD_TYPE (1st arg): Debug or Release. Default is Debug. -set BUILD_TYPE=%1 -if "%BUILD_TYPE%" == "" set BUILD_TYPE=Debug +REM RUNTIME: MD, MDd, MT or MTd +SET RUNTIME=%1 +IF "%RUNTIME%" == "" SET RUNTIME=MDd -REM CONAN_PROFILE (2nd arg): Any valid conan profile. Default is Debug. -set CONAN_PROFILE=%2 -if "%CONAN_PROFILE%" == "" set CONAN_PROFILE=default +REM ARCHITECTURE: x86 or x64 +SET ARCHITECTURE=%2 +IF "%ARCHITECTURE%" == "" SET ARCHITECTURE=x64 -REM BUILD_SHARED_LIBS (3rd arg): True or False. Determines whether to build DLLs instead of -REM static libs (all deps, including this SDK). Default is False. -set BUILD_SHARED_LIBS=%3 -if "%BUILD_SHARED_LIBS%" == "" set BUILD_SHARED_LIBS=False +REM CONAN_PROFILE: Any valid conan profile. +SET CONAN_PROFILE=%3 +IF "%CONAN_PROFILE%" == "" SET CONAN_PROFILE=default REM ----- Argument validation ------ -if NOT "%BUILD_TYPE%" == "Debug" IF NOT "%BUILD_TYPE%" == "Release" ( - echo Invalid argument "%BUILD_TYPE%" for BUILD_TYPE (1st arg^). Must be Debug or Release. - exit /b 1 +IF NOT "%RUNTIME%" == "MD" IF NOT "%RUNTIME%" == "MDd" IF NOT "%RUNTIME%" == "MT" IF NOT "%RUNTIME%" == "MTd" ( + ECHO Invalid argument "%RUNTIME%" for RUNTIME. MD, MDd, MT or MTd. + EXIT /b 1 +) + +IF NOT "%ARCHITECTURE%" == "x86" IF NOT "%ARCHITECTURE%" == "x64" ( + ECHO Invalid argument "%ARCHITECTURE%" for ARCHITECTURE. x86 or x64. + EXIT /b 1 ) SET profile_match=No FOR /F %%p IN ('conan profile list') DO IF %%p == %CONAN_PROFILE% SET profile_match=Yes -if "%profile_match%" == "No" ( - echo Invalid conan profile "%CONAN_PROFILE%" (2nd arg^). Please use one of the following: - for /f %%p in ('conan profile list') do @echo %%p - exit /b 1 +IF "%profile_match%" == "No" ( + ECHO Invalid conan profile "%CONAN_PROFILE%" (2nd arg^). Please use one of the following: + FOR /f %%p IN ('conan profile list') DO @ECHO %%p + EXIT /b 1 ) -if NOT "%BUILD_SHARED_LIBS%" == "True" IF NOT "%BUILD_SHARED_LIBS%" == "False" ( - echo Invalid argument "%BUILD_SHARED_LIBS%" for BUILD_SHARED_LIBS (3rd arg^). Must be True or False. - exit /b 1 +IF NOT "%VSCMD_ARG_TGT_ARCH%" == "x64" IF NOT "%VSCMD_ARG_TGT_ARCH%" == "x86" ( + ECHO "Please use a Native Tools Command Prompt." + EXIT /b 1 ) -REM ----- End argument parsing and validation ----- - -REM Determine TARGET_ARCH from environment. -REM Note conan requires x86 or x86_64 for this parameter. TARGET_ARCH is passed to conan -s arch. -REM cmake requires Win32 or x64. CMAKE_TARGET_ARCH is passed to cmake ..\.. -A arch. -REM %VSCMD_ARG_TGT_ARCH% == x86 or x64. -if "%VSCMD_ARG_TGT_ARCH%" == "x64" ( - set TARGET_ARCH=x86_64 -) else ( - set TARGET_ARCH=%VSCMD_ARG_TGT_ARCH% +REM ----- Configuration ----- + +REM conan requires x86 or x86_64 passed via "-s arch" +REM cmake requires Win32 or x64 passed via "-A arch" +IF "%ARCHITECTURE%" == "x64" ( + SET CONAN_TARGET_ARCH=x86_64 + SET CMAKE_TARGET_ARCH=x64 + SET BUILD_SUBDIR=%RUNTIME%_64 +) ELSE IF "%ARCHITECTURE%" == "x86" ( + SET CONAN_TARGET_ARCH=x86 + SET CMAKE_TARGET_ARCH=Win32 + SET BUILD_SUBDIR=%RUNTIME% ) -if "%TARGET_ARCH%" == "" ( - echo "TARGET_ARCH not set. Please use a Native Tools Command Prompt." - exit /b 1 +REM set BUILD_TYPE based on runtime option +SET BUILD_TYPE=Debug +IF NOT "%RUNTIME%" == "MDd" IF NOT "%RUNTIME%" == "MTd" ( + SET BUILD_TYPE=Release ) -echo rmake.bat configuration: -echo BUILD_TYPE %BUILD_TYPE% -echo TARGET_ARCH %TARGET_ARCH% -echo CONAN_PROFILE %CONAN_PROFILE% -echo BUILD_SHARED_LIBS %BUILD_SHARED_LIBS% -echo. - -REM Determine some derived params for conan, cmake, etc. -REM Pass -A to cmake generator to be consistent with Conan -if %TARGET_ARCH% == x86_64 ( - set CMAKE_TARGET_ARCH=x64 -) else ( - set CMAKE_TARGET_ARCH=Win32 -) +REM build static libraries by default +REM TODO: support building dlls when this is set to True +set BUILD_SHARED_LIBS=False -REM Set VC runtime arg for conan, cmake -if %BUILD_TYPE% == Debug ( - set RUNTIME=MDd -) else ( - set RUNTIME=MD -) - -REM Determine the subdirectory of build to use -if %TARGET_ARCH% == x86 ( - set BUILD_SUBDIR=%BUILD_TYPE% -) else ( - set BUILD_SUBDIR=%BUILD_TYPE%x64 -) +ECHO rmake.bat configuration: +ECHO RUNTIME %RUNTIME% +ECHO ARCHITECTURE %ARCHITECTURE% +ECHO CONAN_PROFILE %CONAN_PROFILE% +ECHO CONAN_TARGET_ARCH %CONAN_TARGET_ARCH% +ECHO CMAKE_TARGET_ARCH %CMAKE_TARGET_ARCH% +ECHO BUILD_SUBDIR %BUILD_SUBDIR% +ECHO BUILD_TYPE %BUILD_TYPE% +ECHO BUILD_SHARED_LIBS %BUILD_SHARED_LIBS% +ECHO. -REM ----- End configuration ----- +REM ----- Build ----- REM Silence errors from mkdir with 2>NUL (Windows for /dev/null) mkdir build 2> NUL @@ -102,12 +86,6 @@ cd build mkdir %BUILD_SUBDIR% 2> NUL cd %BUILD_SUBDIR% -if %BUILD_TYPE% == Debug ( - set RUNTIME=MDd -) else ( - set RUNTIME=MD -) - REM The Branch SDK only requires: REM PocoFoundation REM PocoJSON @@ -121,8 +99,11 @@ REM libraries that are enabled by default (all of the following). REM REM See https://github.com/conan-io/conan-center-index/blob/master/recipes/poco/all/conanfile.py#L31 -set Poco_Options=^ +SET Poco_Options=^ --options Poco:enable_crypto=False^ + --options Poco:enable_netssl=False^ + --options Poco:enable_netssl_win=True^ + --options Poco:enable_active_record=False^ --options Poco:enable_data=False^ --options Poco:enable_data_mysql=False^ --options Poco:enable_data_odbc=False^ @@ -131,75 +112,70 @@ set Poco_Options=^ --options Poco:enable_encodings=False^ --options Poco:enable_jwt=False^ --options Poco:enable_mongodb=False^ - --options Poco:enable_netssl=False^ --options Poco:enable_redis=False^ --options Poco:enable_zip=False -REM Build/install dependencies needed for this SDK +ECHO Install SDK dependencies with conan conan install ..\..\conanfile.py^ --settings build_type=%BUILD_TYPE%^ - --settings arch=%TARGET_ARCH%^ + --settings arch=%CONAN_TARGET_ARCH%^ --settings compiler.runtime=%RUNTIME%^ --options *:shared=%BUILD_SHARED_LIBS%^ %Poco_Options%^ --build outdated^ --update -if ERRORLEVEL 1 ( - echo conan install failed. +IF ERRORLEVEL 1 ( + ECHO conan install failed. cd ..\.. - exit /b -1 + EXIT /b -1 ) -cmake ..\.. -G "Visual Studio 16 2019" -A %CMAKE_TARGET_ARCH% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DSKIP_INSTALL_ALL=true -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% +ECHO Setup Branch SDK with cmake and Visual Studio +cmake ..\.. -G "Visual Studio 16 2019"^ + -A %CMAKE_TARGET_ARCH%^ + -DCMAKE_BUILD_TYPE=%BUILD_TYPE%^ + -DRUNTIME=%RUNTIME%^ + -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -if ERRORLEVEL 1 ( - echo cmake configure failed. +IF ERRORLEVEL 1 ( + ECHO cmake configure failed. cd ..\.. - exit /b -1 + EXIT /b -1 ) REM 8 threads available for parallel builds cmake --build . -- /m:8 -if ERRORLEVEL 1 ( - echo cmake build failed. +IF ERRORLEVEL 1 ( + ECHO cmake build failed. cd ..\.. exit /b -1 ) ctest -C %BUILD_TYPE% -if ERRORLEVEL 1 ( - echo Unit tests failed. +IF ERRORLEVEL 1 ( + ECHO Unit tests failed. cd ..\.. - exit /b -1 + EXIT /b -1 ) REM For now, don't run this second build in CI. The last steps are preparation for release to conan. REM TODO: Refactor the batch files in this repo. -if "%GITHUB_ACTIONS%" == "true" ( +IF "%GITHUB_ACTIONS%" == "true" ( cd ..\.. - exit /b 0 + EXIT /b 0 ) -REM Install into the Conan cache +REM Install into the conan cache conan create ..\.. branch/testing^ --json conan-install.json^ --settings build_type=%BUILD_TYPE%^ - --settings arch=%TARGET_ARCH%^ + --settings arch=%CONAN_TARGET_ARCH%^ --settings compiler.runtime=%RUNTIME%^ --options *:shared=%BUILD_SHARED_LIBS%^ %Poco_Options%^ --build outdated -echo Building stage from conan cache -python ..\..\BranchSDK\tools\stage.py - -if ERRORLEVEL 1 ( - echo stage.py failed. - cd ..\.. - exit /b -1 -) - cd ..\.. diff --git a/tools/README.md b/tools/README.md new file mode 100644 index 00000000..af26fc97 --- /dev/null +++ b/tools/README.md @@ -0,0 +1,40 @@ +## Building Branch SDK + +### Check out the Branch Win32 SDK and the Poco library side by side. + +[https://github.com/BranchMetrics/cpp-branch-deep-linking-attribution](https://github.com/BranchMetrics/cpp-branch-deep-linking-attribution) + +[https://github.com/pocoproject/poco](https://github.com/pocoproject/poco) + +### Tool versions +* python - 3.9.6 +* cmake - 3.22.1 +* conan - 1.43.2 +* doxygen - 1.9.2 +* Visual Studio - 16.11.7 + +### Build Branch SDK +* Use "x64 Native Tools Command Prompt for VS 2019" +* Change into the cpp-branch-deep-linking-attribution directory. +* `python tools\build.py` + +##### Workaround release binary naming issue +* Rename the `build\MD_64\BranchSDK\lib\BranchIO.lib` to `build\MD_64\BranchSDK\lib\BranchIOmd.lib` +* Rename the `build\MT_64\BranchSDK\lib\BranchIO.lib` to `build\MT_64\BranchSDK\lib\BranchIOmt.lib` + +### Stage build products +* `python tools\stage.py` + +##### Workaround invalid Poco binaries built by conan +* `python tools\build_poco.py` +* Copy the Poco MD libraries from `poco\cmake-build\lib\Release` to `stage\lib\MD_64` +* Copy the Poco MT libraries from `poco\cmake-build\lib\Release` to `stage\lib\MT_64` +* Copy the Poco MDd libraries from `poco\cmake-build\lib\Debug` to `stage\lib\MDd_64` +* Copy the Poco MTd libraries from `poco\cmake-build\lib\Debug` to `stage\lib\MTd_64` + +Now the library binaries should be in `stage` + +### Build WIX Installer (Optional) +* `python tools\wix.py` +* Open `stage\BranchInstaller.sln` and build BranchInstaller +* MSI will be in `stage\bin\Debug\` diff --git a/tools/build.py b/tools/build.py new file mode 100644 index 00000000..3118e400 --- /dev/null +++ b/tools/build.py @@ -0,0 +1,49 @@ +#! /usr/bin/env python +# builds Branch SDK MD, MDd, MT, MTd binaries + +import json, os, shutil, subprocess +from os import makedirs + +# fix the names of the MD and MT binaries +# TODO: figure out why the cmake postfix isn't working for Release builds +def fix_x64_lib_names(): + md_64_src = os.path.join("build", "MD_64", "BranchSDK", "lib", "BranchIO.lib") + md_64_dst = os.path.join("build", "MD_64", "BranchSDK", "lib", "BranchIOmd.lib") + shutil.move(md_64_src, md_64_dst) + + mt_64_src = os.path.join("build", "MT_64", "BranchSDK", "lib", "BranchIO.lib") + mt_64_dst = os.path.join("build", "MT_64", "BranchSDK", "lib", "BranchIOmt.lib") + shutil.move(mt_64_src, mt_64_dst) + +def fix_x86_lib_names(): + md_src = os.path.join("build", "MD", "BranchSDK", "lib", "BranchIO.lib") + md_dst = os.path.join("build", "MD", "BranchSDK", "lib", "BranchIOmd.lib") + shutil.move(md_src, md_dst) + + mt_src = os.path.join("build", "MT", "BranchSDK", "lib", "BranchIO.lib") + mt_dst = os.path.join("build", "MT", "BranchSDK", "lib", "BranchIOmt.lib") + shutil.move(mt_src, mt_dst) + +# builds binary using rmake.bat +def build_binary(runtime, arch): + # TODO: replace rmake.bat with python? + subprocess.run(["rmake.bat", runtime, arch]) + +build_path = "build" + +# remove cached build products +shutil.rmtree(build_path, ignore_errors=True) +makedirs(build_path) + +# available runtimes, architectures +runtimes = ["MD", "MDd", "MT", "MTd"] +#architectures = ["x86", "x64"] +architectures = ["x64"] + +for runtime in runtimes: + for architecture in architectures: + build_binary(runtime, architecture) + +# workaround an issue with MD and MT filenames +#fix_x64_lib_names() +#fix_x86_lib_names() \ No newline at end of file diff --git a/tools/build_poco.py b/tools/build_poco.py new file mode 100644 index 00000000..13b168b2 --- /dev/null +++ b/tools/build_poco.py @@ -0,0 +1,90 @@ +#! /usr/bin/env python +# build poco with cmake +# assumes the poco and branch repos are checked out side by side + +import json, os, shutil, subprocess +from os import makedirs + +def configure(debug: bool, mt: bool): + + enable_mt = "-DPOCO_MT=OFF" + if (mt): + enable_mt = "-DPOCO_MT=ON" + + enable_debug = "-DCMAKE_BUILD_TYPE=Release" + if (debug): + enable_debug = "-DCMAKE_BUILD_TYPE=Debug" + + subprocess.run([ + "cmake", + "..", + "-G", + "Visual Studio 16 2019", + "-A", + "x64", + enable_debug, + "-DBUILD_SHARED_LIBS=OFF", + enable_mt, + "-DENABLE_CRYPTO=OFF", + "-DENABLE_NETSSL=OFF", + "-DENABLE_NETSSL_WIN=ON", + "-DENABLE_ACTIVE_RECORD=OFF", + "-DENABLE_DATA=OFF", + "-DENABLE_DATA_MYSQL=OFF", + "-DENABLE_DATA_ODBC=OFF", + "-DENABLE_DATA_POSTGRESQL=OFF", + "-DENABLE_DATA_SQLITE=OFF", + "-DENABLE_ENCODINGS=OFF", + "-DENABLE_JWT=OFF", + "-DENABLE_MONGODB=OFF", + "-DENABLE_REDIS=OFF", + "-DENABLE_ZIP=OFF" + ]) + +def build(debug: bool): + build_config = "Release" + if (debug): + build_config = "Debug" + + subprocess.run([ + "cmake", + "--build", + ".", + "--config", + build_config + ]) + +def build_md(): + configure(False, False) + build(False) + +def build_mdd(): + configure(True, False) + build(True) + +def build_mt(): + configure(False, True) + build(False) + +def build_mtd(): + configure(True, True) + build(True) + +# path to poco cmake-build folder +build_folder = "cmake-build" +build_path = os.path.join(os.path.dirname(os.getcwd()), "poco", build_folder) + +# remove old build products +shutil.rmtree(build_path, ignore_errors=True) +makedirs(build_path) + +# build from within poco\cmake-build +os.chdir(build_path) + +# build MD binaries +build_md() +build_mdd() + +# build MT binaries +build_mt() +build_mtd() diff --git a/tools/check_binaries.py b/tools/check_binaries.py new file mode 100644 index 00000000..2f0e2168 --- /dev/null +++ b/tools/check_binaries.py @@ -0,0 +1,119 @@ +#! /usr/bin/env python +# check that binaries are built with correct options +# TODO: check for DEFAULTLIB, it's causing linker issues + +import os, shutil, subprocess + +# MD +#dumpbin /DIRECTIVES foo.lib | find /i "MSVCRT" +def check_MD(binary): + result = subprocess.run(["dumpbin", "/DIRECTIVES", binary], capture_output=True, text=True) + matches_MD = result.stdout.find("MSVCRT") + matches_MDd = result.stdout.find("MSVCRTD") + if matches_MD != -1 and matches_MDd == -1: + print(binary + " is MD") + else: + print(binary + " is not MD") + +# MDd +#dumpbin /DIRECTIVES foo.lib | find /i "MSVCRTD" +def check_MDd(binary): + result = subprocess.run(["dumpbin", "/DIRECTIVES", binary], capture_output=True, text=True) + matches_MDd = result.stdout.find("MSVCRTD") + if matches_MDd != -1: + print(binary + " is MDd") + else: + print(binary + " is not MDd") + +# MT +#dumpbin /DIRECTIVES foo.lib | find /i "LIBCMT" +def check_MT(binary): + result = subprocess.run(["dumpbin", "/DIRECTIVES", binary], capture_output=True, text=True) + matches_MT = result.stdout.find("LIBCMT") + matches_MTd = result.stdout.find("LIBCMTD") + if matches_MT != -1 and matches_MTd == -1: + print(binary + " is MT") + else: + print(binary + " is not MT") + +# MTd +#dumpbin /DIRECTIVES foo.lib | find /i "LIBCMTD" +def check_MTd(binary): + result = subprocess.run(["dumpbin", "/DIRECTIVES", binary], capture_output=True, text=True) + matches_MTd = result.stdout.find("LIBCMTD") + if matches_MTd != -1: + print(binary + " is MTd") + else: + print(binary + " is not MTd") + +# x86 +#dumpbin /HEADERS foo.lib | find /i "machine (x86)" +def check_x86(binary): + result = subprocess.run(["dumpbin", "/HEADERS", binary], capture_output=True, text=True) + matches_x86 = result.stdout.find("machine (x86)") + if matches_x86 != -1: + print(binary + " is x86") + else: + print(binary + " is not x86") + +# x64 +#dumpbin /HEADERS foo.lib | find /i "machine (x64)" +def check_x64(binary): + result = subprocess.run(["dumpbin", "/HEADERS", binary], capture_output=True, text=True) + matches_x64 = result.stdout.find("machine (x64)") + if matches_x64 != -1: + print(binary + " is x64") + else: + print(binary + " is not x64") + +def verbose_check(src): + check_MD(src) + check_MDd(src) + check_MT(src) + check_MTd(src) + check_x86(src) + check_x64(src) + +verbose = True + +md_src = os.path.join("build", "MD", "BranchSDK", "lib", "BranchIOmd.lib") +check_MD(md_src) +check_x86(md_src) + +mt_src = os.path.join("build", "MT", "BranchSDK", "lib", "BranchIOmt.lib") +check_MT(mt_src) +check_x86(mt_src) + +md_64_src = os.path.join("build", "MD_64", "BranchSDK", "lib", "BranchIOmd.lib") +check_MD(md_64_src) +check_x64(md_64_src) + +mt_64_src = os.path.join("build", "MT_64", "BranchSDK", "lib", "BranchIOmt.lib") +check_MT(mt_64_src) +check_x64(mt_64_src) + +mdd_src = os.path.join("build", "MDd", "BranchSDK", "lib", "BranchIOmdd.lib") +check_MDd(mdd_src) +check_x86(mdd_src) + +mtd_src = os.path.join("build", "MTd", "BranchSDK", "lib", "BranchIOmtd.lib") +check_MTd(mtd_src) +check_x86(mtd_src) + +mdd_64_src = os.path.join("build", "MDd_64", "BranchSDK", "lib", "BranchIOmdd.lib") +check_MDd(mdd_64_src) +check_x64(mdd_64_src) + +mtd_64_src = os.path.join("build", "MTd_64", "BranchSDK", "lib", "BranchIOmtd.lib") +check_MTd(mtd_64_src) +check_x64(mtd_64_src) + +print("Verbose checks:") +verbose_check(md_src) +verbose_check(mt_src) +verbose_check(md_64_src) +verbose_check(mt_64_src) +verbose_check(mdd_src) +verbose_check(mtd_src) +verbose_check(mdd_64_src) +verbose_check(mtd_64_src) diff --git a/BranchSDK/tools/component-ids.json b/tools/component-ids.json similarity index 100% rename from BranchSDK/tools/component-ids.json rename to tools/component-ids.json diff --git a/BranchSDK/tools/cpplint.py b/tools/cpplint.py old mode 100755 new mode 100644 similarity index 100% rename from BranchSDK/tools/cpplint.py rename to tools/cpplint.py diff --git a/tools/stage.py b/tools/stage.py new file mode 100644 index 00000000..1e9e3d2e --- /dev/null +++ b/tools/stage.py @@ -0,0 +1,143 @@ +#! /usr/bin/env python +# Collects build products into the stage directory + +import json, os, shutil, subprocess +from os import makedirs + +# Recursively copy src directory into dst directory +# excludes is a list of patterns to exclude +def copyall(src, dst, excludes=[]): + # ignores is a function to be passed to copytree + ignores = shutil.ignore_patterns(*excludes) + all_files = os.listdir(src) + # rejects is a set of all files matching the excludes + rejected = ignores(src, all_files) + files = [f for f in all_files if f not in rejected] + + for f in files: + path = os.path.join(src, f) + destination = os.path.join(dst, f) + if os.path.isdir(path) and os.path.exists(destination): + # copytree fails if the destination directory already exists. + # That's the purpose of this function. Call it recursively in + # this case. + copyall(path, destination, excludes=excludes) + elif os.path.isdir(path): + shutil.copytree(path, destination, ignore=ignores) + else: + shutil.copy(path, dst) + +def poco_license(dst, rootpath): + shutil.copy(os.path.join(rootpath, "licenses", "LICENSE"), os.path.join(dst, "POCO_LICENSE.txt")) + +def poco_headers(dst, excludes, rootpath): + # this is the same across all targets + # only runs once since the include path will exist + dst_include_path = os.path.join(dst, "include") + if not os.path.exists(dst_include_path): + makedirs(dst_include_path) + + # copy headers + src_include_path = os.path.join(rootpath, "include") + copyall(src_include_path, dst_include_path, excludes=excludes) + + poco_license(dst, rootpath) + +def poco_libs(dst, excludes, rootpath, build_id): + src_lib_path = os.path.join((os.path.dirname(os.path.dirname(rootpath))), "build", build_id, "build_subfolder", "lib") + dst_lib_path = os.path.join(dst, "lib", target) + if not os.path.exists(dst_lib_path): + makedirs(dst_lib_path) + + # copy binaries + copyall(src_lib_path, dst_lib_path, excludes=excludes) + +# copy poco from conan +def copy_poco(src, dst, target): + print("Copy Poco from conan. " + target) + + # Generated by conan create step in the build script + f = open(os.path.join(src, target, "conan-install.json"), "r") + install_data = json.loads(f.read()) + installed = install_data["installed"] + + # Skip Poco libraries we don't use. + # Most are excluded at build, but activerecord has a bug. + # https://github.com/conan-io/conan-center-index/issues/8266 + excludes = [ + "PocoActiveRecord*", "ActiveRecord", + "PocoData*", "Data" + ] + + for item in installed: + recipe = item["recipe"] + recipe_id = recipe["id"] + + # skip everything but poco + if (not recipe_id.startswith("poco")): + continue + for package in item["packages"]: + rootpath = package["cpp_info"]["rootpath"] + build_id = package["id"] + + poco_headers(dst, excludes, rootpath) + poco_libs(dst, excludes, rootpath, build_id) + +# copy branch library +def copy_branch_libs(src, dst, target): + print("Copy Branch SDK. " + target) + copyall(os.path.join(src, target, "BranchSDK", "lib"), os.path.join(dst, "lib", target)) + +# recursively copy branch headers +def copy_branch_headers(src, dst): + print("Copy Branch SDK headers. " + src) + if not os.path.exists(src): + return + if not os.path.exists(dst): + makedirs(dst) + + files = os.listdir(src) + for f in files: + path = os.path.join(src, f) + destination = os.path.join(dst, f) + if os.path.isdir(path): + copy_branch_headers(path, destination) + elif f.endswith(".h") or f.endswith(".H"): + shutil.copy(path, dst) + +def copy_branch_license(dst): + print("Copy Branch License") + shutil.copy("LICENSE", os.path.join(dst, "BRANCH_LICENSE.txt")) + +# generate docs and copies them to stage +# requires doxygen to be installed +def build_docs(src, dst): + print("Build documentation") + shutil.rmtree(os.path.join(src, "docs"), ignore_errors=True) + subprocess.run(["doxygen", "Doxyfile"], cwd=src) + shutil.move(os.path.join(src, "docs"), os.path.join(dst, "docs")) + +# paths relative to project root +sdk_path = "BranchSDK" +build_path = "build" +stage_path = "stage" + +# create stage +shutil.rmtree(stage_path, ignore_errors=True) +makedirs(stage_path) + +# copy source files needed by installer from build to stage +# requires SDK be built for all targets, use build.py + +# by default only stage 64 bit binaries +targets = ["MD_64", "MDd_64", "MT_64", "MTd_64"] +#targets = ["MD", "MDd", "MD_64", "MDd_64", "MT", "MTd", "MT_64", "MTd_64"] + +for target in targets: + copy_poco(build_path, stage_path, target) + copy_branch_libs(build_path, stage_path, target) + +copy_branch_headers(os.path.join(sdk_path, "src", "BranchIO"), os.path.join(stage_path, "include", "BranchIO")) +copy_branch_license(stage_path) + +build_docs(sdk_path, stage_path) diff --git a/tools/version_bump.py b/tools/version_bump.py new file mode 100644 index 00000000..ad173903 --- /dev/null +++ b/tools/version_bump.py @@ -0,0 +1,66 @@ +# Usage: +# python version_bump.py 1.2.2 +# +# The version number is required and never inferred. Suffixes such as -beta.1 are supported. + +import os, re, sys + +# Substitutes replacement for \2 in any match +def update_file(path, regex, replacement): + updated_lines = [] + with open(path) as f: + for line in f.readlines(): + match = re.search(regex, line) + if match: + line = match.group(1) + replacement + match.group(3) + "\n" + updated_lines.append(line) + + with open(path, "w") as f: + f.write("".join(updated_lines)) + +def update_binary_file(path, regex, replacement, encoding): + updated_lines = [] + with open(path, "rb") as f: + text = f.read().decode(encoding) + for line in text.split("\r\n"): + match = re.search(regex, line) + if match: + line = match.group(1) + replacement + match.group(3) + updated_lines.append(line) + + with open(path, "wb") as f: + for l in updated_lines: + f.write((l + "\r\n").encode(encoding)) + +if len(sys.argv) < 2: + print("Please provide a new version number as a command-line argument, e.g. version_bump.py 1.2.1-alpha.3") + exit(1) + +full_version = sys.argv[1] + +# Not all versioning systems involved support a suffix like -alpha.3, so remove it for those cases. +reduced_version = full_version +match = re.search(r'^(\d+\.\d+\.\d+)', full_version) +if not match: + print("Version must begin with /^\d+\.\d+\.\d+/, e.g. 1.2.1-alpha.3. The suffix is optional.") + exit(1) + +# Now reduced_version is all digits. full_version may have a suffix. +reduced_version = match.group(0) +version_components = reduced_version.split(".") + +print("Bumping to " + full_version) + +# conan package version +update_file("conanfile.py", r'^(\s*version\s*=\s*")(.*)(")$', full_version) + +# version in CMakeLists.txt +update_file("CMakeLists.txt", r'^(\s*project\(root\s+VERSION\s+)(\d+\.\d+\.\d+)(.*)$', reduced_version) + +# version in MSI package +update_file("BranchInstaller/Product.wxs", r'^(\s*