Browse Source

Use the drive letter and path of the .bat file in executable invocations. Fix UpdateDocument.bat to work with spaces in the pathname. Closes #376.

Lasse Öörni 11 years ago
parent
commit
425ca7b0f7
4 changed files with 8 additions and 8 deletions
  1. 2 1
      Bin/ConvertModels.bat
  2. 2 2
      Bin/Editor.bat
  3. 1 1
      Bin/NinjaSnowWar.bat
  4. 3 4
      Bin/UpdateDocument.bat

+ 2 - 1
Bin/ConvertModels.bat

@@ -1,7 +1,8 @@
+cd /d "%~dp0"
 OgreImporter ../SourceAssets/Jack.mesh.xml Data/Models/Jack.mdl -t
 OgreImporter ../SourceAssets/Jack.mesh.xml Data/Models/Jack.mdl -t
 OgreImporter ../SourceAssets/Level.mesh.xml Data/Models/NinjaSnowWar/Level.mdl -t
 OgreImporter ../SourceAssets/Level.mesh.xml Data/Models/NinjaSnowWar/Level.mdl -t
 OgreImporter ../SourceAssets/Mushroom.mesh.xml Data/Models/Mushroom.mdl -t
 OgreImporter ../SourceAssets/Mushroom.mesh.xml Data/Models/Mushroom.mdl -t
 OgreImporter ../SourceAssets/Ninja.mesh.xml Data/Models/NinjaSnowWar/Ninja.mdl -t
 OgreImporter ../SourceAssets/Ninja.mesh.xml Data/Models/NinjaSnowWar/Ninja.mdl -t
 OgreImporter ../SourceAssets/Potion.mesh.xml Data/Models/NinjaSnowWar/Potion.mdl -t
 OgreImporter ../SourceAssets/Potion.mesh.xml Data/Models/NinjaSnowWar/Potion.mdl -t
-OgreImporter ../SourceAssets/SnowBall.mesh.xml Data/Models/NinjaSnowWar/SnowBall.mdl -t 
+OgreImporter ../SourceAssets/SnowBall.mesh.xml Data/Models/NinjaSnowWar/SnowBall.mdl -t
 OgreImporter ../SourceAssets/SnowCrate.mesh.xml Data/Models/NinjaSnowWar/SnowCrate.mdl -t
 OgreImporter ../SourceAssets/SnowCrate.mesh.xml Data/Models/NinjaSnowWar/SnowCrate.mdl -t

+ 2 - 2
Bin/Editor.bat

@@ -1,9 +1,9 @@
 @ECHO OFF
 @ECHO OFF
 
 
 IF [%1] == [] (
 IF [%1] == [] (
-        Urho3DPlayer.exe Scripts/Editor.as -w -s
+        "%~dp0\Urho3DPlayer" Scripts/Editor.as -w -s
         )
         )
 
 
 IF NOT [%1] == [] (
 IF NOT [%1] == [] (
-        Urho3DPlayer.exe Scripts/Editor.as %*
+        "%~dp0\Urho3DPlayer" Scripts/Editor.as %*
         )
         )

+ 1 - 1
Bin/NinjaSnowWar.bat

@@ -9,4 +9,4 @@
 ::   Start the server with "NinjaSnowWar -w -server"
 ::   Start the server with "NinjaSnowWar -w -server"
 ::   Start the client on the same host with "NinjaSnowWar -w -nobgm -address <put-your-host-name-here>"
 ::   Start the client on the same host with "NinjaSnowWar -w -nobgm -address <put-your-host-name-here>"
 ::
 ::
-Urho3DPlayer.exe Scripts/NinjaSnowWar.as %*
+"%~dp0Urho3DPlayer" Scripts/NinjaSnowWar.as %*

+ 3 - 4
Bin/UpdateDocument.bat

@@ -1,12 +1,11 @@
 @echo off
 @echo off
-pushd %~dp0\..\Docs
+pushd "%~dp0..\Docs"
 echo Dumping AngelScript API...
 echo Dumping AngelScript API...
-%~dp0\ScriptCompiler -dumpapi ScriptAPI.dox AngelScriptAPI.h
+"%~dp0ScriptCompiler" -dumpapi ScriptAPI.dox AngelScriptAPI.h
 if errorlevel 1 exit /B 1
 if errorlevel 1 exit /B 1
 echo Dumping LuaScript API...
 echo Dumping LuaScript API...
-set "out=%CD%\LuaScriptAPI.dox"
 pushd ..\Source\Engine\LuaScript\pkgs
 pushd ..\Source\Engine\LuaScript\pkgs
-%~dp0\tolua++ -L ToDoxHook.lua -P -o %out% %~dp0\LuaPkgToDox.txt
+"%~dp0tolua++" -L ToDoxHook.lua -P -o "%~dp0..\Docs\LuaScriptAPI.dox" "%~dp0LuaPkgToDox.txt"
 if errorlevel 1 exit /B 1
 if errorlevel 1 exit /B 1
 popd
 popd
 echo Converting Doxygen files to HTML...
 echo Converting Doxygen files to HTML...