Skip to content

Commit bac7433

Browse files
committed
Update version numbers and installer for alpha 9.
- Updated the Windows installer for MSVC 2015, Qt 5.6, and Boost 1.59.
1 parent f192edf commit bac7433

File tree

3 files changed

+13
-26
lines changed

3 files changed

+13
-26
lines changed

osx/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<key>CFBundleSignature</key>
130130
<string>xmmd</string>
131131
<key>CFBundleVersion</key>
132-
<string>2.0.0-alpha8</string>
132+
<string>2.0.0-alpha9</string>
133133
<key>NSAppleScriptEnabled</key>
134134
<string>NO</string>
135135
</dict>

windows/common.wxi

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<?define ProductName="Power Tab Editor"?>
44
<?define ProductShortName="Power Tab"?>
55
<?define Manufacturer="Power Tab Community"?>
6-
<?define Version="1.98.8"?>
6+
<?define Version="1.98.9"?>
77
<?define UpgradeCode="6cab03ff-a31b-4c76-a4d1-20a37575896a"?>
88
<?define SourceDir="../source"?>
99
<?define BinDir="../build/bin"?>
1010

1111
<?if $(var.Platform) = x64?>
12-
<?define CRTMergeModule="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC120_CRT_x64.msm" ?>
12+
<?define CRTMergeModule="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x64.msm" ?>
1313
<?define ProgramFilesFolder="ProgramFiles64Folder"?>
1414
<?else?>
15-
<?define CRTMergeModule="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC120_CRT_x86.msm" ?>
15+
<?define CRTMergeModule="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x86.msm" ?>
1616
<?define ProgramFilesFolder="ProgramFilesFolder"?>
1717
<?endif?>
1818
</Include>

windows/powertabeditor.wxs

+9-22
Original file line numberDiff line numberDiff line change
@@ -78,27 +78,21 @@
7878
<RegistryValue Root="HKCU" Key="Software\Power Tab\Power Tab Editor" Name="installed" Type="integer" Value="1" KeyPath="yes" />
7979
</Component>
8080

81-
<Component Id="boost_date_time" Guid="FAEEF27B-4899-4A64-AF74-3F5446B5E8AE">
82-
<File Source="$(var.BinDir)/boost_date_time-vc120-mt-1_58.dll" KeyPath="yes" Checksum="yes" />
81+
<Component Id="boost_date_time" Guid="A7CA0E64-5F96-4457-8084-7AA2697AB552">
82+
<File Source="$(var.BinDir)/boost_date_time-vc140-mt-1_59.dll" KeyPath="yes" Checksum="yes" />
8383
</Component>
84-
<Component Id="boost_iostreams" Guid="85C7EEB1-69ED-4511-B2E9-CDA0BA82B96D">
85-
<File Source="$(var.BinDir)/boost_iostreams-vc120-mt-1_58.dll" KeyPath="yes" Checksum="yes" />
84+
<Component Id="boost_iostreams" Guid="D7CC00A3-D0F4-46EB-8C52-3C8611078DE1">
85+
<File Source="$(var.BinDir)/boost_iostreams-vc140-mt-1_59.dll" KeyPath="yes" Checksum="yes" />
8686
</Component>
87-
<Component Id="boost_program_options" Guid="E813AFF5-37CE-44B8-B2DD-789556D9B617">
88-
<File Source="$(var.BinDir)/boost_program_options-vc120-mt-1_58.dll" KeyPath="yes" Checksum="yes" />
87+
<Component Id="boost_program_options" Guid="EE8E115F-C14F-4A2D-89D0-7C226B606279">
88+
<File Source="$(var.BinDir)/boost_program_options-vc140-mt-1_59.dll" KeyPath="yes" Checksum="yes" />
8989
</Component>
90-
<Component Id="boost_regex" Guid="3DE0F57F-F6DC-4BBD-B649-64C51B17FA5B">
91-
<File Source="$(var.BinDir)/boost_regex-vc120-mt-1_58.dll" KeyPath="yes" Checksum="yes" />
90+
<Component Id="boost_regex" Guid="4DE196DC-2078-4B0A-AA3B-B449E0782E88">
91+
<File Source="$(var.BinDir)/boost_regex-vc140-mt-1_59.dll" KeyPath="yes" Checksum="yes" />
9292
</Component>
93-
<Component Id="boost_zlib" Guid="58B5C145-F4D9-457D-8DFD-4EA2AFE175C3">
93+
<Component Id="boost_zlib" Guid="D942287A-F31F-4DDD-8F36-6E03F42DB131">
9494
<File Source="$(var.BinDir)/boost_zlib-vc120-mt-1_58.dll" KeyPath="yes" Checksum="yes" />
9595
</Component>
96-
<Component Id="libEGL" Guid="060B6468-B66B-4B9F-AFE4-8016428ABE9D">
97-
<File Source="$(var.BinDir)/libEGL.dll" KeyPath="yes" Checksum="yes" />
98-
</Component>
99-
<Component Id="libGLESv2" Guid="14C3744E-4608-4A7A-9C17-3F9085EAF3D5">
100-
<File Source="$(var.BinDir)/libGLESv2.dll" KeyPath="yes" Checksum="yes" />
101-
</Component>
10296
<Component Id="Qt5Core" Guid="C12EB9A4-E465-4738-BD49-898C4E843A8D">
10397
<File Source="$(var.BinDir)/Qt5Core.dll" KeyPath="yes" Checksum="yes" />
10498
</Component>
@@ -116,13 +110,6 @@
116110
</Component>
117111
</ComponentGroup>
118112

119-
<!-- Platform plugins -->
120-
<ComponentGroup Id="PlatformBinaries" Directory="PlatformBinariesDir">
121-
<Component Guid="8DB2373E-9319-475E-897E-47F2BE4CCA30">
122-
<File Source="$(var.BinDir)/platforms/qwindows.dll" KeyPath="yes" Checksum="yes" />
123-
</Component>
124-
</ComponentGroup>
125-
126113
<!-- Data files -->
127114
<ComponentGroup Id="DataFiles" Directory="DataDir">
128115
<Component Guid="5C770CE4-AF29-447F-8CD5-7F997837CE5C">

0 commit comments

Comments
 (0)