.

arclanguage · Dec 6, 2013 · b1dadbd · b1dadbd
1 parent f2d18ff
commit b1dadbd
Show file tree

Hide file tree

Showing 20 changed files with 6 additions and 51 deletions.
diff --git a/arc.bat b/arc.bat
@@ -26,11 +26,10 @@ echo "%ProgramFiles%\Racket\Racket.exe"
 echo "%ProgramFiles(x86)%\Racket\Racket.exe"
 
 rem  This is so it will work on both 64-bit and 32-bit systems
-IF EXISTS "%ProgramFiles%\Racket\Racket.exe" (
-  "%ProgramFiles%\Racket\Racket.exe" "%~dp0arc"
-) ELSE (
-  "%ProgramFiles(x86)%\Racket\Racket.exe" "%~dp0arc"
-)
+IF NOT EXISTS "%ProgramFiles%\Racket\Racket.exe" GOTO win64
+"%ProgramFiles%\Racket\Racket.exe" "%~dp0arc"
+:win64
+"%ProgramFiles(x86)%\Racket\Racket.exe" "%~dp0arc"
 
 rem  The "pause" command displays a "press any key" message. If Racket
 rem  exits with an error, this command keeps the batch script running

diff --git a/compiler b/compiler
@@ -1102,6 +1102,7 @@
                  (exec-dir          dir)
                  (import-dirs       (list ;(path->string (current-directory)) ; TODO
                                           (path->string (build-path dir "lib"))
+                                          (path->string (build-path dir "lib/arc3.1"))
                                           (path->string dir)
                                           ))
                  (import-cache      (make-hash))

diff --git a/lang/arc/3.1/copyright b/lang/arc/3.1/copyright
diff --git a/lang/arc/3.1/how-to-run-news b/lang/arc/3.1/how-to-run-news
diff --git a/lang/arc/3.1/main b/lang/arc/3.1/main
@@ -604,6 +604,7 @@
 ;; thanks, Eli!
 ;;
 ;; Currently only used by srv.arc
+;; TODO does this break on Windows ?
 (assign setuid #:sig (i) (get-ffi-obj 'setuid #f (_fun _int -> _int)))
 
 ;: TODO: need to use a better seed (Arc 3.1???)

diff --git a/lang/arc/3.1/app.arc → lib/arc3.1/app.arc b/lang/arc/3.1/app.arc → lib/arc3.1/app.arc
diff --git a/lang/arc/3.1/blog.arc → lib/arc3.1/blog.arc b/lang/arc/3.1/blog.arc → lib/arc3.1/blog.arc
diff --git a/lang/arc/3.1/code.arc → lib/arc3.1/code.arc b/lang/arc/3.1/code.arc → lib/arc3.1/code.arc
diff --git a/lang/arc/3.1/html.arc → lib/arc3.1/html.arc b/lang/arc/3.1/html.arc → lib/arc3.1/html.arc
diff --git a/lang/arc/3.1/libs.arc → lib/arc3.1/libs.arc b/lang/arc/3.1/libs.arc → lib/arc3.1/libs.arc
diff --git a/lang/arc/3.1/news.arc → lib/arc3.1/news.arc b/lang/arc/3.1/news.arc → lib/arc3.1/news.arc
diff --git a/lang/arc/3.1/pprint.arc → lib/arc3.1/pprint.arc b/lang/arc/3.1/pprint.arc → lib/arc3.1/pprint.arc
diff --git a/lang/arc/3.1/prompt.arc → lib/arc3.1/prompt.arc b/lang/arc/3.1/prompt.arc → lib/arc3.1/prompt.arc
diff --git a/lang/arc/3.1/srv.arc → lib/arc3.1/srv.arc b/lang/arc/3.1/srv.arc → lib/arc3.1/srv.arc
diff --git a/lang/arc/3.1/static/arc.png → lib/arc3.1/static/arc.png b/lang/arc/3.1/static/arc.png → lib/arc3.1/static/arc.png
diff --git a/lang/arc/3.1/static/grayarrow.gif → lib/arc3.1/static/grayarrow.gif b/lang/arc/3.1/static/grayarrow.gif → lib/arc3.1/static/grayarrow.gif
diff --git a/lang/arc/3.1/static/graydown.gif → lib/arc3.1/static/graydown.gif b/lang/arc/3.1/static/graydown.gif → lib/arc3.1/static/graydown.gif
diff --git a/lang/arc/3.1/static/robots.txt → lib/arc3.1/static/robots.txt b/lang/arc/3.1/static/robots.txt → lib/arc3.1/static/robots.txt
diff --git a/lang/arc/3.1/static/s.gif → lib/arc3.1/static/s.gif b/lang/arc/3.1/static/s.gif → lib/arc3.1/static/s.gif
diff --git a/lang/arc/3.1/strings.arc → lib/arc3.1/strings.arc b/lang/arc/3.1/strings.arc → lib/arc3.1/strings.arc