Skip to content

Commit c0e6c3b

Browse files
author
Steve Salas
committed
Update source code and installer for User Guide
1 parent 626f33f commit c0e6c3b

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

codepulse/src/main/scala/com/secdec/codepulse/tracer/ProjectFileUploadHandler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class ProjectFileUploadHandler(projectManager: ProjectManager, eventBus: General
7474
try {
7575
for {
7676
(inputFile, originalName, cleanup) <- getReqFile(req) ?~! "Creating a new project requires a file"
77-
_ <- Await.result((inputFileProcessor() ? CanProcessFile(inputFile)).mapTo[Boolean], awaitTimeout.duration) ?~ "The file you picked does not contain any supported input data. Refer to https://github.com/codedx/codepulse/wiki/Creating-Projects for what an input file should contain."
77+
_ <- Await.result((inputFileProcessor() ? CanProcessFile(inputFile)).mapTo[Boolean], awaitTimeout.duration) ?~ "The file you picked does not contain any supported input data. Refer to https://github.com/codedx/codepulse/wiki/user-guide for what an input file should contain."
7878
name <- req.param("name") ?~ "You must specify a name"
7979
} yield {
8080

codepulse/src/main/webapp/templates-hidden/ProjectInputForm.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</div>
8282
<div class="input-help">
8383
<i class="fa fa-comment"></i>
84-
To see code coverage at the line level, include Java or .NET source code with your upload. For .NET projects,
84+
To see code coverage at the source code level, include Java or .NET source code with your upload. For .NET projects,
8585
copy the root folder from your source tree to the root folder of the <span class="filetype">.zip</span> file you upload.
8686
</div>
8787
</div>

installers/Windows/CodePulse.Installer.Win64/Product.wxs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
2020
<WixVariable Id="WixUIDialogBmp" Value="WixUIDialogBmp.bmp" />
2121
<WixVariable Id="WixUIBannerBmp" Value="WixUIBannerBmp.bmp" />
22-
<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Thank you for installing Code Pulse. See the Code Pulse Start menu folder for the application shortcut and a link to open the Wiki." />
22+
<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Thank you for installing Code Pulse. See the Code Pulse Start menu folder for the application shortcut and a link to open the User Guide." />
2323

2424
<Component Id="ApplicationShortcuts" Guid="*" Directory="CodePulseProgramsFolder">
2525
<Shortcut Id="CodePulseShortcut"
2626
Name="Code Pulse"
2727
Description="Launch Code Pulse"
2828
Target="[INSTALLFOLDER]codepulse.exe"
2929
WorkingDirectory="INSTALLFOLDER"/>
30-
<util:InternetShortcut Id="HomeWikiLink"
31-
Name="Code Pulse Wiki - Home"
32-
Target="https://github.com/codedx/codepulse/wiki"/>
30+
<util:InternetShortcut Id="UserGuideLink"
31+
Name="Code Pulse User Guide"
32+
Target="https://github.com/codedx/codepulse/wiki/user-guide"/>
3333
<RemoveFolder Id="RemoveShortcutFolder" On="uninstall"/>
3434
<RegistryValue
3535
Root="HKCU"

installers/Windows/CodePulse.Installer.Win64/Win64CodePulse.wxs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -927,6 +927,9 @@
927927
<Component Id="cmp90CE04501D667664F20D455789F29908" Directory="dir4AA12460D3F5A5059B5F53D9A515C913" Guid="*">
928928
<File Id="filAAEEF462B6AE59A98FCEC5E2C2F0BA11" KeyPath="yes" Source="$(var.CodePulseWin64SourceFolder)\backend\webapps\root\WEB-INF\lib\jackson-module-scala_2.10-2.3.2.jar" />
929929
</Component>
930+
<Component Id="cmpFBA9E81857879FA71A17C4BAF5A0ACE8" Directory="dir4AA12460D3F5A5059B5F53D9A515C913" Guid="*">
931+
<File Id="filC692468FBFCB1C79FED5CD7F6818F002" KeyPath="yes" Source="$(var.CodePulseWin64SourceFolder)\backend\webapps\root\WEB-INF\lib\javaparser-core-2.4.0.jar" />
932+
</Component>
930933
<Component Id="cmpE520FBD6C11296505635CC1FA1676FAF" Directory="dir4AA12460D3F5A5059B5F53D9A515C913" Guid="*">
931934
<File Id="filBCC3200C8BEC28D002D4BE3E5F4EF773" KeyPath="yes" Source="$(var.CodePulseWin64SourceFolder)\backend\webapps\root\WEB-INF\lib\javax.el-api-3.0.0.jar" />
932935
</Component>
@@ -1884,9 +1887,6 @@
18841887
<Component Id="cmp24497ADFC6990BC66DA7AEC319F24A30" Directory="dirE703D135D537439421E685F2EF38C0FC" Guid="*">
18851888
<File Id="filDF7CE88BB3825FB3B562706AE081AECF" KeyPath="yes" Source="$(var.CodePulseWin64SourceFolder)\licenses\minlog\license.txt" />
18861889
</Component>
1887-
<Component Id="cmp7AD81D3A55C9D5BA82F5137672E79BC9" Directory="dir294DF4FA24249893C1D5E4E6F757BBCC" Guid="*">
1888-
<File Id="fil5A65ABCD6A5C72EFA87B62941E64211C" KeyPath="yes" Source="$(var.CodePulseWin64SourceFolder)\licenses\OpenCover\License.rtf" />
1889-
</Component>
18901890
<Component Id="cmp90BCC453242C511864E9688FE49ACFC4" Directory="dirBB783A366AE3F65CCBE24B7BA4C87D02" Guid="*">
18911891
<File Id="filE3CE766C5BE86A3DF26B455D407A078D" KeyPath="yes" Source="$(var.CodePulseWin64SourceFolder)\licenses\paranamer\LICENSE.txt" />
18921892
</Component>
@@ -2201,11 +2201,6 @@
22012201
<Directory Id="dir2859AB326CD40E14FF854B9E58690AB1" Name="webapps" />
22022202
</DirectoryRef>
22032203
</Fragment>
2204-
<Fragment>
2205-
<DirectoryRef Id="dir38D963CA90694D9F68F2E2A952412F5D">
2206-
<Directory Id="dir294DF4FA24249893C1D5E4E6F757BBCC" Name="OpenCover" />
2207-
</DirectoryRef>
2208-
</Fragment>
22092204
<Fragment>
22102205
<DirectoryRef Id="dirC3403397DEE54EAA7D7C62C96BC037D9">
22112206
<Directory Id="dir2AEABA1F7674A7258869395BA1F72703" Name="jolokia" />

installers/Windows/CodePulse.Installer.Win64/Win64SymbolService.wxs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -647,8 +647,8 @@
647647
<Component Id="cmp643448F4DE3E54B4D2E6ABB370EA4024" Directory="dir5C7D6C800CDEFC6B537A776ED02656E2" Guid="*">
648648
<File Id="filD91BB803F97117EADE35536F929A2AD9" KeyPath="yes" Source="$(var.SymbolServiceWin64SourceFolder)\mscordaccore.dll" />
649649
</Component>
650-
<Component Id="cmpA0ECC82064C5C34137AD206F5E61BDA5" Directory="dir5C7D6C800CDEFC6B537A776ED02656E2" Guid="*">
651-
<File Id="filB57C5791B64EF8547A6845741FF77533" KeyPath="yes" Source="$(var.SymbolServiceWin64SourceFolder)\mscordaccore_amd64_amd64_4.6.00001.0.dll" />
650+
<Component Id="cmp02A845E2A2A94D402F82DEDDB5DFEF07" Directory="dir5C7D6C800CDEFC6B537A776ED02656E2" Guid="*">
651+
<File Id="filF8CD8117F989D5D94FD36B14026A17B6" KeyPath="yes" Source="$(var.SymbolServiceWin64SourceFolder)\mscordaccore_amd64_amd64_4.6.26212.01.dll" />
652652
</Component>
653653
<Component Id="cmp3DB6F519C48E2E9EF339652B271F7DEB" Directory="dir5C7D6C800CDEFC6B537A776ED02656E2" Guid="*">
654654
<File Id="filC53607A96732ACC1F3D1E1E5ABED01DE" KeyPath="yes" Source="$(var.SymbolServiceWin64SourceFolder)\mscordbi.dll" />
@@ -683,8 +683,8 @@
683683
<Component Id="cmp8A33C321D30A6EACF8103E61C6E6E99E" Directory="dir5C7D6C800CDEFC6B537A776ED02656E2" Guid="*">
684684
<File Id="filBDB6C82F2B3C03682ECC64FFB41EBB64" KeyPath="yes" Source="$(var.SymbolServiceWin64SourceFolder)\SOS.NETCore.dll" />
685685
</Component>
686-
<Component Id="cmp1136081D9F3B5F37DF1798597D74A63D" Directory="dir5C7D6C800CDEFC6B537A776ED02656E2" Guid="*">
687-
<File Id="fil8429413AFFB3533C6625C1BE9E6F6F1C" KeyPath="yes" Source="$(var.SymbolServiceWin64SourceFolder)\sos_amd64_amd64_4.6.00001.0.dll" />
686+
<Component Id="cmp8ED2E6D5DD8AD1A1E5F9598731B69450" Directory="dir5C7D6C800CDEFC6B537A776ED02656E2" Guid="*">
687+
<File Id="fil2079E97B039D927BF6C8D79922292E1A" KeyPath="yes" Source="$(var.SymbolServiceWin64SourceFolder)\sos_amd64_amd64_4.6.26212.01.dll" />
688688
</Component>
689689
<Component Id="cmp9955E5B80484DB40467686AD3284BE99" Directory="dir5C7D6C800CDEFC6B537A776ED02656E2" Guid="*">
690690
<File Id="fil01D73779D40F314F85B0C6EC21F6100E" KeyPath="yes" Source="$(var.SymbolServiceWin64SourceFolder)\SQLitePCLRaw.batteries_green.dll" />

0 commit comments

Comments
 (0)