fixed install ... finally!
authorOliver Maurhart <oliver.maurhart@ait.ac.at>
Tue, 25 Mar 2014 14:25:34 +0100
changeset 984820361279cc
parent 94 fa16c1c12393
child 99 fff411611308
fixed install ... finally!
OpenSecurity.iss
OpenSecurity/bin/opensecurityd.pyw
     1.1 --- a/OpenSecurity.iss	Tue Mar 18 14:22:10 2014 +0100
     1.2 +++ b/OpenSecurity.iss	Tue Mar 25 14:25:34 2014 +0100
     1.3 @@ -8,12 +8,12 @@
     1.4  AppContact=AIT Austrian Institute of Technology
     1.5  AppPublisher=AIT Austrian Institute of Technology
     1.6  AppPublisherURL=http://www.ait.ac.at/
     1.7 -AppVersion=0.2.2
     1.8 +AppVersion=0.2.3
     1.9  ArchitecturesInstallIn64BitMode=x64
    1.10  DefaultDirName={pf}\OpenSecurity
    1.11  DefaultGroupName=OpenSecurity
    1.12  OutputDir="."
    1.13 -OutputBaseFilename="OpenSecurity Setup V0.2.2"
    1.14 +OutputBaseFilename="OpenSecurity Setup V0.2.3"
    1.15  OutputManifestFile=OpenSecurity-Setup-Manifest.txt
    1.16  SetupIconFile=OpenSecurity\gfx\OpenSecurity.ico
    1.17  SolidCompression=yes
    1.18 @@ -26,6 +26,8 @@
    1.19  Source: "OpenSecurity\gfx\*"; DestDir: "{app}\gfx"; Flags: recursesubdirs createallsubdirs;
    1.20  Source: "OpenSecurity\install\*"; DestDir: "{app}\install"; Flags: recursesubdirs createallsubdirs;
    1.21  Source: "OpenSecurity\python27\*"; DestDir: "{app}\python27"; Flags: recursesubdirs createallsubdirs;
    1.22 +Source: "OpenSecurity\python27\python27.dll"; DestDir: "{sys}"; Flags: sharedfile;
    1.23 +Source: "OpenSecurity\python27\Lib\site-packages\pywin32_system32\pywintypes27.dll"; DestDir: "{sys}"; Flags: sharedfile;
    1.24  
    1.25  [Dirs]
    1.26  Name: "{app}\cygwin64\var\log\xwin"; Permissions: everyone-modify
    1.27 @@ -45,7 +47,6 @@
    1.28  Filename: "{app}\cygwin64\bin\dash.exe"; Parameters: "/bin/rebaseall"; Description: "Rebasing background system"; WorkingDir: "{app}"; StatusMsg: "Rebasing background system..."; Flags: runascurrentuser
    1.29  Filename: "{app}\install\fix_cygwin_paths.bat"; Description: "Fixing Cygwin paths"; WorkingDir: "{app}\install"; StatusMsg: "Fixing Cygwin Paths...";
    1.30  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...";
    1.31 -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
    1.32  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
    1.33  Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" start"; Description: "Starting OpenSecurity Service"; WorkingDir: "{app}"; StatusMsg: "Starting OpenSecurity Service"; Flags: runascurrentuser
    1.34  Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_tray.pyw"""; WorkingDir: "{userappdata}"; Description: "Launching OpenSecurity Tray Icon"; Flags: nowait
    1.35 @@ -54,7 +55,6 @@
    1.36  ; When uninstalling run this command prior
    1.37  Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" stop"; WorkingDir: "{app}"; StatusMsg: "Stopping the OpenSecurity Service"; Flags: runascurrentuser
    1.38  Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" remove"; WorkingDir: "{app}"; StatusMsg: "Removing the OpenSecurity Service"; Flags: runascurrentuser
    1.39 -Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}python27\Scripts\pywin32_postinstall.py"" --uninstall"; WorkingDir: "{app}"; StatusMsg: "Unregistering Python Win32 Extensions"; Flags: runascurrentuser
    1.40  
    1.41  [UninstallDelete]
    1.42  Type: filesandordirs; Name: "{app}"
     2.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Tue Mar 18 14:22:10 2014 +0100
     2.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Tue Mar 25 14:25:34 2014 +0100
     2.3 @@ -50,7 +50,7 @@
     2.4  # ------------------------------------------------------------
     2.5  # const
     2.6  
     2.7 -__version__ = "0.2"
     2.8 +__version__ = "0.2.3"
     2.9  
    2.10  
    2.11  """All the URLs we know mapping to class handler"""
    2.12 @@ -385,6 +385,8 @@
    2.13      global gvm_mgr
    2.14      gvm_mgr = vmmanager.VMManager.getInstance()
    2.15      
    2.16 +    # tweak sys.argv to control wep.py server start behavior
    2.17 +    sys.argv = [__file__, "8080"]
    2.18      server = web.application(opensecurity_urls, globals(), autoreload = False)
    2.19      server.run()
    2.20