@@ -1,7 +1,7 @@ @echo off setlocal ENABLEDELAYEDEXPANSION -REM Copy any required Ruby libraries to a subfolder for use in the tutorial +echo Copy any required Ruby libraries to a subfolder for use in the tutorial set RUBY_STDLIBS=%~dp0..\..\lib\ruby\1.8 set IRONRUBY_LIBS=%RUBY_STDLIBS% @@ -16,13 +16,15 @@ if defined MERLIN_ROOT ( ) if not EXIST "%~dp0app\Libs" (mkdir "%~dp0app\Libs") -for %%f in (erb.rb) do copy /y "%RUBY_STDLIBS%\%%f" "%~dp0app\Libs\" -for %%f in (rdoc) do xcopy /s /y "%RUBY_STDLIBS%\%%f" "%~dp0app\Libs\%%f\" -for %%f in (stringio.rb, bigdecimal.rb) do copy /y "%IRONRUBY_LIBS%\%%f" "%~dp0app\Libs\" -for %%f in (minitest-1.4.2) do xcopy /s /y "%GEMS%\%%f" "%~dp0app\Libs\%%f\" +for %%f in (erb.rb) do copy /y "%RUBY_STDLIBS%\%%f" "%~dp0app\Libs\" > %~dp0build.log +for %%f in (rdoc) do xcopy /s /y "%RUBY_STDLIBS%\%%f" "%~dp0app\Libs\%%f\" > %~dp0build.log +for %%f in (stringio.rb, bigdecimal.rb) do copy /y "%IRONRUBY_LIBS%\%%f" "%~dp0app\Libs\" > %~dp0build.log +for %%f in (minitest-1.4.2) do xcopy /s /y "%GEMS%\%%f" "%~dp0app\Libs\%%f\" > %~dp0build.log + +echo Generating dlr.js for Silverlight version if not EXIST "%~dp0js" (mkdir "%~dp0js") set SLPATH=%~dp0..\..\..\..\Hosts\Silverlight if not EXIST %SLPATH%\Scripts\dlr.js (ruby %SLPATH%\Scripts\generate_dlrjs.rb) -for %%f in (dlr.js) do copy /y "%SLPATH%\Scripts\%%f" "%~dp0js" - +for %%f in (dlr.js) do copy /y "%SLPATH%\Scripts\%%f" "%~dp0js" > %~dp0build.log +del %~dp0build.log Merlin/Main/Languages/Ruby/Samples/Tutorial/build.bat @@ -1,3 +1,8 @@ -del %~dp0js\dlr.js -rmdir /S /Q %~dp0app\Libs -del %~dp0app\Tutorials\*_tutorial.generated.html +@echo off + +echo Removing dlr.js, app\libs, and generated html files +del %~dp0js\dlr.js > %~dp0clean.log +del %~dp0app.xap > %~dp0clean.log +rmdir /S /Q %~dp0app\Libs > %~dp0clean.log +del %~dp0app\Tutorials\*_tutorial.generated.html > %~dp0clean.log +del %~dp0clean.log Merlin/Main/Languages/Ruby/Samples/Tutorial/clean.bat @@ -1,11 +1,18 @@ +@echo off + call %~dp0build.bat -%MERLIN_ROOT%\Bin\"Silverlight Release"\Chiron.exe /d:%~dp0app /z:%~dp0app.xap +echo Generating app.xap +%MERLIN_ROOT%\Bin\"Silverlight Release"\Chiron.exe /s /d:%~dp0app /z:%~dp0app.xap +echo Deploying tutorial if exist C:\inetpub\wwwroot\tutorial ( rmdir /S /Q C:\inetpub\wwwroot\tutorial ) mkdir C:\inetpub\wwwroot\tutorial -xcopy /E /Q /Y %~dp0* C:\inetpub\wwwroot\tutorial +xcopy /E /Q /Y %~dp0* C:\inetpub\wwwroot\tutorial > %~dp0tmp.log +echo Deploying slvx files if exist C:\inetpub\wwwroot\dlr-slvx ( rmdir /S /Q C:\inetpub\wwwroot\dlr-slvx ) mkdir C:\inetpub\wwwroot\dlr-slvx -xcopy /Q /Y %MERLIN_ROOT%\Bin\"Silverlight Release"\*.slvx C:\inetpub\wwwroot\dlr-slvx +xcopy /Q /Y %MERLIN_ROOT%\Bin\"Silverlight Release"\*.slvx C:\inetpub\wwwroot\dlr-slvx > %~dp0tmp.log + +del %~dp0tmp.log Merlin/Main/Languages/Ruby/Samples/Tutorial/deploy.bat @@ -6,9 +6,9 @@ call %~dp0build.bat set CHIRON="%~dp0..\..\silverlight\bin\Chiron.exe" if defined MERLIN_ROOT ( REM - This is a dev environment. See http://wiki.github.com/ironruby/ironruby - set CHIRON="%~dp0..\..\..\..\Bin\Silverlight Release\Chiron.exe" + set CHIRON="%~dp0..\..\..\..\Bin\Silverlight Debug\Chiron.exe" if not EXIST !CHIRON! ( - set CHIRON="%~dp0..\..\..\..\Bin\Silverlight Debug\Chiron.exe" + set CHIRON="%~dp0..\..\..\..\Bin\Silverlight Release\Chiron.exe" if not EXIST !CHIRON! ( echo Could not find Chiron.exe. echo Do you have a build of Silverlight? If not, type "bsd". @@ -19,5 +19,5 @@ if defined MERLIN_ROOT ( set QUERY_STRING= ) -%CHIRON% /b:sl_tutorial.html%QUERY_STRING% %* +%CHIRON% /n /b:sl_tutorial.html%QUERY_STRING% %* :END Merlin/Main/Languages/Ruby/Samples/Tutorial/tutorial-sl.bat 64b6cd6baeb9d34599a82dc9b0c10dc9759a3f8f Jimmy Schementi jschementi@gmail.com http://github.com/ironruby/ironruby/commit/fb49e02bc27cbd357bc30994943624c1ea0b0175 fb49e02bc27cbd357bc30994943624c1ea0b0175 2009-10-23T15:37:04-07:00 2009-10-21T01:48:09-07:00 Cleanup IronRuby tutorial scripts c2b6d3d633872545cdf4916695da357326c4f7a9 Jimmy Schementi jschementi@gmail.com