Skip to content

Commit

Permalink
Improving code quality
Browse files Browse the repository at this point in the history
Clean-up of installation script
  • Loading branch information
shauleiz committed Oct 30, 2016
1 parent 0f3ec5e commit 4664692
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
8 changes: 4 additions & 4 deletions apps/common/vJoyInterface/vJoyInterface2012.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);$(LOCALAPPDATA)\Atlassian\SourceTree\git_local\bin\</ExecutablePath>
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
<RunCodeAnalysis>false</RunCodeAnalysis>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
Expand Down Expand Up @@ -288,7 +288,7 @@
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);$(LOCALAPPDATA)\Atlassian\SourceTree\git_local\bin\</ExecutablePath>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
<RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
<IncludePath>.;$(SolutionDir)..\..\..\inc;$(IncludePath)</IncludePath>
Expand Down Expand Up @@ -456,7 +456,7 @@
<PrecompiledHeader>Create</PrecompiledHeader>
<PreprocessorDefinitions>VJOYINTERFACE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<EnablePREfast>true</EnablePREfast>
<EnablePREfast>false</EnablePREfast>
<OmitFramePointers>true</OmitFramePointers>
</ClCompile>
<Link>
Expand Down Expand Up @@ -624,7 +624,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeaderFile />
<PrecompiledHeaderOutputFile />
<EnablePREfast>true</EnablePREfast>
<EnablePREfast>false</EnablePREfast>
<OmitFramePointers>
</OmitFramePointers>
</ClCompile>
Expand Down
14 changes: 1 addition & 13 deletions install/vJoyInstallerSigned.iss
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ const
var
SkipToPh2: boolean; (* True is installer resumes installation after Set Test mode & restart*)
OrigTestMode: Boolean; (* Value of the original Test Mode *)
CalledBySpp: Boolean; (* True is installer called by SPP Installer *)
DldRestart: Boolean; (* True if delayed restart requested *)
(* Forward Function declarations - Start *)
Expand Down Expand Up @@ -236,8 +235,6 @@ var
Len: Longint;
Res: Boolean;
Names: TArrayOfString;
I: Integer;
S: String;
begin
// Get the first subkey under 'HIDCLASS' - expected values are 0000 or 0001
Expand Down Expand Up @@ -365,9 +362,6 @@ end;
// If in VerySilent mode - dialog box supressed and message is sent to log file
function vJoyMsgBox(const Text: String; const Typ: TMsgBoxType; const Buttons: Integer): Integer;
var
MsgBoxReturned: Integer;
begin
Result := IDOK;
if not IsVerySilent then
Expand Down Expand Up @@ -511,10 +505,6 @@ end;
(* Pre & Post-install operations *)
procedure CurStepChanged(CurStep: TSetupStep);
var
TmpFileName, ExecStdout, msg: string;
ResultCode: Integer;
begin
// if CurStep=ssInstall then
// MsgBox('CurStepChanged(ssInstall)' , mbInformation, MB_OK);
Expand Down Expand Up @@ -569,8 +559,6 @@ end;
*)
function PrepareToInstall(var NeedsRestart: Boolean): String;
var
RunOnceData: String;
begin
// Default
Expand Down Expand Up @@ -947,7 +935,7 @@ end;
// Returns TRUE if need to restart
function Exec_vJoyInstall(): Boolean;
var
TmpFileName, ExecStdout, msg: string;
TmpFileName, msg: string;
ResultCode: Integer;
Begin
Expand Down

0 comments on commit 4664692

Please sign in to comment.