# HG changeset patch # User Oliver Maurhart # Date 1395148930 -3600 # Node ID fa16c1c123932f819daf18260adc7d8291db522b # Parent 8fe521017397be6b46de3fa82ff38dfd199d838e postprocessing pywin32 and nowait for tray-icon launch diff -r 8fe521017397 -r fa16c1c12393 .hgignore --- a/.hgignore Mon Mar 10 15:23:16 2014 +0100 +++ b/.hgignore Tue Mar 18 14:22:10 2014 +0100 @@ -24,6 +24,7 @@ OpenSecurity/python27/DLLs OpenSecurity/python27/Lib OpenSecurity/python27/libs +OpenSecurity/python27/Scripts OpenSecurity/python27/python.exe OpenSecurity/python27/python27.dll OpenSecurity/python27/pythoncom27.dll diff -r 8fe521017397 -r fa16c1c12393 OpenSecurity.iss --- a/OpenSecurity.iss Mon Mar 10 15:23:16 2014 +0100 +++ b/OpenSecurity.iss Tue Mar 18 14:22:10 2014 +0100 @@ -8,12 +8,12 @@ AppContact=AIT Austrian Institute of Technology AppPublisher=AIT Austrian Institute of Technology AppPublisherURL=http://www.ait.ac.at/ -AppVersion=0.2.1 +AppVersion=0.2.2 ArchitecturesInstallIn64BitMode=x64 DefaultDirName={pf}\OpenSecurity DefaultGroupName=OpenSecurity OutputDir="." -OutputBaseFilename="OpenSecurity Setup V0.2.1" +OutputBaseFilename="OpenSecurity Setup V0.2.2" OutputManifestFile=OpenSecurity-Setup-Manifest.txt SetupIconFile=OpenSecurity\gfx\OpenSecurity.ico SolidCompression=yes @@ -45,14 +45,16 @@ Filename: "{app}\cygwin64\bin\dash.exe"; Parameters: "/bin/rebaseall"; Description: "Rebasing background system"; WorkingDir: "{app}"; StatusMsg: "Rebasing background system..."; Flags: runascurrentuser Filename: "{app}\install\fix_cygwin_paths.bat"; Description: "Fixing Cygwin paths"; WorkingDir: "{app}\install"; StatusMsg: "Fixing Cygwin Paths..."; Filename: "{app}\cygwin64\bin\bash.exe"; Parameters: "-l -i -c echo -n"; Description: "Enforcing login environment for shells"; WorkingDir: "{app}"; StatusMsg: "Enforcing login environment for shells..."; +Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}python27\Scripts\pywin32_postinstall.py"" --install"; Description: "Registering Python Win32 Extensions"; WorkingDir: "{app}"; StatusMsg: "Registering Python Win32 Extensions"; Flags: runascurrentuser Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" --startup auto install"; Description: "Installing the OpenSecurity Service"; WorkingDir: "{app}"; StatusMsg: "Installing the OpenSecurity Service"; Flags: runascurrentuser Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" start"; Description: "Starting OpenSecurity Service"; WorkingDir: "{app}"; StatusMsg: "Starting OpenSecurity Service"; Flags: runascurrentuser -Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_tray.pyw"""; WorkingDir: "{userappdata}"; Description: "Launching OpenSecurity Tray Icon"; +Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_tray.pyw"""; WorkingDir: "{userappdata}"; Description: "Launching OpenSecurity Tray Icon"; Flags: nowait [UninstallRun] ; When uninstalling run this command prior Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" stop"; WorkingDir: "{app}"; StatusMsg: "Stopping the OpenSecurity Service"; Flags: runascurrentuser Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" remove"; WorkingDir: "{app}"; StatusMsg: "Removing the OpenSecurity Service"; Flags: runascurrentuser +Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}python27\Scripts\pywin32_postinstall.py"" --uninstall"; WorkingDir: "{app}"; StatusMsg: "Unregistering Python Win32 Extensions"; Flags: runascurrentuser [UninstallDelete] Type: filesandordirs; Name: "{app}"