Permalink
Browse files

Depend on ruby and python exe's in the path

  • Loading branch information...
1 parent 34f0bc5 commit 32ee4b08c340fb8d110bfcef627325912e01d287 @jschementi committed Jan 30, 2011
Showing with 10 additions and 27 deletions.
  1. +3 −2 .gitignore
  2. +3 −3 clean.bat
  3. +0 −4 config.bat
  4. +3 −3 generate.bat
  5. +1 −1 generate.py
  6. +0 −7 python.bat
  7. +0 −7 ruby.bat
View
@@ -3,7 +3,8 @@ deploy
*.pyc
Thumbs.db
*.swp
-*.csproj.user
+*.user
*.suo
obj
-bin
+bin
+_ReSharper.iron-websites
View
@@ -1,4 +1,4 @@
@echo off
-call %~dp0python.bat %~dp0clean.py -python
-call %~dp0python.bat %~dp0clean.py -ruby
-call %~dp0ruby.bat %~dp0deploy.rb -clean
+python %~dp0clean.py -python
+python %~dp0clean.py -ruby
+ruby %~dp0deploy.rb -clean
View
@@ -1,4 +0,0 @@
-@echo off
-
-REM set your dlr root here
-set DLR_ROOT=d:\D1
View
@@ -1,6 +1,6 @@
@echo off
pushd %~dp0
-call %~dp0python.bat %~dp0generate.py -python
-call %~dp0python.bat %~dp0generate.py -ruby
-call %~dp0ruby.bat %~dp0deploy.rb
+python %~dp0generate.py -python
+python %~dp0generate.py -ruby
+ruby %~dp0deploy.rb
popd
View
@@ -184,7 +184,7 @@ def main(argv):
navpy_path = os.path.join(os.path.dirname(result_file), PAGE_NAV_FILE)
subpage_nav = None
if os.path.exists(navpy_path):
- navpy = eval(open(navpy_path).read())
+ navpy = eval(open(navpy_path).read().replace("\r",''))
nav_vars = {
'this_page': os.path.relpath(result_file, os.path.dirname(navpy_path)),
'nav': navpy,
View
@@ -1,7 +0,0 @@
-@echo off
-call %~dp0config.bat
-if exist C:\Python26\python.exe (
- C:\Python26\python.exe %*
-) else (
- %dlr_root%\External.LCA_RESTRICTED\Languages\CPython\26\python.exe %*
-)
View
@@ -1,7 +0,0 @@
-@echo off
-call %~dp0config.bat
-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 %*
-)

0 comments on commit 32ee4b0

Please sign in to comment.