SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed qucs.iss

Browse Source
This commit is contained in:
Frans Schreuder 2013-06-19 23:42:04 +02:00
parent c73cb6b1ad
commit 82509d4fab
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
contrib/innosetup/qucs.iss
View File

@ -25,8 +25,8 @@
#define APPVERNAME "Quite Universal Circuit Simulator 0.0.17 binary package for Win32"
#define URL "http://qucs.sourceforge.net"
#define TREE "c:\qucs-git\release\qucs-win32-bin\"
#define octaveversion "octave-3.6.2"
#define octavelink "http://sourceforge.net/projects/octave/files/Octave%20Windows%20binaries/Octave%203.6.4%20for%20Windows%20Microsoft%20Visual%20Studio/octave-3.6.4-vs2010-setup.exe/download"
#define octaveversion "3.6.4"
[Setup]
AppName={# APPNAME}
@ -50,7 +50,7 @@ Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: ASCODIR; ValueData: {app}; Flags: deletevalue createvalueifdoesntexist noerror; MinVersion: 0,4.00.1381
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: OCTAVEDIR; ValueData: {app}\share\qucs\octave; Flags: deletevalue createvalueifdoesntexist noerror; MinVersion: 0,4.00.1381
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueName: "Path"; ValueType: "string"; ValueData: "{app}\bin;{olddata}"; Check: NotOnPathAlready(); Flags: preservestringtype;
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueName: "Path"; ValueType: "string"; ValueData: "{code:OctaveDir};{olddata}"; Check: OctaveNotOnPathAlready(); Flags: preservestringtype;
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueName: "Path"; ValueType: "string"; ValueData: "{code:OctaveDir};{olddata}"; Tasks: octave; Check: OctaveNotOnPathAlready(); Flags: preservestringtype;
;Root: HKCU; Subkey: Environment; ValueType: string; ValueName: QUCSDIR; ValueData: {app}; Flags: deletevalue createvalueifdoesntexist; MinVersion: 0,4.00.1381
;Root: HKCU; Subkey: Environment; ValueType: string; ValueName: HOME; ValueData: {code:HomeDir}; Flags: createvalueifdoesntexist; MinVersion: 0,4.00.1381
;Root: HKCU; Subkey: Environment; ValueType: string; ValueName: ASCODIR; ValueData: {app}; Flags: deletevalue createvalueifdoesntexist; MinVersion: 0,4.00.1381
@ -155,20 +155,20 @@ function OctaveNotOnPathAlready(): Boolean;
var
BinDir, Path: String;
begin
Log('Checking if '+ {# octaveversion}+'\bin dir is already on the %PATH%');
Log('Checking if octave-{# octaveversion}\bin dir is already on the %PATH%');
if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'Path', Path) then
begin // Successfully read the value
Log('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\PATH = ' + Path);
BinDir := ExpandConstant('{pf}\{# octaveversion}\bin');
Log('Looking for '+{# octaveversion}+'\bin dir in %PATH%: ' + BinDir + ' in ' + Path);
BinDir := ExpandConstant('{pf}\octave-{# octaveversion}\bin');
Log('Looking for octave-{# octaveversion}\bin dir in %PATH%: ' + BinDir + ' in ' + Path);
if Pos(LowerCase(BinDir), Lowercase(Path)) = 0 then
begin
Log('Did not find '+{# octaveversion}+'\bin dir in %PATH% so will add it');
Log('Did not find octave-{# octaveversion}\bin dir in %PATH% so will add it');
Result := True;
end
else
begin
Log('Found '+{# octaveversion}+' bin dir in %PATH% so will not add it again');
Log('Found octave-{# octaveversion} bin dir in %PATH% so will not add it again');
Result := False;
end
end
@ -200,9 +200,9 @@ function DownloadOctave: Boolean;
var
ErrCode: Integer;
begin
MsgBox('A browser will be opened to download '+{# octaveversion}+' Setup', mbConfirmation, MB_OK);
MsgBox('A browser will be opened to download octave-{# octaveversion} Setup', mbConfirmation, MB_OK);
Result := True;
ShellExec('open', {# octavelink},
ShellExec('open', 'http://sourceforge.net/projects/octave/files/Octave%20Windows%20binaries/Octave%203.6.4%20for%20Windows%20Microsoft%20Visual%20Studio/octave-3.6.4-vs2010-setup.exe/download',
'', '', SW_SHOW, ewNoWait, ErrCode);
end;
@ -223,8 +223,6 @@ var Found : Boolean;
begin
Found := False;
while not Found do
begin
BrowseForFolder('Please select a directory where octave ' +
'is installed, then click OK.', Dir, False);
if DirExists (Dir) then
@ -234,6 +232,13 @@ begin
Found := True;
end;
end;
if Found = False then
begin
Dir := 'c:\Software\octave{# octaveversion}\bin';
end
else
begin
Dir := Dir + '\bin';
end;
Result := Dir;

18
debian/changelog vendored
View File

@ -1,3 +1,21 @@
qucs (0.0.17.130619-3) raring; urgency=low
* fixed some windows paths
-- Frans Schreuder <info@schreuderelectronics.com> Wed, 19 Jun 2013 22:58:34 +0200
qucs (0.0.17.130619-2) quantal; urgency=low
* fixed some windows paths
-- Frans Schreuder <info@schreuderelectronics.com> Wed, 19 Jun 2013 22:57:30 +0200
qucs (0.0.17.130619-1) precise; urgency=low
* fixed some windows paths
-- Frans Schreuder <info@schreuderelectronics.com> Wed, 19 Jun 2013 22:56:17 +0200
qucs (0.0.17.130617-3) raring; urgency=low
* Many Mac OSX specific release fixes