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

small changes to build and Win32 package scripts

Browse Source 
* set to reuse previous installed path
* use modpath to append windows PATH
This commit is contained in:
Guilherme Brondani Torri 2014-06-09 01:23:24 +02:00
parent 83d7519b40
commit 8d31e8fb14
5 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/innosetup/freehdl.iss
View File

@ -53,6 +53,7 @@ OutputBaseFilename={# BASENAME}-{# RELEASE}-setup
Compression=lzma
SolidCompression=yes
ChangesEnvironment=yes
UsePreviousAppDir=yes
; no admin right required http://www.kinook.com/blog/?p=53
;PrivilegesRequired=none

23
contrib/innosetup/mingw-w64.iss
View File

@ -33,6 +33,7 @@
; changelog
; - add ModPath.iss, to append PATH (http://www.legroom.net/software/modpath)
; - try to append mingw/bin to system PATH or user PATH
#define RELEASE "i686-4.8.2-release-posix-dwarf-rt_v3-rev3"
@ -56,14 +57,16 @@ LicenseFile={# TREE}\gpl.rtf
OutputBaseFilename={# BASENAME}-{# RELEASE}-setup
Compression=lzma
SolidCompression=yes
ChangesEnvironment=yes
ChangesEnvironment=true
UsePreviousAppDir=yes
; no admin right required http://www.kinook.com/blog/?p=53
;PrivilegesRequired=none
;DefaultDirName={code:DefDirRoot}\mingw32
[Registry]
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: expandsz; ValueName: "PATH"; ValueData: "{olddata};{app}/bin"; Flags: deletevalue createvalueifdoesntexist noerror; MinVersion: 0,4.00.1381
;[Registry]
;Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: expandsz; ValueName: "PATH"; ValueData: "{olddata};{app}/bin"; Flags: deletevalue createvalueifdoesntexist noerror; MinVersion: 0,4.00.1381
;Root: HKCU; Subkey: Environment; ValueType: string; ValueName: "PATH"; ValueData: {app}/bin; Flags: deletevalue createvalueifdoesntexist; MinVersion: 0,4.00.1381
@ -71,6 +74,8 @@ Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment
[Tasks]
; Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
Name: modifypath; Description: &Add Mingw-w64 executable directory to the system PATH; Flags: checkedonce
[Files]
Source: "{# TREE}\bin\*"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
@ -103,3 +108,15 @@ function DefDirRoot(Param: String): String;
else
Result := ExpandConstant('{pf}')
end;
const
ModPathName = 'modifypath';
ModPathType = 'system';
function ModPathDir(): TArrayOfString;
begin
setArrayLength(Result, 1)
Result[0] := ExpandConstant('{app}\bin');
end;
#include "modpath.iss"

12
contrib/innosetup/qucs.iss
View File

@ -21,6 +21,7 @@
;
; changelog
; - add infobefore about path with spaces
; - commented out non admin install, doesn't seem to work
; - enable non admin install
@ -52,6 +53,9 @@ OutputBaseFilename={# BASENAME}-{# RELEASE}-setup
Compression=lzma
SolidCompression=yes
ChangesEnvironment=yes
InfoBeforeFile={# TREE}\infobefore.rtf
UsePreviousAppDir=yes
; no admin right required http://www.kinook.com/blog/?p=53
;PrivilegesRequired=none
;DefaultDirName={code:DefDirRoot}\Qucs
@ -61,10 +65,10 @@ Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: HOME; ValueData: "{code:HomeDir}"; Flags: createvalueifdoesntexist noerror; MinVersion: 0,4.00.1381
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: ADMSXMLBINDIR; ValueData: "{app}\bin"; Flags: deletevalue createvalueifdoesntexist noerror; MinVersion: 0,4.00.1381
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: ASCOBINDIR; ValueData: "{app}\bin"; Flags: createvalueifdoesntexist noerror ; MinVersion: 0,4.00.1381
;let octave take care of its registry
;Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: OCTAVEDIR; ValueData: {app}\share\qucs\octave; Flags: deletevalue createvalueifdoesntexist noerror uninsdeletekey; 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 noerror;
;Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueName: "Path"; ValueType: "string"; ValueData: "{code:OctaveDir};{olddata}"; Tasks: octave; Check: OctaveNotOnPathAlready(); Flags: preservestringtype noerror;
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueType: string; ValueName: OCTAVEDIR; ValueData: {app}\share\qucs\octave; Flags: deletevalue createvalueifdoesntexist noerror uninsclearvalue; 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 noerror;
Root: HKLM; Subkey: SYSTEM\CurrentControlSet\Control\Session Manager\Environment; ValueName: "Path"; ValueType: "string"; ValueData: "{code:OctaveDir};{olddata}"; Tasks: octave; Check: OctaveNotOnPathAlready(); Flags: preservestringtype noerror;
; handle Current User install
;Root: HKCU; Subkey: Environment; ValueType: string; ValueName: QUCSDIR; ValueData: {app}; Flags: deletevalue createvalueifdoesntexist noerror uninsdeletekey; MinVersion: 0,4.00.1381

2
contrib/mingw-w64-installer-win32.sh
View File

@ -29,8 +29,10 @@ INNOSETUP="${HOME}/.wine/drive_c/Program Files/Inno Setup 5/Compil32.exe"
echo Create Inno Setup installer...
cp ${HOME}/git/qucs/qucs/contrib/innosetup/mingw-w64.iss .
cp ${HOME}/git/qucs/qucs/contrib/innosetup/modpath.iss .
wine "$INNOSETUP" /cc mingw-w64.iss
rm mingw-w64.iss
rm modpath.iss
# TODO version is hardcoded on the Inno Setup file
echo Copy mingw installer to ~/Downloads/

1
contrib/qucs_installer_win32.sh
View File

@ -49,6 +49,7 @@ export QTDIR=${HOME}/.wine/drive_c/Qt/4.8.6
# add to installer content GPL notice, Icons, site locations
echo Copy Inno contents...
cp ${REPO}/qucs/contrib/innosetup/gpl.rtf $WINDIR
cp ${REPO}/qucs/contrib/innosetup/infobefore.rtf $WINDIR
cp -r ${REPO}/qucs/contrib/innosetup/misc $WINDIR
# add Icarus Verilog installer