[tuxdroid-svn] r4702 - in software_suite_v3/smart-core/smart-server/trunk: delphi_launchers delphi
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r4702 - in software_suite_v3/smart-core/smart-server/trunk: delphi_launchers delphi_launchers/restart delphi_launchers/start delphi_launchers/stop util/misc
|
From: remi <c2m...@c2...> - 2009-05-29 12:09:06
|
Author: remi
Date: 2009-05-29 14:08:56 +0200 (Fri, 29 May 2009)
New Revision: 4702
Added:
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/smart_server_restart.dpr
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/smart_server_restart.res
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_restart.exe
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_start.exe
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_stop.exe
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/smart_server_start.dpr
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/smart_server_start.res
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/smart_server_stop.dpr
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/smart_server_stop.res
Removed:
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/tuxdroidserver_restart.dpr
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/tuxdroidserver_restart.res
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/tuxdroidserver_start.dpr
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/tuxdroidserver_start.res
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/tuxdroidserver_stop.dpr
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/tuxdroidserver_stop.res
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/tuxhttpserver_restart.exe
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/tuxhttpserver_start.exe
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/tuxhttpserver_stop.exe
Modified:
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/restart.pas
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/start.pas
software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/stop.pas
software_suite_v3/smart-core/smart-server/trunk/util/misc/tuxPaths.py
Log:
* updated smart-server start/stop/restart on Windows
* updated registry path for Tux Droid installation
Modified: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/restart.pas
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/restart.pas 2009-05-29 10:26:44 UTC (rev 4701)
+++ software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/restart.pas 2009-05-29 12:08:56 UTC (rev 4702)
@@ -31,7 +31,7 @@
Registry;
const
- TUXDROID_REGISTRY_PATH = 'SOFTWARE\Tuxdroid\TuxdroidSetup';
+ TUXDROID_REGISTRY_PATH = 'SOFTWARE\Tux Droid\Installation';
type
TForm1 = class(TForm)
@@ -105,7 +105,7 @@
*}
begin
tuxdroid_path := getTuxdroidInstallDirectory;
- serverFileName := format('%s\softwares\tuxhttpserver\tuxhttpserver.py',
+ serverFileName := format('%s\softwares\smart-server\tuxhttpserver.py',
[tuxdroid_path]);
serverPath := extractFilePath(serverFileName);
ShellExecute(
Copied: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/smart_server_restart.dpr (from rev 4701, software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/tuxdroidserver_restart.dpr)
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/smart_server_restart.dpr (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/smart_server_restart.dpr 2009-05-29 12:08:56 UTC (rev 4702)
@@ -0,0 +1,14 @@
+program smart_server_restart;
+
+uses
+ Forms,
+ restart in 'restart.pas' {Form1};
+
+{$R *.res}
+
+begin
+ Application.Initialize;
+ Application.Title := 'Tux Droid Server';
+ Application.CreateForm(TForm1, Form1);
+ Application.Run;
+end.
Copied: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/smart_server_restart.res (from rev 4701, software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/tuxdroidserver_restart.res)
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/tuxdroidserver_restart.dpr
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/tuxdroidserver_restart.dpr 2009-05-29 10:26:44 UTC (rev 4701)
+++ software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/tuxdroidserver_restart.dpr 2009-05-29 12:08:56 UTC (rev 4702)
@@ -1,14 +0,0 @@
-program tuxdroidserver_restart;
-
-uses
- Forms,
- restart in 'restart.pas' {Form1};
-
-{$R *.res}
-
-begin
- Application.Initialize;
- Application.Title := 'Tux Droid Server';
- Application.CreateForm(TForm1, Form1);
- Application.Run;
-end.
Deleted: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/restart/tuxdroidserver_restart.res
===================================================================
(Binary files differ)
Added: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_restart.exe
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_restart.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Name: svn:keywords
+ Id
Added: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_start.exe
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_start.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Name: svn:keywords
+ Id
Added: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_stop.exe
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/smart_server_stop.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Name: svn:keywords
+ Id
Copied: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/smart_server_start.dpr (from rev 4701, software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/tuxdroidserver_start.dpr)
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/smart_server_start.dpr (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/smart_server_start.dpr 2009-05-29 12:08:56 UTC (rev 4702)
@@ -0,0 +1,14 @@
+program smart_server_start;
+
+uses
+ Forms,
+ start in 'start.pas' {Form1};
+
+{$R *.res}
+
+begin
+ Application.Initialize;
+ Application.Title := 'Tux Droid Server';
+ Application.CreateForm(TForm1, Form1);
+ Application.Run;
+end.
Copied: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/smart_server_start.res (from rev 4701, software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/tuxdroidserver_start.res)
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/start.pas
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/start.pas 2009-05-29 10:26:44 UTC (rev 4701)
+++ software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/start.pas 2009-05-29 12:08:56 UTC (rev 4702)
@@ -30,7 +30,7 @@
Registry;
const
- TUXDROID_REGISTRY_PATH = 'SOFTWARE\Tuxdroid\TuxdroidSetup';
+ TUXDROID_REGISTRY_PATH = 'SOFTWARE\Tux Droid\Installation';
type
TForm1 = class(TForm)
@@ -76,7 +76,7 @@
*}
begin
tuxdroid_path := getTuxdroidInstallDirectory;
- serverFileName := format('%s\softwares\tuxhttpserver\tuxhttpserver.py',
+ serverFileName := format('%s\softwares\smart-server\tuxhttpserver.py',
[tuxdroid_path]);
serverPath := extractFilePath(serverFileName);
ShellExecute(
Deleted: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/tuxdroidserver_start.dpr
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/tuxdroidserver_start.dpr 2009-05-29 10:26:44 UTC (rev 4701)
+++ software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/tuxdroidserver_start.dpr 2009-05-29 12:08:56 UTC (rev 4702)
@@ -1,14 +0,0 @@
-program tuxdroidserver_start;
-
-uses
- Forms,
- start in 'start.pas' {Form1};
-
-{$R *.res}
-
-begin
- Application.Initialize;
- Application.Title := 'Tux Droid Server';
- Application.CreateForm(TForm1, Form1);
- Application.Run;
-end.
Deleted: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/start/tuxdroidserver_start.res
===================================================================
(Binary files differ)
Copied: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/smart_server_stop.dpr (from rev 4701, software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/tuxdroidserver_stop.dpr)
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/smart_server_stop.dpr (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/smart_server_stop.dpr 2009-05-29 12:08:56 UTC (rev 4702)
@@ -0,0 +1,14 @@
+program smart_server_stop;
+
+uses
+ Forms,
+ stop in 'stop.pas' {Form1};
+
+{$R *.res}
+
+begin
+ Application.Initialize;
+ Application.Title := 'Tux Droid Server';
+ Application.CreateForm(TForm1, Form1);
+ Application.Run;
+end.
Copied: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/smart_server_stop.res (from rev 4701, software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/tuxdroidserver_stop.res)
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/stop.pas
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/stop.pas 2009-05-29 10:26:44 UTC (rev 4701)
+++ software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/stop.pas 2009-05-29 12:08:56 UTC (rev 4702)
@@ -30,7 +30,7 @@
Registry;
const
- TUXDROID_REGISTRY_PATH = 'SOFTWARE\Tuxdroid\TuxdroidSetup';
+ TUXDROID_REGISTRY_PATH = 'SOFTWARE\Tux Droid\Installation';
type
TForm1 = class(TForm)
@@ -76,7 +76,7 @@
*}
begin
tuxdroid_path := getTuxdroidInstallDirectory;
- serverFileName := format('%s\softwares\tuxhttpserver\tuxhttpserver.py',
+ serverFileName := format('%s\softwares\smart-server\tuxhttpserver.py',
[tuxdroid_path]);
serverPath := extractFilePath(serverFileName);
ShellExecute(
Deleted: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/tuxdroidserver_stop.dpr
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/tuxdroidserver_stop.dpr 2009-05-29 10:26:44 UTC (rev 4701)
+++ software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/tuxdroidserver_stop.dpr 2009-05-29 12:08:56 UTC (rev 4702)
@@ -1,14 +0,0 @@
-program tuxdroidserver_stop;
-
-uses
- Forms,
- stop in 'stop.pas' {Form1};
-
-{$R *.res}
-
-begin
- Application.Initialize;
- Application.Title := 'Tux Droid Server';
- Application.CreateForm(TForm1, Form1);
- Application.Run;
-end.
Deleted: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/stop/tuxdroidserver_stop.res
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/tuxhttpserver_restart.exe
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/tuxhttpserver_start.exe
===================================================================
(Binary files differ)
Deleted: software_suite_v3/smart-core/smart-server/trunk/delphi_launchers/tuxhttpserver_stop.exe
===================================================================
(Binary files differ)
Modified: software_suite_v3/smart-core/smart-server/trunk/util/misc/tuxPaths.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/misc/tuxPaths.py 2009-05-29 10:26:44 UTC (rev 4701)
+++ software_suite_v3/smart-core/smart-server/trunk/util/misc/tuxPaths.py 2009-05-29 12:08:56 UTC (rev 4702)
@@ -23,7 +23,7 @@
"""Fill the default locutor for a iso lang.
"""
global TUXDROID_DEFAULT_LOCUTOR
-
+
if isoLang == "ar":
TUXDROID_DEFAULT_LOCUTOR = "Salma8k"
elif isoLang == "en_GB":
@@ -56,7 +56,7 @@
if os.name == 'nt':
from _winreg import *
aReg = ConnectRegistry(None, HKEY_LOCAL_MACHINE)
- aKey = OpenKey(aReg, r"SOFTWARE\Tuxdroid\TuxdroidSetup")
+ aKey = OpenKey(aReg, r"SOFTWARE\Tux Droid\Installation")
TUXDROID_BASE_PATH = QueryValueEx(aKey, "Install_Dir")[0]
TUXDROID_LANGUAGE = QueryValueEx(aKey, "Language")[0]
CloseKey(aReg)
@@ -76,4 +76,4 @@
f.close()
except:
TUXDROID_BASE_PATH = "/usr/share/tuxdroid"
-USER_BASE_PATH = os.path.expanduser("~")
\ No newline at end of file
+USER_BASE_PATH = os.path.expanduser("~")
|
