diff --git a/Robot/OpenRPA_32.cmd b/Robot/OpenRPA_32.cmd index f9e41e00..136762e1 100644 --- a/Robot/OpenRPA_32.cmd +++ b/Robot/OpenRPA_32.cmd @@ -1,2 +1,3 @@ cd %~dp0 -.\WPy32-3720\python-3.7.2\python.exe daemon.py \ No newline at end of file +.\..\Resources\WPy32-3720\python-3.7.2\python.exe daemon.py +pause >nul \ No newline at end of file diff --git a/Robot/PythonDebug_32.cmd b/Robot/PythonDebug_32.cmd index 33cc7f1b..eca1167e 100644 --- a/Robot/PythonDebug_32.cmd +++ b/Robot/PythonDebug_32.cmd @@ -1,2 +1,3 @@ cd %~dp0 -.\WPy32-3720\python-3.7.2\python.exe \ No newline at end of file +.\..\Resources\WPy32-3720\python-3.7.2\python.exe +pause >nul \ No newline at end of file diff --git a/Robot/daemon.py b/Robot/daemon.py index d7232778..089b5718 100644 --- a/Robot/daemon.py +++ b/Robot/daemon.py @@ -158,19 +158,19 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler): self.SendResponseContentTypeFile('text/html',"Index.xhtml") #Мост между файлом и http запросом (новый формат) if self.path == '/3rdParty/Semantic-UI-CSS-master/semantic.min.css': - self.SendResponseContentTypeFile('text/css',"3rdParty\\Semantic-UI-CSS-master\\semantic.min.css") + self.SendResponseContentTypeFile('text/css',"..\\Resources\\Web\\Semantic-UI-CSS-master\\semantic.min.css") #Мост между файлом и http запросом (новый формат) if self.path == '/3rdParty/Semantic-UI-CSS-master/semantic.min.js': - self.SendResponseContentTypeFile('application/javascript',"3rdParty\\Semantic-UI-CSS-master\\semantic.min.js") + self.SendResponseContentTypeFile('application/javascript',"..\\Resources\\Web\\Semantic-UI-CSS-master\\semantic.min.js") #Мост между файлом и http запросом (новый формат) if self.path == '/3rdParty/jQuery/jquery-3.1.1.min.js': - self.SendResponseContentTypeFile('application/javascript',"3rdParty\\jQuery\\jquery-3.1.1.min.js") + self.SendResponseContentTypeFile('application/javascript',"..\\Resources\\Web\\jQuery\\jquery-3.1.1.min.js") #Мост между файлом и http запросом (новый формат) if self.path == '/3rdParty/Google/LatoItalic.css': - self.SendResponseContentTypeFile('font/css',"3rdParty\\Google\\LatoItalic.css") + self.SendResponseContentTypeFile('font/css',"..\\Resources\\Web\\Google\\LatoItalic.css") #Мост между файлом и http запросом (новый формат) if self.path == '/3rdParty/Semantic-UI-CSS-master/themes/default/assets/fonts/icons.woff2': - self.SendResponseContentTypeFile('font/woff2',"3rdParty\\Semantic-UI-CSS-master\\themes\\default\\assets\\fonts\\icons.woff2") + self.SendResponseContentTypeFile('font/woff2',"..\\Resources\\Web\\Semantic-UI-CSS-master\\themes\\default\\assets\\fonts\\icons.woff2") #Мост между файлом и http запросом (новый формат) if self.path == '/favicon.ico': self.SendResponseContentTypeFile('image/x-icon',"favicon.ico") @@ -289,7 +289,7 @@ def run(): httpd.serve_forever() #Start childprocess 32 bit -p = subprocess.Popen(['WPy32-3720\\python-3.7.2\\python.exe','winGUI.py'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) +p = subprocess.Popen(['..\\Resources\\WPy32-3720\\python-3.7.2\\python.exe','winGUI.py'],stdin=subprocess.PIPE,stdout=subprocess.PIPE,stderr=subprocess.PIPE) #print(ChildProcessReadWaitString(p)) run() diff --git a/__pycache__/winGUI.cpython-37.pyc b/__pycache__/winGUI.cpython-37.pyc deleted file mode 100644 index 9aeb0336..00000000 Binary files a/__pycache__/winGUI.cpython-37.pyc and /dev/null differ