Menu
▾
▴
[Roreditor-svn] SF.net SVN: roreditor: [140] trunk
|
From: <ror...@us...> - 2007-07-28 00:33:41
|
Revision: 140
http://roreditor.svn.sourceforge.net/roreditor/?rev=140&view=rev
Author: rorthomas
Date: 2007-07-27 17:33:39 -0700 (Fri, 27 Jul 2007)
Log Message:
-----------
* updated installer
* renamed all .pyw back to .py due to problems
Modified Paths:
--------------
trunk/devtools/setup/readme-installer.txt
trunk/devtools/setup/setup.nsi
trunk/lib/ror/svn.py
trunk/tools/modtool.py
trunk/tools/update.py
Added Paths:
-----------
trunk/rortoolkit.py
trunk/terraineditor.py
trunk/truckeditor.py
Removed Paths:
-------------
trunk/rortoolkit.pyw
trunk/terraineditor.pyw
trunk/truckeditor.pyw
Modified: trunk/devtools/setup/readme-installer.txt
===================================================================
--- trunk/devtools/setup/readme-installer.txt 2007-07-27 19:19:31 UTC (rev 139)
+++ trunk/devtools/setup/readme-installer.txt 2007-07-28 00:33:39 UTC (rev 140)
@@ -1,2 +1,8 @@
have fun and report bugs and feature requests! :)
-http://forum.rigsofrods.com
\ No newline at end of file
+http://forum.rigsofrods.com
+
+RoR Toolkit Thread:
+http://forum.rigsofrods.com/index.php/topic,682.msg5932.html#msg5932
+
+RoR Toolkit at the Wiki:
+http://wiki.rigsofrods.com/index.php?title=RoRToolkit
\ No newline at end of file
Modified: trunk/devtools/setup/setup.nsi
===================================================================
--- trunk/devtools/setup/setup.nsi 2007-07-27 19:19:31 UTC (rev 139)
+++ trunk/devtools/setup/setup.nsi 2007-07-28 00:33:39 UTC (rev 140)
@@ -196,7 +196,7 @@
WriteRegStr HKCR "RoRRepo" "URL Protocol" ""
WriteRegStr HKCR "RoRRepo\shell" "" ""
WriteRegStr HKCR "RoRRepo\shell\open" "" ""
- WriteRegStr HKCR 'RoRRepo\shell\open\command' '' '"c:\python25\pythonw.exe" "$INSTDIR\tools\modgui.py installrepo" "%1"'
+ WriteRegStr HKCR 'RoRRepo\shell\open\command' '' '"%systemdrive%\python25\pythonw.exe" "$INSTDIR\tools\modgui.py installrepo" "%1"'
Banner::destroy
FunctionEnd
@@ -220,6 +220,7 @@
SectionEnd
Section /o "Optional Tools" SEC03
+ AddSize 20000
SectionIn 1
Call InstallPyWin32
Call InstallPyParsing
@@ -230,7 +231,7 @@
SectionIn 1 2 RO
SetOutPath "$INSTDIR"
SetOverwrite try
- File /r /x *.pyc /x ..\..\tools\3rdparty /x ..\..\downloaded /x ..\..\graphs /x .. ..\..\*
+ File /r /x *.pyc /x doc /x devtools /x 3rdparty /x downloaded /x graphs ..\..\*
SectionEnd
@@ -242,18 +243,19 @@
!insertmacro MUI_FUNCTION_DESCRIPTION_END
Function "LaunchPostInstallation"
- ExecWait '"$INSTDIR\update.bat"'
- ExecWait '"$INSTDIR\rortoolkit.bat"'
+ ExecWait "$INSTDIR\tools\update.py"
+ ExecWait "%systemdrive%\python25\pythonw.exe $INSTDIR\rortoolkit.py"
FunctionEnd
Section -AdditionalIcons
SetOutPath $INSTDIR
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
CreateDirectory "$SMPROGRAMS\RoRToolkit"
-# CreateShortCut "$SMPROGRAMS\RoRToolkit\RoR Truck Editor.lnk" "$INSTDIR\terraineditor.bat" "" "$INSTDIR\ror.ico"
- CreateShortCut "$SMPROGRAMS\RoRToolkit\RoR Toolkit.lnk" "%systemdrive%\python25\pythonw.exe $INSTDIR\rortoolkit.pyw" "" "$INSTDIR\ror.ico"
CreateShortCut "$SMPROGRAMS\RoRToolkit\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
CreateShortCut "$SMPROGRAMS\RoRToolkit\Uninstall.lnk" "$INSTDIR\uninst.exe"
+ CreateShortCut '$SMPROGRAMS\RoRToolkit\RoR Terrain Editor.lnk' '"%systemdrive%\python25\pythonw.exe" "$INSTDIR\terraineditor.py"' '' '$INSTDIR\ror.ico'
+ CreateShortCut '$SMPROGRAMS\RoRToolkit\RoR Truck Editor.lnk' '"%systemdrive%\python25\pythonw.exe" "$INSTDIR\truckeditor.py"' '' '$INSTDIR\ror.ico'
+ CreateShortCut '$SMPROGRAMS\RoRToolkit\RoR Toolkit.lnk' '"%systemdrive%\python25\pythonw.exe" "$INSTDIR\rortoolkit.py"' '' '$INSTDIR\ror.ico'
SectionEnd
Section -Post
Modified: trunk/lib/ror/svn.py
===================================================================
--- trunk/lib/ror/svn.py 2007-07-27 19:19:31 UTC (rev 139)
+++ trunk/lib/ror/svn.py 2007-07-28 00:33:39 UTC (rev 140)
@@ -78,6 +78,7 @@
try:
client = pysvn.Client()
+ log().info("svn update on this path: %s" % path)
# try to restore previous broken updates
try:
client.cleanup(path)
@@ -87,7 +88,7 @@
pass
try:
- client.resolved(path, reverse=True)
+ client.resolved(path)
except Exception, err:
log().error("Error while svn resolved:")
log().error(str(err))
Copied: trunk/rortoolkit.py (from rev 135, trunk/rortoolkit.pyw)
===================================================================
--- trunk/rortoolkit.py (rev 0)
+++ trunk/rortoolkit.py 2007-07-28 00:33:39 UTC (rev 140)
@@ -0,0 +1,25 @@
+#Thomas Fischer 31/05/2007, th...@th...
+import sys, os, os.path
+
+def main():
+ """
+ main method
+ """
+
+ sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "lib"))
+
+ # Import Psyco if available
+ try:
+ import psyco
+ #psyco.full()
+ #psyco.log()
+ #psyco.profile()
+ except ImportError:
+ pass
+
+ import ror.starter
+ ror.starter.startApp()
+
+
+if __name__=="__main__":
+ main()
\ No newline at end of file
Deleted: trunk/rortoolkit.pyw
===================================================================
--- trunk/rortoolkit.pyw 2007-07-27 19:19:31 UTC (rev 139)
+++ trunk/rortoolkit.pyw 2007-07-28 00:33:39 UTC (rev 140)
@@ -1,25 +0,0 @@
-#Thomas Fischer 31/05/2007, th...@th...
-import sys, os, os.path
-
-def main():
- """
- main method
- """
-
- sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "lib"))
-
- # Import Psyco if available
- try:
- import psyco
- #psyco.full()
- #psyco.log()
- #psyco.profile()
- except ImportError:
- pass
-
- import ror.starter
- ror.starter.startApp()
-
-
-if __name__=="__main__":
- main()
\ No newline at end of file
Copied: trunk/terraineditor.py (from rev 135, trunk/terraineditor.pyw)
===================================================================
--- trunk/terraineditor.py (rev 0)
+++ trunk/terraineditor.py 2007-07-28 00:33:39 UTC (rev 140)
@@ -0,0 +1,28 @@
+#Thomas Fischer 31/05/2007, th...@th...
+import sys, os, os.path
+
+def main():
+ """
+ main method
+ """
+
+ sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "lib"))
+ import ror.settingsManager
+ path = ror.settingsManager.getSettingsManager().getSetting("RigsOfRods", "BasePath")
+ if not os.path.isfile(os.path.join(path,"RoR.exe")):
+ import ror.starter
+ ror.starter.startApp()
+
+ # Import Psyco if available
+ try:
+ import psyco
+ psyco.full()
+ except ImportError:
+ pass
+
+ import rorterraineditor.MainFrame
+ rorterraineditor.MainFrame.startApp()
+
+
+if __name__=="__main__":
+ main()
\ No newline at end of file
Deleted: trunk/terraineditor.pyw
===================================================================
--- trunk/terraineditor.pyw 2007-07-27 19:19:31 UTC (rev 139)
+++ trunk/terraineditor.pyw 2007-07-28 00:33:39 UTC (rev 140)
@@ -1,28 +0,0 @@
-#Thomas Fischer 31/05/2007, th...@th...
-import sys, os, os.path
-
-def main():
- """
- main method
- """
-
- sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "lib"))
- import ror.settingsManager
- path = ror.settingsManager.getSettingsManager().getSetting("RigsOfRods", "BasePath")
- if not os.path.isfile(os.path.join(path,"RoR.exe")):
- import ror.starter
- ror.starter.startApp()
-
- # Import Psyco if available
- try:
- import psyco
- psyco.full()
- except ImportError:
- pass
-
- import rorterraineditor.MainFrame
- rorterraineditor.MainFrame.startApp()
-
-
-if __name__=="__main__":
- main()
\ No newline at end of file
Modified: trunk/tools/modtool.py
===================================================================
--- trunk/tools/modtool.py 2007-07-27 19:19:31 UTC (rev 139)
+++ trunk/tools/modtool.py 2007-07-28 00:33:39 UTC (rev 140)
@@ -31,6 +31,13 @@
sys.exit(0)
def main():
+ guiVersion = (os.path.basename(sys.executable).lower() == "pythonw.exe")
+ if guiVersion:
+ log().info("using GUI version")
+ import wx
+ MainApp = wx.PySimpleApp(0)
+ wx.InitAllImageHandlers() #you may or may not need this
+
# check for valid RoR Directory!
import ror.settingsManager
rorpath = ror.settingsManager.getSettingsManager().getSetting("RigsOfRods", "BasePath")
@@ -80,7 +87,14 @@
else:
installtarget = None
import ror.modtool
- ror.modtool.ModTool().work(mode, targetfile, verbose, dryrun, installtarget)
+ result = ror.modtool.ModTool().work(mode, targetfile, verbose, dryrun, installtarget)
+ if guiVersion:
+ msg = "Installation failed! :( Please have a look at the file editorlog.log"
+ if result:
+ msg = "Installation successfull! You can now use the Mod."
+ dlg = wx.MessageDialog(None, msg, "Info", wx.OK | wx.ICON_INFORMATION)
+ dlg.ShowModal()
+ dlg.Destroy()
if __name__=="__main__":
main()
Modified: trunk/tools/update.py
===================================================================
--- trunk/tools/update.py 2007-07-27 19:19:31 UTC (rev 139)
+++ trunk/tools/update.py 2007-07-28 00:33:39 UTC (rev 140)
@@ -2,7 +2,7 @@
def main():
sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "lib"))
- guiVersion = True
+ guiVersion = (os.path.basename(sys.executable).lower() == "pythonw.exe")
if guiVersion:
import wx
Copied: trunk/truckeditor.py (from rev 135, trunk/truckeditor.pyw)
===================================================================
--- trunk/truckeditor.py (rev 0)
+++ trunk/truckeditor.py 2007-07-28 00:33:39 UTC (rev 140)
@@ -0,0 +1,28 @@
+#Thomas Fischer 31/05/2007, th...@th...
+import sys, os, os.path
+
+def main():
+ """
+ main method
+ """
+
+ sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "lib"))
+ import ror.settingsManager
+ path = ror.settingsManager.getSettingsManager().getSetting("RigsOfRods", "BasePath")
+ if not os.path.isfile(os.path.join(path,"RoR.exe")):
+ import ror.starter
+ ror.starter.startApp()
+
+ # Import Psyco if available
+ try:
+ import psyco
+ psyco.full()
+ except ImportError:
+ pass
+
+ import rortruckeditor.MainFrame
+ rortruckeditor.MainFrame.startApp()
+
+
+if __name__=="__main__":
+ main()
\ No newline at end of file
Deleted: trunk/truckeditor.pyw
===================================================================
--- trunk/truckeditor.pyw 2007-07-27 19:19:31 UTC (rev 139)
+++ trunk/truckeditor.pyw 2007-07-28 00:33:39 UTC (rev 140)
@@ -1,28 +0,0 @@
-#Thomas Fischer 31/05/2007, th...@th...
-import sys, os, os.path
-
-def main():
- """
- main method
- """
-
- sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "lib"))
- import ror.settingsManager
- path = ror.settingsManager.getSettingsManager().getSetting("RigsOfRods", "BasePath")
- if not os.path.isfile(os.path.join(path,"RoR.exe")):
- import ror.starter
- ror.starter.startApp()
-
- # Import Psyco if available
- try:
- import psyco
- psyco.full()
- except ImportError:
- pass
-
- import rortruckeditor.MainFrame
- rortruckeditor.MainFrame.startApp()
-
-
-if __name__=="__main__":
- main()
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
