Skip to content
Permalink
Browse files

Add StatsGatherer to installer and bump version.

  • Loading branch information...
Daniel Barowy
Daniel Barowy committed Jan 4, 2017
1 parent d8a3750 commit 8d586a787aff601576ac1ef10a9ebd4a03b802ab
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ExceLint", "ExceLint\ExceLint.fsproj", "{A62BCA5A-EB55-46ED-A49A-FDB34771B605}"
EndProject
@@ -22,6 +22,7 @@ Project("{6141683F-8A12-4E36-9623-2EB02B2C2303}") = "ExceLintInstaller", "ExceLi
{71E3AF28-8088-4F9D-9392-858964D72947} = {71E3AF28-8088-4F9D-9392-858964D72947}
{35888456-3095-4133-92C8-6DD3205F4C2D} = {35888456-3095-4133-92C8-6DD3205F4C2D}
{A62BCA5A-EB55-46ED-A49A-FDB34771B605} = {A62BCA5A-EB55-46ED-A49A-FDB34771B605}
{7D763067-CDAB-4222-8593-B3D247C4E337} = {7D763067-CDAB-4222-8593-B3D247C4E337}
{F9BECB73-F7A5-4462-AE0D-B90BA40E5CF4} = {F9BECB73-F7A5-4462-AE0D-B90BA40E5CF4}
{620E8175-C82F-4353-94BD-32D38D048DC2} = {620E8175-C82F-4353-94BD-32D38D048DC2}
{95BB2692-05A3-4CFE-A10D-376C7139D649} = {95BB2692-05A3-4CFE-A10D-376C7139D649}
@@ -350,6 +350,7 @@
<row><td>FParsecCS.Primary_output</td><td>{297D5171-0EB7-4FC0-9B9E-F480D2E652AB}</td><td>INSTALLDIR</td><td>2</td><td/><td>fparseccs.primary_output</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>ISX_DEFAULTCOMPONENT</td><td>{79DB6CB0-95C3-47CD-983E-E760B4E3C6D9}</td><td>INSTALLDIR</td><td>2</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>ParcelCOMShim.Primary_Output</td><td>{0ED9ACA4-549B-4D07-909F-792A0AEAFB1B}</td><td>INSTALLDIR</td><td>2</td><td/><td>parcelcomshim.primary_output</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
<row><td>StatsGatherer.Primary_Output</td><td>{F97D8F5A-E6D3-4748-8968-EABE3D5AD3B7}</td><td>INSTALLDIR</td><td>2</td><td/><td>statsgatherer.primary_output</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
</table>

<table name="Condition">
@@ -1069,6 +1070,7 @@
<row><td>INSTALLDIR</td><td>FParsecCS.Primary_output</td></row>
<row><td>INSTALLDIR</td><td>ISX_DEFAULTCOMPONENT</td></row>
<row><td>INSTALLDIR</td><td>ParcelCOMShim.Primary_Output</td></row>
<row><td>INSTALLDIR</td><td>StatsGatherer.Primary_Output</td></row>
</table>

<table name="CustomAction">
@@ -1895,6 +1897,7 @@
<row><td>AlwaysInstall</td><td>FParsecCS.Primary_output</td></row>
<row><td>AlwaysInstall</td><td>ISX_DEFAULTCOMPONENT</td></row>
<row><td>AlwaysInstall</td><td>ParcelCOMShim.Primary_Output</td></row>
<row><td>AlwaysInstall</td><td>StatsGatherer.Primary_Output</td></row>
</table>

<table name="File">
@@ -1921,6 +1924,7 @@
<row><td>fparsec.primary_output</td><td>FParsec.Primary_Output</td><td>FParsec.Primary Output</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;FParsec&gt;|Built</td><td>3</td><td/></row>
<row><td>fparseccs.primary_output</td><td>FParsecCS.Primary_output</td><td>FParsecCS.Primary output</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;FParsecCS&gt;|Built</td><td>3</td><td/></row>
<row><td>parcelcomshim.primary_output</td><td>ParcelCOMShim.Primary_Output</td><td>ParcelCOMShim.Primary Output</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ParcelCOMShim&gt;|Built</td><td>3</td><td/></row>
<row><td>statsgatherer.primary_output</td><td>StatsGatherer.Primary_Output</td><td>StatsGatherer.Primary Output</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;StatsGatherer&gt;|Built</td><td>3</td><td/></row>
</table>

<table name="FileSFPCatalog">
@@ -2075,6 +2079,7 @@
<row><td>FParsecCS.Primary_output</td><td/><td/><td>_F096BB03_F32A_40BD_A20F_60B4765FB967_FILTER</td><td/><td/><td/><td/></row>
<row><td>ISX_DEFAULTCOMPONENT</td><td/><td/><td>_B6EE9F24_5BDB_4CFA_B769_AC93C53BBBEA_FILTER</td><td/><td/><td/><td/></row>
<row><td>ParcelCOMShim.Primary_Output</td><td/><td/><td>_947F6C5A_02C7_4C88_AD7C_650884E157A0_FILTER</td><td/><td/><td/><td/></row>
<row><td>StatsGatherer.Primary_Output</td><td/><td/><td>_91A84B3A_C52E_44EF_B1D3_58A506C760D4_FILTER</td><td/><td/><td/><td/></row>
</table>

<table name="ISCustomActionReference">
@@ -2368,6 +2373,7 @@
<row><td>ISProjectFolder</td><td/><td/><td>1</td></row>
<row><td>ParcelCOMShim</td><td>Depends\ParcelCOMShim\ParcelCOMShim\ParcelCOMShim.fsproj</td><td/><td>2</td></row>
<row><td>ProgramFilesFolder</td><td/><td/><td>1</td></row>
<row><td>StatsGatherer</td><td>StatsGatherer\StatsGatherer.fsproj</td><td/><td>2</td></row>
<row><td>SystemFolder</td><td/><td/><td>1</td></row>
<row><td>WindowsFolder</td><td/><td/><td>1</td></row>
</table>
@@ -4401,7 +4407,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>ProductCode</td><td>{75358FED-928E-4DC6-A469-629B45283011}</td><td/></row>
<row><td>ProductName</td><td>ExceLint</td><td/></row>
<row><td>ProductVersion</td><td>1.00.0021</td><td/></row>
<row><td>ProductVersion</td><td>1.00.0022</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>
@@ -69,5 +69,9 @@
<Name>ParcelCOMShim</Name>
<Project>{71E3AF28-8088-4F9D-9392-858964D72947}</Project>
</ProjectReference>
<ProjectReference Include="..\StatsGatherer\StatsGatherer.fsproj">
<Name>StatsGatherer</Name>
<Project>{7D763067-CDAB-4222-8593-B3D247C4E337}</Project>
</ProjectReference>
</ItemGroup>
</Project>
@@ -26,7 +26,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Debug\ExceLintRunner.XML</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
<StartArguments>"C:\Users\dbarowy\Documents\Visual Studio 2015\Projects\ExceLint\data\spreadsheets\custodes" "P:\www\excelint\2016-11-28\resultant-nonspectral" "C:\Users\dbarowy\Documents\Visual Studio 2015\Projects\ExceLint\data\analyses\ExceLint\ground_truth.csv" "C:\Users\dbarowy\Documents\Visual Studio 2015\Projects\ExceLint\data\analyses\CUSTODES\smell_detection_result.csv" "C:\ProgramData\Oracle\Java\javapath\java.exe" "C:\Users\dbarowy\Documents\Visual Studio 2015\Projects\ExceLint\data\analyses\CUSTODES2\cc2.jar" -thresh 5 -verbose -resultant -sheets -css</StartArguments>
<StartArguments>"C:\Users\dbarowy\Documents\Visual Studio 2015\Projects\ExceLint\data\spreadsheets\custodes" "C:\Users\dbarowy\Desktop\ctest" "C:\Users\dbarowy\Documents\Visual Studio 2015\Projects\ExceLint\data\analyses\ExceLint\ground_truth.csv" "C:\Users\dbarowy\Documents\Visual Studio 2015\Projects\ExceLint\data\analyses\CUSTODES\smell_detection_result.csv" "C:\ProgramData\Oracle\Java\javapath\java.exe" "C:\Users\dbarowy\Documents\Visual Studio 2015\Projects\ExceLint\data\analyses\CUSTODES2\cc2.jar" -thresh 5 -verbose -resultant -sheets -css</StartArguments>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -0,0 +1,7 @@
These PRQ files are necessary for InstallShield to correctly locate redistributable libraries. You should put them in:

C:\Program Files (x86)\InstallShield\2015LE\SetupPrerequisites

You will need to download the linked restributable libraries prior to building the installer. Restart Visual Studio as Administrator, go to the InstallShield Visual Studio project, find the new entries in "Specify Application Data" -> "Redistributables", find your new libraries, right-click and select "Download Selected Item..."

Quit Visual Studio and restart as a regular user. You should now be able to build with the missing prerequisites.
@@ -5,6 +5,7 @@ open ExceLintFileFormats
open System.Collections.Generic
open System.Diagnostics
open System.Threading
open System.Text.RegularExpressions

type FDict = Dictionary<AST.Address,string>
type FCount = Dictionary<string,int>
@@ -122,22 +123,30 @@ let ast_count(fs_asts: AST.Expression[]) : FCount =
) (new Dictionary<string,int>())

let workbook_proper_name(workbook: string)(tmpdir: string) : string =
match Application.MagicBytes(workbook) with
| Application.CWFileType.XLS ->
let newpath = System.IO.Path.Combine(
tmpdir,
System.IO.Path.GetFileName(workbook) + ".xls"
)
newpath
| Application.CWFileType.XLSX ->
let newpath = System.IO.Path.Combine(
tmpdir,
System.IO.Path.GetFileName(workbook) + ".xlsx"
)
newpath
| _ ->
printfn "Not an Excel file: %A" workbook
failwith (sprintf "Not an Excel file: %A" workbook)
let r = new Regex(".+\.xlsx?", RegexOptions.IgnoreCase)
if r.IsMatch workbook then
System.IO.Path.Combine(
tmpdir,
System.IO.Path.GetFileName(workbook)
)
else
// only append extension if it is missing
match Application.MagicBytes(workbook) with
| Application.CWFileType.XLS ->
let newpath = System.IO.Path.Combine(
tmpdir,
System.IO.Path.GetFileName(workbook) + ".xls"
)
newpath
| Application.CWFileType.XLSX ->
let newpath = System.IO.Path.Combine(
tmpdir,
System.IO.Path.GetFileName(workbook) + ".xlsx"
)
newpath
| _ ->
printfn "Not an Excel file: %A" workbook
failwith (sprintf "Not an Excel file: %A" workbook)

let open_and_do_stuff(config: Args.Config)(dothis: WorkerFn) : unit =
using(new Application()) (fun app ->

0 comments on commit 8d586a7

Please sign in to comment.
You can’t perform that action at this time.