don't require DLR enlistment, and clean deploy dir too

jschementi · May 12, 2010 · c232197 · c232197
1 parent c02d0a2
commit c232197
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/clean.bat b/clean.bat
@@ -1,3 +1,4 @@
 @echo off
 call %~dp0python.bat %~dp0clean.py -python
-call %~dp0python.bat %~dp0clean.py -ruby
+call %~dp0python.bat %~dp0clean.py -ruby
+call %~dp0ruby.bat %~dp0deploy.rb -clean
diff --git a/config.bat b/config.bat
@@ -1,4 +1,4 @@
 @echo off
 
-REM set your merlin root here
+REM set your dlr root here
 set DLR_ROOT=d:\dlr1\dlr
diff --git a/deploy.rb b/deploy.rb
@@ -88,5 +88,10 @@ def deploy
 end
 
 if __FILE__ == $0
-  Deploy.new.deploy
+  d = Deploy.new
+  if ARGV.include?('-clean')
+    d.clean
+  else
+    d.deploy
+  end
 end
diff --git a/python.bat b/python.bat
@@ -1,3 +1,7 @@
 @echo off
 call %~dp0config.bat
-%dlr_root%\External.LCA_RESTRICTED\Languages\CPython\26\python.exe %*
+if exist C:\Python26\python.exe (
+  C:\Python26\python.exe %* 
+) else (
+  %dlr_root%\External.LCA_RESTRICTED\Languages\CPython\26\python.exe %*
+)
diff --git a/ruby.bat b/ruby.bat
@@ -1,3 +1,7 @@
 @echo off
 call %~dp0config.bat
-%dlr_root%\External.LCA_RESTRICTED\Languages\Ruby\ruby-1.8.6p368\bin\ruby.exe %*
+if exist C:\Ruby\bin\ruby.exe (
+  C:\Ruby\bin\ruby.exe %*
+) else (
+  %dlr_root%\External.LCA_RESTRICTED\Languages\Ruby\ruby-1.8.6p368\bin\ruby.exe %*
+)