[Roreditor-svn] SF.net SVN: roreditor: [134] trunk

[<ror...@us...>]

Revision: 134
          http://roreditor.svn.sourceforge.net/roreditor/?rev=134&view=rev
Author:   rorthomas
Date:     2007-07-27 06:01:34 -0700 (Fri, 27 Jul 2007)

Log Message:
-----------
* removed main.bat files
* moved modtool to tools
* moved terraineditor readme

Modified Paths:
--------------
    trunk/lib/rorterraineditor/HelpFrame.py
    trunk/tools/postinstall.py

Added Paths:
-----------
    trunk/lib/rorterraineditor/terrainreadme.txt
    trunk/tools/modtool.bat
    trunk/tools/modtool.py

Removed Paths:
-------------
    trunk/modtool.bat
    trunk/modtool.py
    trunk/rortoolkit.bat
    trunk/terraineditor.bat
    trunk/terrainreadme.txt
    trunk/truckeditor.bat

Modified: trunk/lib/rorterraineditor/HelpFrame.py
===================================================================
--- trunk/lib/rorterraineditor/HelpFrame.py	2007-07-27 12:51:32 UTC (rev 133)
+++ trunk/lib/rorterraineditor/HelpFrame.py	2007-07-27 13:01:34 UTC (rev 134)
@@ -8,7 +8,7 @@
         self.btnExit = wx.Button(self, wx.ID_ANY, "OK")
         self.Bind(wx.EVT_BUTTON, self.onExit , self.btnExit)
         self.__do_layout()
-        self.filename = "terrainreadme.txt"
+        self.filename = os.path.join(os.path.dirname(os.path.abspath(__file__)), "terrainreadme.txt")
         self.LoadHelp()
 
     def LoadHelp(self):

Added: trunk/lib/rorterraineditor/terrainreadme.txt
===================================================================
--- trunk/lib/rorterraineditor/terrainreadme.txt	                        (rev 0)
+++ trunk/lib/rorterraineditor/terrainreadme.txt	2007-07-27 13:01:34 UTC (rev 134)
@@ -0,0 +1,41 @@
+============================================================
+Short Introduction / Help
+============================================================
+A			move left
+D			move right
+W			move foreward
+S			move backward
+PAGEUP		move up
+PAGEDOWN	move down
+SHIFT + above keys = faster movement
+
+
+Mousewheel in Main Viewport:	zoom in/out (like forward/backward)
+Mousewheel int objects view lower viewport: zoom in/out
+
+
+drag: rightklick:	look around
+drag: control + rightclick	move to the side and up and down
+if selected an object: control + leftclick positions that object at the pointed terrain
+
+
+P           print position of the camera to the console
+Q			switch between object rotation and translation
+            (Please note, that trucks and loads cannot be rotated)
+T			switch between bilinear and trilinear filtering
+R			switch between solid, wireframe and point mode
+
+History Functions:
+F           undo last movement/rotation
+G           redo last undo
+
+============================================================
+How To Add Things
+============================================================
+1. select a place on the terrain with leftclick, a red circle should appear.
+2. add a truck or mesh using the "Add" menu.
+
+============================================================
+Tips and Tricks
+============================================================
+* If you want to select an object behind another object, just left-click twice on the foreground object to select the background one.
\ No newline at end of file

Deleted: trunk/modtool.bat
===================================================================
--- trunk/modtool.bat	2007-07-27 12:51:32 UTC (rev 133)
+++ trunk/modtool.bat	2007-07-27 13:01:34 UTC (rev 134)
@@ -1,2 +0,0 @@
-...@po...t modtool
-@%systemdrive%\python25\python.exe modtool.py %*
\ No newline at end of file

Deleted: trunk/modtool.py
===================================================================
--- trunk/modtool.py	2007-07-27 12:51:32 UTC (rev 133)
+++ trunk/modtool.py	2007-07-27 13:01:34 UTC (rev 134)
@@ -1,86 +0,0 @@
-#Thomas Fischer 31/05/2007, th...@th...
-import sys, os, os.path, shutil
-
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "lib"))
-
-def usage():
-    print "usage (general): %s <mode> <additionaloptions> [--verbose] [--dryrun]" % (os.path.basename(sys.argv[0]))
-    print "list <filename>"
-    print " list all found and valid modifications in filename"
-    print ""
-    print "listall <filename> --verbose"
-    print " list all found modifications in filename (valid and invalid)"
-    print ""
-    print "installall <filename> --verbose --dryrun"
-    print " install all found modifications in filename"
-    print ""
-    print "installrepo <filename> --verbose --dryrun"
-    print " install all found modifications in filename that is downloaded from the repository"
-    print ""
-    print "install <filename> <modification> --verbose --dryrun"
-    print " install a certain modifications in filename (valid and invalid)"
-    print ""
-    print "listinstalled"
-    print " lists all installed RoR Mods"
-    print ""
-    print "uninstall <modname> --verbose --dryrun"
-    print " uninstalls a mod"
-    print ""
-    print "notes: the --verbose option is optional to increase the output for debugging"
-    print "       the --dryrun option is optional and prints out what would be done"
-    sys.exit(0)
-
-def main():
-    # check for valid RoR Directory!
-    import ror.settingsManager
-    rorpath = ror.settingsManager.getSettingsManager().getSetting("RigsOfRods", "BasePath")
-    if not os.path.isfile(os.path.join(rorpath,"RoR.exe")):
-        import ror.starter
-        ror.starter.startApp()
-
-    if len(sys.argv) < 2:
-        usage()
-
-    mode = sys.argv[1]
-    if not mode in ['list', 'listall', 'install', 'installall', 'listinstalled','uninstall', 'installrepo']:
-        usage()
-    if len(sys.argv) < 4 and mode in ['install']:
-        usage()
-            
-    if mode in ['list', 'listall', 'install', 'installall']:
-        targetfile = sys.argv[2]
-        if not os.path.isfile(targetfile):
-            log().error("%s is not a valid target filename!" % targetfile)
-            usage()
-    elif mode in ['listinstalled']:
-        targetfile = rorpath
-    elif mode in ['installrepo']:
-        targetfile = sys.argv[2]
-    elif mode == 'uninstall':
-        targetfile = sys.argv[2]
-    
-    # get optional flags
-    verbose = False
-    dryrun = False
-    for option in sys.argv:
-        if option == "--verbose":
-            verbose = True
-        if option == "--dryrun":
-            dryrun = True
-
-    # Import Psyco if available
-    try:
-        import psyco
-        psyco.full()
-    except ImportError:
-        pass
-        
-    if len(sys.argv) == 4:
-        installtarget = sys.argv[3]
-    else:
-        installtarget = None
-    import ror.modtool
-    ror.modtool.ModTool().work(mode, targetfile, verbose, dryrun, installtarget)
-
-if __name__=="__main__":
-    main()

Deleted: trunk/rortoolkit.bat
===================================================================
--- trunk/rortoolkit.bat	2007-07-27 12:51:32 UTC (rev 133)
+++ trunk/rortoolkit.bat	2007-07-27 13:01:34 UTC (rev 134)
@@ -1,2 +0,0 @@
-@tools\postinstall.bat rortoolkit
-@%systemdrive%\python25\pythonw.exe rortoolkit.pyw %*
\ No newline at end of file

Deleted: trunk/terraineditor.bat
===================================================================
--- trunk/terraineditor.bat	2007-07-27 12:51:32 UTC (rev 133)
+++ trunk/terraineditor.bat	2007-07-27 13:01:34 UTC (rev 134)
@@ -1,2 +0,0 @@
-...@po...t terraineditor
-@%systemdrive%\python25\pythonw.exe terraineditor.pyw %*
\ No newline at end of file

Deleted: trunk/terrainreadme.txt
===================================================================
--- trunk/terrainreadme.txt	2007-07-27 12:51:32 UTC (rev 133)
+++ trunk/terrainreadme.txt	2007-07-27 13:01:34 UTC (rev 134)
@@ -1,41 +0,0 @@
-============================================================
-Short Introduction / Help
-============================================================
-A			move left
-D			move right
-W			move foreward
-S			move backward
-PAGEUP		move up
-PAGEDOWN	move down
-SHIFT + above keys = faster movement
-
-
-Mousewheel in Main Viewport:	zoom in/out (like forward/backward)
-Mousewheel int objects view lower viewport: zoom in/out
-
-
-drag: rightklick:	look around
-drag: control + rightclick	move to the side and up and down
-if selected an object: control + leftclick positions that object at the pointed terrain
-
-
-P           print position of the camera to the console
-Q			switch between object rotation and translation
-            (Please note, that trucks and loads cannot be rotated)
-T			switch between bilinear and trilinear filtering
-R			switch between solid, wireframe and point mode
-
-History Functions:
-F           undo last movement/rotation
-G           redo last undo
-
-============================================================
-How To Add Things
-============================================================
-1. select a place on the terrain with leftclick, a red circle should appear.
-2. add a truck or mesh using the "Add" menu.
-
-============================================================
-Tips and Tricks
-============================================================
-* If you want to select an object behind another object, just left-click twice on the foreground object to select the background one.
\ No newline at end of file

Added: trunk/tools/modtool.bat
===================================================================
--- trunk/tools/modtool.bat	                        (rev 0)
+++ trunk/tools/modtool.bat	2007-07-27 13:01:34 UTC (rev 134)
@@ -0,0 +1,2 @@
+...@po...t modtool
+@%systemdrive%\python25\python.exe modtool.py %*
\ No newline at end of file

Added: trunk/tools/modtool.py
===================================================================
--- trunk/tools/modtool.py	                        (rev 0)
+++ trunk/tools/modtool.py	2007-07-27 13:01:34 UTC (rev 134)
@@ -0,0 +1,86 @@
+#Thomas Fischer 31/05/2007, th...@th...
+import sys, os, os.path, shutil
+
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "lib"))
+
+def usage():
+    print "usage (general): %s <mode> <additionaloptions> [--verbose] [--dryrun]" % (os.path.basename(sys.argv[0]))
+    print "list <filename>"
+    print " list all found and valid modifications in filename"
+    print ""
+    print "listall <filename> --verbose"
+    print " list all found modifications in filename (valid and invalid)"
+    print ""
+    print "installall <filename> --verbose --dryrun"
+    print " install all found modifications in filename"
+    print ""
+    print "installrepo <filename> --verbose --dryrun"
+    print " install all found modifications in filename that is downloaded from the repository"
+    print ""
+    print "install <filename> <modification> --verbose --dryrun"
+    print " install a certain modifications in filename (valid and invalid)"
+    print ""
+    print "listinstalled"
+    print " lists all installed RoR Mods"
+    print ""
+    print "uninstall <modname> --verbose --dryrun"
+    print " uninstalls a mod"
+    print ""
+    print "notes: the --verbose option is optional to increase the output for debugging"
+    print "       the --dryrun option is optional and prints out what would be done"
+    sys.exit(0)
+
+def main():
+    # check for valid RoR Directory!
+    import ror.settingsManager
+    rorpath = ror.settingsManager.getSettingsManager().getSetting("RigsOfRods", "BasePath")
+    if not os.path.isfile(os.path.join(rorpath,"RoR.exe")):
+        import ror.starter
+        ror.starter.startApp()
+
+    if len(sys.argv) < 2:
+        usage()
+
+    mode = sys.argv[1]
+    if not mode in ['list', 'listall', 'install', 'installall', 'listinstalled','uninstall', 'installrepo']:
+        usage()
+    if len(sys.argv) < 4 and mode in ['install']:
+        usage()
+            
+    if mode in ['list', 'listall', 'install', 'installall']:
+        targetfile = sys.argv[2]
+        if not os.path.isfile(targetfile):
+            log().error("%s is not a valid target filename!" % targetfile)
+            usage()
+    elif mode in ['listinstalled']:
+        targetfile = rorpath
+    elif mode in ['installrepo']:
+        targetfile = sys.argv[2]
+    elif mode == 'uninstall':
+        targetfile = sys.argv[2]
+    
+    # get optional flags
+    verbose = False
+    dryrun = False
+    for option in sys.argv:
+        if option == "--verbose":
+            verbose = True
+        if option == "--dryrun":
+            dryrun = True
+
+    # Import Psyco if available
+    try:
+        import psyco
+        psyco.full()
+    except ImportError:
+        pass
+        
+    if len(sys.argv) == 4:
+        installtarget = sys.argv[3]
+    else:
+        installtarget = None
+    import ror.modtool
+    ror.modtool.ModTool().work(mode, targetfile, verbose, dryrun, installtarget)
+
+if __name__=="__main__":
+    main()

Modified: trunk/tools/postinstall.py
===================================================================
--- trunk/tools/postinstall.py	2007-07-27 12:51:32 UTC (rev 133)
+++ trunk/tools/postinstall.py	2007-07-27 13:01:34 UTC (rev 134)
@@ -17,10 +17,14 @@
 def addPath(filename, installpath):
     basename = os.path.basename(filename)
     filenameonly, extension = os.path.splitext(basename)
+    
+    # with console
     thispath = os.path.join(installpath, filenameonly+".py")
+    pythonpath = "%systemdrive%\python25\python.exe"
     if not os.path.isfile(thispath):
+        # without console
         thispath = os.path.join(installpath, filenameonly+".pyw")
-    pythonpath = "%systemdrive%\python25\pythonw.exe"
+        pythonpath = "%systemdrive%\python25\pythonw.exe"
     content = ["@%s %s %%*" % (pythonpath, thispath)]
     saveFile(filename, content)
 

Deleted: trunk/truckeditor.bat
===================================================================
--- trunk/truckeditor.bat	2007-07-27 12:51:32 UTC (rev 133)
+++ trunk/truckeditor.bat	2007-07-27 13:01:34 UTC (rev 134)
@@ -1,2 +0,0 @@
-@tools\postinstall.bat truckeditor
-@%systemdrive%\python25\pythonw.exe truckeditor.pyw %*
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.