Author: remi
Date: 2008-09-16 12:00:01 +0200 (Tue, 16 Sep 2008)
New Revision: 1849
Added:
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpserver_start.exe
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpserver_stop.exe
Removed:
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice.exe
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_install.bat
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_start.bat
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_stop.bat
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_uninstall.bat
Modified:
software_suite_v2/tuxware/tuxhttpserver/trunk/src/installer.nsi
software_suite_v2/tuxware/tuxhttpserver/trunk/src/version.py
Log:
* removed the tuxhttpservice for windows (and it batch files)
* added 2 programs which start and stop the python httpserver
* added the start of tuxhttpserver on windows start (NSIS script)
* updated the version from 0.0.2-Alpha to 0.0.2
Modified: software_suite_v2/tuxware/tuxhttpserver/trunk/src/installer.nsi
===================================================================
--- software_suite_v2/tuxware/tuxhttpserver/trunk/src/installer.nsi
2008-09-16 09:32:15 UTC (rev 1848)
+++ software_suite_v2/tuxware/tuxhttpserver/trunk/src/installer.nsi
2008-09-16 10:00:01 UTC (rev 1849)
@@ -4,7 +4,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Tuxdroid HTTP server"
-!define PRODUCT_VERSION "0.0.2-Alpha"
+!define PRODUCT_VERSION "0.0.2"
; The name of the installer
@@ -33,10 +33,7 @@
; Needed
SectionIn RO
- ; Stop tuxhttpserver
- ExecDos::exec /NOUNLOAD /ASYNC /TIMEOUT=5000
"c:\tuxdroid\bin\tuxhttpservice_uninstall.bat"
- Pop $0
- ExecDos::wait $0
+ ExecWait '"$INSTDIR\uninstall.exe" /S _?=$INSTDIR'
SectionEnd
; -----------------------------------------------------------------------------
@@ -63,13 +60,10 @@
File setup.py
File tuxhttpserver.py
File version.py
- File tuxhttpservice.exe
SetOutPath "c:\tuxdroid\bin"
- File tuxhttpservice_start.bat
- File tuxhttpservice_stop.bat
- File tuxhttpservice_install.bat
- File tuxhttpservice_uninstall.bat
+ File tuxhttpserver_start.exe
+ File tuxhttpserver_stop.exe
SetOutPath "c:\tuxdroid\ico"
File tuxsys.ico
@@ -78,8 +72,9 @@
CreateDirectory "$SMPROGRAMS\Tuxdroid"
CreateDirectory "$SMPROGRAMS\Tuxdroid\Tuxware"
CreateDirectory "$SMPROGRAMS\Tuxdroid\Tuxware\HTTPServer"
- CreateShortCut "$SMPROGRAMS\Tuxdroid\Tuxware\HTTPServer\Start.lnk"
"c:\tuxdroid\bin\tuxhttpservice_start.bat" "" "c:\tuxdroid\ico\tuxsys.ico" 0
- CreateShortCut "$SMPROGRAMS\Tuxdroid\Tuxware\HTTPServer\Stop.lnk"
"c:\tuxdroid\bin\tuxhttpservice_stop.bat" "" "c:\tuxdroid\ico\tuxsys.ico" 0
+ CreateShortCut "$SMPROGRAMS\Tuxdroid\Tuxware\HTTPServer\Start.lnk"
"c:\tuxdroid\bin\tuxhttpserver_start.exe" "" "c:\tuxdroid\ico\tuxsys.ico" 0
+ CreateShortCut "$SMPROGRAMS\Tuxdroid\Tuxware\HTTPServer\Stop.lnk"
"c:\tuxdroid\bin\tuxhttpserver_stop.exe" "" "c:\tuxdroid\ico\tuxsys.ico" 0
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"TuxHTTPServer" "c:\tuxdroid\bin\tuxhttpserver_start.exe"
; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\Tuxdroid\TuxHTTPServer "Install_Dir" "$INSTDIR"
@@ -104,7 +99,7 @@
; -----------------------------------------------------------------------------
Section -Post
; Install the server as service
- ExecDos::exec /NOUNLOAD /ASYNC /TIMEOUT=5000
"c:\tuxdroid\bin\tuxhttpservice_install.bat"
+ ExecDos::exec /NOUNLOAD /ASYNC /TIMEOUT=5000
"c:\tuxdroid\bin\tuxhttpserver_start.exe"
Pop $0
ExecDos::wait $0
@@ -117,19 +112,18 @@
; -----------------------------------------------------------------------------
Section "Uninstall"
; Uninstall the server as service
- ExecDos::exec /NOUNLOAD /ASYNC /TIMEOUT=5000
"c:\tuxdroid\bin\tuxhttpservice_uninstall.bat"
+ ExecDos::exec /NOUNLOAD /ASYNC /TIMEOUT=5000
"c:\tuxdroid\bin\tuxhttpserver_stop.exe"
Pop $0
ExecDos::wait $0
; Remove registry keys
DeleteRegKey HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\TuxHTTPServer"
DeleteRegKey HKLM SOFTWARE\Tuxdroid\TuxHTTPServer
+ DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"TuxHTTPServer"
; Remove files and uninstaller
- Delete "c:\tuxdroid\bin\tuxhttpservice_start.bat"
- Delete "c:\tuxdroid\bin\tuxhttpservice_stop.bat"
- Delete "c:\tuxdroid\bin\tuxhttpservice_install.bat"
- Delete "c:\tuxdroid\bin\tuxhttpservice_uninstall.bat"
+ Delete "c:\tuxdroid\bin\tuxhttpserver_start.exe"
+ Delete "c:\tuxdroid\bin\tuxhttpserver_stop.exe"
Delete "c:\tuxdroid\ico\tuxsys.ico"
RMDir /r $INSTDIR
Delete $INSTDIR\uninstall.exe
Added: software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpserver_start.exe
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpserver_start.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpserver_stop.exe
===================================================================
(Binary files differ)
Property changes on:
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpserver_stop.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice.exe
===================================================================
(Binary files differ)
Deleted:
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_install.bat
===================================================================
---
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_install.bat
2008-09-16 09:32:15 UTC (rev 1848)
+++
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_install.bat
2008-09-16 10:00:01 UTC (rev 1849)
@@ -1,2 +0,0 @@
-c:\tuxdroid\bin\tuxhttpserver\tuxhttpservice.exe /INSTALL /SILENT
-net start "TuxHTTPServer"
\ No newline at end of file
Deleted:
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_start.bat
===================================================================
--- software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_start.bat
2008-09-16 09:32:15 UTC (rev 1848)
+++ software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_start.bat
2008-09-16 10:00:01 UTC (rev 1849)
@@ -1 +0,0 @@
-net start "TuxHTTPServer"
\ No newline at end of file
Deleted:
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_stop.bat
===================================================================
--- software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_stop.bat
2008-09-16 09:32:15 UTC (rev 1848)
+++ software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_stop.bat
2008-09-16 10:00:01 UTC (rev 1849)
@@ -1 +0,0 @@
-net stop "TuxHTTPServer"
\ No newline at end of file
Deleted:
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_uninstall.bat
===================================================================
---
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_uninstall.bat
2008-09-16 09:32:15 UTC (rev 1848)
+++
software_suite_v2/tuxware/tuxhttpserver/trunk/src/tuxhttpservice_uninstall.bat
2008-09-16 10:00:01 UTC (rev 1849)
@@ -1,2 +0,0 @@
-net stop "TuxHTTPServer"
-c:\tuxdroid\bin\tuxhttpserver\tuxhttpservice.exe /UNINSTALL /SILENT
\ No newline at end of file
Modified: software_suite_v2/tuxware/tuxhttpserver/trunk/src/version.py
===================================================================
--- software_suite_v2/tuxware/tuxhttpserver/trunk/src/version.py
2008-09-16 09:32:15 UTC (rev 1848)
+++ software_suite_v2/tuxware/tuxhttpserver/trunk/src/version.py
2008-09-16 10:00:01 UTC (rev 1849)
@@ -17,7 +17,7 @@
REVISION = 0
name = 'tuxhttpserver'
-version = '0.0.2-Alpha'
+version = '0.0.2'
author = "Remi Jocaille ([EMAIL PROTECTED])"
description = "HTTP server for Tuxdroid."
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
