Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
client
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
2
Merge Requests
0
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e4e27bf2
authored
10 years ago
by
Csók Tamás
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Selenium dependency solved
parent
ff617f6a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
16 deletions
+14
-16
dist/CIRCLE_Client_Setup.exe
+0
-0
src/batch/install.bat
+1
-2
src/iss/cloud.iss
+2
-2
src/iss/installer/cloud.py
+5
-5
src/iss/installer/install.bat
+1
-2
src/python/cloud.py
+5
-5
No files found.
dist/CIRCLE_Client_Setup.exe
View file @
e4e27bf2
No preview for this file type
This diff is collapsed.
Click to expand it.
src/batch/install.bat
View file @
e4e27bf2
...
...
@@ -40,8 +40,7 @@ if '%errorlevel%' NEQ '0' (
:UACPrompt
echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
set params = %*:"=""
echo UAC.ShellExecute "cmd.exe", "/c %~s0 %params%", "", "runas", 1 >> "%temp%\getadmin.vbs"
echo UAC.ShellExecute "cmd.exe", "/c %~s0 !output_on_screen! !install_selenium! ^"!site!^"", "", "runas", 1 >> "%temp%\getadmin.vbs"
"%temp%\getadmin.vbs"
del "%temp%\getadmin.vbs"
...
...
This diff is collapsed.
Click to expand it.
src/iss/cloud.iss
View file @
e4e27bf2
...
...
@@ -25,8 +25,8 @@ DisableDirPage=yes
DefaultGroupName={#MyAppName}
AllowNoIcons=yes
OutputBaseFilename=setup
SetupIconFile=
C:\Users\Godhak\Desktop\client\dist
\cloud.ico
UninstallIconFile=
C:\Users\Godhak\Desktop\client\dist
\cloud.ico
SetupIconFile=
installer
\cloud.ico
UninstallIconFile=
installer
\cloud.ico
Compression=lzma
SolidCompression=yes
...
...
This diff is collapsed.
Click to expand it.
src/iss/installer/cloud.py
View file @
e4e27bf2
...
...
@@ -5,10 +5,6 @@
# A cloudban létrehozott virtuális gépekhez történő kapcsolódást segítő program
##
from
selenium
import
webdriver
from
selenium.webdriver.common.by
import
By
from
selenium.webdriver.support.ui
import
WebDriverWait
from
selenium.webdriver.support
import
expected_conditions
as
EC
import
platform
,
argparse
,
sys
,
time
##
...
...
@@ -145,7 +141,11 @@ def main():
vm
.
protocol
,
vm
.
user
,
vm
.
password
,
vm
.
host
,
vm
.
port
=
args
.
uri
.
split
(
':'
,
4
)
vm
.
protocol
=
vm
.
protocol
.
upper
()
vm
.
state
=
"RUN"
else
:
else
:
from
selenium
import
webdriver
from
selenium.webdriver.common.by
import
By
from
selenium.webdriver.support.ui
import
WebDriverWait
from
selenium.webdriver.support
import
expected_conditions
as
EC
browser
=
Browser
(
args
)
try
:
if
args
.
old
:
...
...
This diff is collapsed.
Click to expand it.
src/iss/installer/install.bat
View file @
e4e27bf2
...
...
@@ -40,8 +40,7 @@ if '%errorlevel%' NEQ '0' (
:UACPrompt
echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
set params = %*:"=""
echo UAC.ShellExecute "cmd.exe", "/c %~s0 %params%", "", "runas", 1 >> "%temp%\getadmin.vbs"
echo UAC.ShellExecute "cmd.exe", "/c %~s0 !output_on_screen! !install_selenium! ^"!site!^"", "", "runas", 1 >> "%temp%\getadmin.vbs"
"%temp%\getadmin.vbs"
del "%temp%\getadmin.vbs"
...
...
This diff is collapsed.
Click to expand it.
src/python/cloud.py
View file @
e4e27bf2
...
...
@@ -5,10 +5,6 @@
# A cloudban létrehozott virtuális gépekhez történő kapcsolódást segítő program
##
from
selenium
import
webdriver
from
selenium.webdriver.common.by
import
By
from
selenium.webdriver.support.ui
import
WebDriverWait
from
selenium.webdriver.support
import
expected_conditions
as
EC
import
platform
,
argparse
,
sys
,
time
##
...
...
@@ -145,7 +141,11 @@ def main():
vm
.
protocol
,
vm
.
user
,
vm
.
password
,
vm
.
host
,
vm
.
port
=
args
.
uri
.
split
(
':'
,
4
)
vm
.
protocol
=
vm
.
protocol
.
upper
()
vm
.
state
=
"RUN"
else
:
else
:
from
selenium
import
webdriver
from
selenium.webdriver.common.by
import
By
from
selenium.webdriver.support.ui
import
WebDriverWait
from
selenium.webdriver.support
import
expected_conditions
as
EC
browser
=
Browser
(
args
)
try
:
if
args
.
old
:
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment