Update copyright notices and installer metadata

bonsai-rx · Jul 19, 2023 · 37f87d8 · 37f87d8
1 parent 2c4b05c
commit 37f87d8
Show file tree

Hide file tree

Showing 16 changed files with 149 additions and 144 deletions.
diff --git a/Bonsai.Setup.Bootstrapper/Bundle.wxs b/Bonsai.Setup.Bootstrapper/Bundle.wxs
@@ -6,8 +6,12 @@
   <?define EditorProjectPath="..\Bonsai.Editor"?>
   <?define ProductUpgradeCode="762f27b1-165b-45a1-b04c-a3ba198fd9d7"?>
   <?define VCRTRegistryKey="SOFTWARE\Microsoft\DevDiv\vc\Servicing\14.0\RuntimeMinimum"?>
-
-	<Bundle Name="$(var.ProductDisplayName)" Version="!(bind.PackageVersion.Bonsai)" Manufacturer="Goncalo Lopes" UpgradeCode="$(var.ProductUpgradeCode)" IconSourceFile="$(var.EditorProjectPath)\Bonsai.ico">
+
+  <Bundle Name="$(var.ProductDisplayName)"
+          Version="!(bind.PackageVersion.Bonsai)"
+          Manufacturer="Bonsai Foundation"
+          UpgradeCode="$(var.ProductUpgradeCode)"
+          IconSourceFile="$(var.EditorProjectPath)\Bonsai.ico">
     <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
       <bal:WixStandardBootstrapperApplication LicenseFile="License.rtf"
                                               ShowVersion="yes"
@@ -22,7 +26,7 @@
     <util:RegistrySearch Root="HKLM" Key="$(var.VCRTRegistryKey)" Value="Install" Variable="VCRTInstalled" Win64="no"/>
     <util:RegistrySearch Root="HKLM" Key="$(var.VCRTRegistryKey)" Value="Install" Variable="VCRT64Installed" Win64="yes"/>
 
-		<Chain>
+    <Chain>
       <PackageGroupRef Id="NetFx472Web"/>
       <ExePackage Id="VCRT" SourceFile="vc_redist.x86.exe" InstallCommand="/q /norestart" Permanent="yes" DetectCondition="VCRTInstalled"/>
       <ExePackage Id="VCRT64" SourceFile="vc_redist.x64.exe" InstallCommand="/q /norestart" Permanent="yes" InstallCondition="VersionNT64" DetectCondition="VCRT64Installed"/>
@@ -31,6 +35,6 @@
         <MsiProperty Name="INSTALLVSIX" Value="[InstallVsixCheckbox]"/>
         <MsiProperty Name="INSTALL64" Value="VersionNT64"/>
       </MsiPackage>
-		</Chain>
-	</Bundle>
+    </Chain>
+  </Bundle>
 </Wix>
diff --git a/Bonsai.Setup.Bootstrapper/License.rtf b/Bonsai.Setup.Bootstrapper/License.rtf
diff --git a/Bonsai.Setup/Product.wxs b/Bonsai.Setup/Product.wxs
@@ -6,12 +6,12 @@
   <?define ProductDisplayName="Bonsai"?>
   <?define ProductUpgradeCode="4ba318de-f0ce-4c8a-9898-0ac27ef0d0e3"?>
   <?define ProgramFilesFolder="ProgramFilesFolder"?>
-
-	<Product Id="*" Name="$(var.ProductDisplayName)" Language="1033" Version="!(bind.FileVersion.BonsaiEXE)" Manufacturer="Goncalo Lopes" UpgradeCode="$(var.ProductUpgradeCode)">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perUser" />
 
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-		<MediaTemplate EmbedCab="yes"/>
+  <Product Id="*" Name="$(var.ProductDisplayName)" Language="1033" Version="!(bind.FileVersion.BonsaiEXE)" Manufacturer="Bonsai Foundation" UpgradeCode="$(var.ProductUpgradeCode)">
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perUser" />
+
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MediaTemplate EmbedCab="yes"/>
     <UIRef Id="WixUI_Advanced"/>
     <Property Id="ApplicationFolderName" Value="$(var.ProductDisplayName)" />
     <Property Id="WixAppFolder" Value="WixPerUserFolder" />
@@ -20,8 +20,8 @@
     <Icon Id="BonsaiWorkflow.ico" SourceFile="$(var.WorkflowTemplatePath)\__TemplateIcon.ico" />
     <Icon Id="vsix.ico" SourceFile="vsix.ico"/>
     <Property Id="ARPPRODUCTICON" Value="Bonsai.ico" />
-    
-		<Feature Id="ProductFeature" Title="Bonsai" Level="1" ConfigurableDirectory="INSTALLFOLDER">
+
+    <Feature Id="ProductFeature" Title="Bonsai" Level="1" ConfigurableDirectory="INSTALLFOLDER">
       <Feature Id="RuntimeFeature" Title="Runtime" Level="1">
         <ComponentGroupRef Id="ProductComponents" />
         <ComponentRef Id="Gallery"/>
@@ -33,12 +33,12 @@
       <Feature Id="DevelopmentFeature" Title="Development" Level="1">
         <ComponentGroupRef Id="BonsaiVsExtensions" />
       </Feature>
-		</Feature>
-	</Product>
+    </Feature>
+  </Product>
 
-	<Fragment>
+  <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="$(var.ProgramFilesFolder)">
+      <Directory Id="$(var.ProgramFilesFolder)">
         <Directory Id="INSTALLFOLDER" Name="$(var.ProductDisplayName)">
           <Directory Id="GALLERYFOLDER" Name="Gallery">
             <Component Id="Gallery" Guid="902807d6-61fe-402a-8245-7b0ca9db2d37" Win64="$(var.Win64)">
@@ -59,7 +59,7 @@
             </Directory>
           </Directory>
         </Directory>
-			</Directory>
+      </Directory>
 
       <Directory Id="ProgramMenuFolder" Name="Programs">
         <Directory Id="ProgramMenuDir" Name="$(var.ProductDisplayName)">
@@ -69,6 +69,6 @@
           </Component>
         </Directory>
       </Directory>
-		</Directory>
-	</Fragment>
+    </Directory>
+  </Fragment>
 </Wix>
diff --git a/Bonsai.Setup/Runtime.wxs b/Bonsai.Setup/Runtime.wxs
@@ -28,6 +28,7 @@
 
       <Component Id='BonsaiInstallDir' Guid='*' Win64="$(var.Win64)">
         <RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' Name='InstallDir' Type='string' Value='[INSTALLFOLDER]' KeyPath='yes'/>
+        <RegistryValue Root='HKCU' Key='Software\Goncalo Lopes\[ProductName]' Name='InstallDir' Type='string' Value='[INSTALLFOLDER]' KeyPath='no'/>
         <util:RemoveFolderEx Property='INSTALLFOLDER' On='uninstall'/>
       </Component>
     </ComponentGroup>

diff --git a/Bonsai.Templates/Bonsai.PackageTemplate/Properties/AssemblyInfo.cs b/Bonsai.Templates/Bonsai.PackageTemplate/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("Bonsai.PackageTemplate")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Gonçalo Lopes")]
+[assembly: AssemblyCompany("Bonsai Foundation")]
 [assembly: AssemblyProduct("Bonsai.PackageTemplate")]
-[assembly: AssemblyCopyright("Copyright © Gonçalo Lopes 2023")]
+[assembly: AssemblyCopyright("Copyright © Bonsai Foundation and Contributors")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Bonsai.Templates/Bonsai.PackageTemplate/launchSettings.json b/Bonsai.Templates/Bonsai.PackageTemplate/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Bonsai": {
       "commandName": "Executable",
-      "executablePath": "$(registry:HKEY_CURRENT_USER\\Software\\Goncalo Lopes\\Bonsai@InstallDir)Bonsai.exe",
+      "executablePath": "$(registry:HKEY_CURRENT_USER\\Software\\Bonsai Foundation\\Bonsai@InstallDir)Bonsai.exe",
       "commandLineArgs": "--lib:\"$(TargetDir).\"",
       "nativeDebugging": true
     }

diff --git a/Bonsai.Templates/Bonsai.SinkTemplate/Properties/AssemblyInfo.cs b/Bonsai.Templates/Bonsai.SinkTemplate/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("Bonsai.SinkTemplate")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Gonçalo Lopes")]
+[assembly: AssemblyCompany("Bonsai Foundation")]
 [assembly: AssemblyProduct("Bonsai.SinkTemplate")]
-[assembly: AssemblyCopyright("Copyright © Gonçalo Lopes 2023")]
+[assembly: AssemblyCopyright("Copyright © Bonsai Foundation and Contributors")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Bonsai.Templates/Bonsai.SourceTemplate/Properties/AssemblyInfo.cs b/Bonsai.Templates/Bonsai.SourceTemplate/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("Bonsai.SourceTemplate")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Gonçalo Lopes")]
+[assembly: AssemblyCompany("Bonsai Foundation")]
 [assembly: AssemblyProduct("Bonsai.SourceTemplate")]
-[assembly: AssemblyCopyright("Copyright © Gonçalo Lopes 2023")]
+[assembly: AssemblyCopyright("Copyright © Bonsai Foundation and Contributors")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Bonsai.Templates/Bonsai.Templates/Properties/AssemblyInfo.cs b/Bonsai.Templates/Bonsai.Templates/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("Bonsai.Templates")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Gonçalo Lopes")]
+[assembly: AssemblyCompany("Bonsai Foundation")]
 [assembly: AssemblyProduct("Bonsai.Templates")]
-[assembly: AssemblyCopyright("Copyright © Gonçalo Lopes 2023")]
+[assembly: AssemblyCopyright("Copyright © Bonsai Foundation and Contributors")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]