Changeset 90d389d in sasview

Timestamp:

Sep 15, 2016 8:33:57 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

15fd91b

Parents:

158cb9e

git-author:

Piotr Rozyczko <rozyczko@…> (08/19/16 04:50:48)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/15/16 08:33:57)

Message:

Updated deployment test script

File:

• build_tools/sasview_deploy_test.au3 (modified) (3 diffs)

build_tools/sasview_deploy_test.au3

@@ -6 +6 @@
 ;
 ; 0 - OK
-; 1 - Download failure
-; 2 - Installer failure
-; 3 - Problems running SasView (simple fitting)
-; 4 - Uninstaller failure
+; 1 - Installer failure
+; 2 - Problems running SasView (simple fitting)
+; 3 - Uninstaller failure
 
 #include <Constants.au3>
 #include <FileConstants.au3>
 #include <MsgBoxConstants.au3>
-#include <InetConstants.au3>
 #include <WinAPIFiles.au3>
 
-; Custom error handler
-;Global $oMyError = ObjEvent("AutoIt.Error","MyErrFunc")
-
 ; Modifiable globals
-if $CmdLine[0] == 0 Then
-   ; Expected command line with the build number as argument
-   Exit (-1)
+Global $fInstallerLocation = @TempDir & "\setupSasView.exe"
+if $CmdLine[0] > 0 Then
+   ; If argument present - use it as local download path
+   $fInstallerLocation = $CmdLine[1]
 EndIf
 
-Local $lBuildNumber = $CmdLine[1]
-;Global $fInstallerLocation = "C:\util\setupSasView.exe" ; debug and testing location
-Global $fInstallerLocation = @TempDir & "\setupSasView.exe"
-Global $fRemoteInstallerLocation = "https://jenkins.esss.dk/sasview/job/SasView_Win7_Test/" & $lBuildNumber & "/artifact/sasview/dist/setupSasView.exe"
 Global $fUninstallerLocation = "C:\Program Files (x86)\SasView\unins000.exe"
 Global $lTimeout = 10          ; 10 sec timeout for waiting on windows
@@ -37 +29 @@
 Global $installerPID = 0
 
-
 ;; MAIN SCRIPT
-Download()
 Install()
 RunSasView()
 Uninstall()
-
 Exit(0)
 
 ;==============================================================
-Func Download()
-   ; Download the file in the background with the selected option of 'force a reload from the remote site.'
-   ConsoleWrite("Downloading...." & @CRLF)
-   Local $iFailFlag = 1
-   Local $hDownload = InetGet($fRemoteInstallerLocation, $fInstallerLocation, $INET_FORCERELOAD)
-
-    ; Close the handle returned by InetGet.
-    InetClose($hDownload)
-        Assert($hDownload, $iFailFlag)
-        ConsoleWrite("Installer downloaded successfully to " & $fInstallerLocation & @CRLF)
-
-EndFunc
 
 Func Install()
    ;;;;; APPLICATION INSTALLED ;;;;;;;
    Local $sSetupWindow = "Setup - SasView"
-   Local $iFailFlag = 2
+   Local $iFailFlag = 1
    ; Run setup
    if FileExists($fInstallerLocation) Then
@@ -75 +52 @@
 
    ; License click through
-   WinActivate($sSetupWindow) ; <-- REQUIRED when connecting from another host
+   WinActivate($sSetupWindow)
    Local $test = WinWaitActive($sSetupWindow, "License Agreement", $lTimeout)
    ;ConsoleWrite("license agreement: " & $test)