Changeset 2200

Timestamp:

Dec 25, 2006, 9:31:19 PM (14 years ago)

Author:

orlov

Message:

• Correctly work with spaces in file names and with files in other drives (in Windows).

Location:

to-imperative/trunk/c++

Files:

• config.bat (modified) (2 diffs)
• lib/makeall.bat (modified) (2 diffs)
• makeall.bat (modified) (1 diff)
• rfp.bat (modified) (3 diffs)

to-imperative/trunk/c++/config.bat

@@ -29 +29 @@
 rem -3- Refal+ options
 
-set RFLAGS=-B %~dp0\..\lib
+set RFLAGS=-B "%~dp0\..\lib"
 
 rem -4- C++ compiler options
 
-set CFLAGS=/TP /EHsc /D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /DWINDOWS /DRFRT_WITHOUT_MPINT /I%~dp0\libp++ /I%~dp0\runtime /I%~dp0\lib /I%~dp0\include
+set CFLAGS=/TP /EHsc /D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /DWINDOWS /DRFRT_WITHOUT_MPINT /I"%~dp0\libp++" /I"%~dp0\runtime" /I"%~dp0\lib" /I"%~dp0\include"
 
 rem : The following turns on an agressive C++ code optimization.
 rem : Be warned that it needs significant resources.
 
-set CFLAGS=%CFLAGS% /O2
+rem set CFLAGS=%CFLAGS% /O2
 
 rem -5- Linker options
 
-set LFLAGS=%~dp0\libp++\pxx.lib %~dp0\runtime\rfrt.lib %~dp0\lib\rf.lib
+set LFLAGS="%~dp0\libp++\pxx.lib" "%~dp0\runtime\rfrt.lib" "%~dp0\lib\rf.lib"
 
 rem : If your programs use deep recursion you may want to increase
@@ -53 +53 @@
 rem -6- Auxiliary
 
-set PATH=%~dp0;%~dp0\compiler;%PATH%
+set PATH="%~dp0";"%~dp0\compiler";%PATH%
 
 set RFP_CONF_DONE=1

to-imperative/trunk/c++/lib/makeall.bat

@@ -3 +3 @@
 setlocal enableextensions enabledelayedexpansion
 
-if not defined RFP_CONF_DONE call %~dp0\..\config.bat
+if not defined RFP_CONF_DONE call "%~dp0\..\config.bat"
 
 if not "%1" == "-l" (
@@ -9 +9 @@
                 cd %%d
                 for /F %%f in (file_list) do cl %CFLAGS% /c %%f.cc
-                cd %~dp0
+                cd "%~dp0"
         )
 )

to-imperative/trunk/c++/makeall.bat

@@ -3 +3 @@
 if not defined RFP_CONF_DONE call "%~dp0\config.bat"
 
-cd "%~dp0\libp++"
+cd /d "%~dp0\libp++"
 call makeall
 @if errorlevel 1 goto end
 
-cd "%~dp0\runtime"
+cd /d "%~dp0\runtime"
 call makeall
 @if errorlevel 1 goto end
 
-cd "%~dp0\lib"
+cd /d "%~dp0\lib"
 call makeall
 @if errorlevel 1 goto end
 
-cd "%~dp0\compiler"
+cd /d "%~dp0\compiler"
 call makeall
 @if errorlevel 1 goto end
 
 :end
-cd "%~dp0"
+cd /d "%~dp0"

to-imperative/trunk/c++/rfp.bat

@@ -3 +3 @@
 setlocal enableextensions enabledelayedexpansion
 
-if not defined RFP_CONF_DONE call %~p0\config.bat
+if not defined RFP_CONF_DONE call "%~dp0\config.bat"
 
-if "%*" == "" exit /b 1
+if %* == "" exit /b 1
 
 for %%f in (%*) do (
@@ -13 +13 @@
 
 for %%f in (%*) do (
-        if "%%~xf" == ".rf" cl %CFLAGS% /c /Fo%%~pf\%%~nf.obj %%~pf\%%~nf.cc
-        if "%%~xf" == ".cc" cl %CFLAGS% /c /Fo%%~pf\%%~nf.obj %%~pf\%%~nf.cc
+        if "%%~xf" == ".rf" cl %CFLAGS% /c /Fo"%%~dpf\%%~nf.obj" "%%~dpf\%%~nf.cc"
+        if "%%~xf" == ".cc" cl %CFLAGS% /c /Fo"%%~dpf\%%~nf.obj" "%%~dpf\%%~nf.cc"
         if errorlevel 1 exit /b %ERRORLEVEL%
 )
@@ -20 +20 @@
 set list=
 for %%f in (%*) do (
-        set list=!list! %%~pf\%%~nf.obj
+        set list=!list! "%%~dpf\%%~nf.obj"
 )