(svn r2032) -Codechange: A less hackish version of SVN version detection for OS/2 (orudge)

1 files changed, 11 insertions, 14 deletions

diff --git a/os/os2/svn_version.cmd b/os/os2/svn_version.cmd
index 6085b8ece..2afa966b5 100644
--- a/os/os2/svn_version.cmd
+++ b/os/os2/svn_version.cmd
@@ -1,33 +1,30 @@
 @echo off
 echo Running SVN version detection script...
 rem
-rem Requires subversion (`svnversion'), GNU make and some other GNU tools (eg, textutils)
-rem installed - a hack, I know, but it seems to work if you have the appropriate tools
-rem installed.
+rem Requires subversion (`svnversion') to be installed
 rem
 cd ..\..
 if not exist .svn goto nosvn
-make -f os/os2/svn_version.mak
-if not %ERRORLEVEL%==0 goto nomake
+if not "%RELEASE%"=="" goto forcerelease
+svnversion -n . > os\os2\svnver.tmp
+if not "%ERRORLEVEL%"=="0" goto nosvn
 
+copy os\os2\svnver1.c+os\os2\svnver.tmp+os\os2\svnver2.c rev.c /a /y > nul 2> nul
 goto end
 
-:nomake
-gmake -f os/os2/svn_version.mak
-if not %ERRORLEVEL%==0 goto nomake2
+:forcerelease
+echo Forcing release string "%RELEASE%"...
+echo const char _openttd_revision[] = "%RELEASE%"; > rev.c
+echo const int _revision_number = 0; >> rev.c
 goto end
 
-:nomake2
-echo Neither `make` nor `gmake' could be found, SVN version detection unable to
-echo run. Default rev.c used...
 :nosvn
+echo Error executing `svnversion' or no SVN data detected
 echo const char _openttd_revision[] = "norev000"; > rev.c
 echo const int _revision_number = 0; >> rev.c
-echo #ifdef __MORPHOS__ >> rev.c
-echo const char morphos_versions_tag[] = "\\0$VER: OpenTTD norev000 (00.00.00) © OpenTTD Team [MorphOS, PowerPC]"; >> rev.c
-echo #endif >> rev.c
 goto end
 
 :end
 cd os\os2
+del svnver.tmp > nul 2> nul
 rem end