Merge branch 'master' of git://github.com/tlrobinson/narwhal

280north · Jul 25, 2009 · 96d9310 · 96d9310
2 parents bfa425e + c87f202
commit 96d9310
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 2 deletions.
diff --git a/bin/activate.cmd b/bin/activate.cmd
@@ -0,0 +1,3 @@
+@echo off
+
+set PATH=%~dp0;%PATH%
diff --git a/bin/narwhal.cmd b/bin/narwhal.cmd
@@ -26,5 +26,4 @@ if exist %NARWHAL_HOME%\platforms\%NARWHAL_PLATFORM%. (
 	exit
 )
 
-:: FIXME: should this be "start" instead of "call" in case it's actually an executable?
 call %NARWHAL_PLATFORM_HOME%\bin\%EXECUTABLE_NAME% %*
diff --git a/bin/sea.cmd b/bin/sea.cmd
@@ -0,0 +1,26 @@
+@echo off
+setlocal
+
+set SHELL=cmd.exe
+
+set PACKAGE_HOME=%~dp0\..
+
+call %PACKAGE_HOME%\bin\activate.cmd
+
+set OLDSEA=%SEA%
+set SEA=%PACKAGE_HOME%
+set /a SEALVL=%SEALVL% + 1
+
+if "%1" == "" (
+    echo SEALVL=%SEALVL%
+    echo SEA=%SEA%
+    echo PATH=%PATH%
+    %SHELL%
+) else (
+echo "asdfasdfadsf"
+    %SHELL% %*
+)
+
+set /a SEALVL=%SEALVL% - 1
+echo SEALVL=%SEALVL%
+echo SEA=%OLDSEA%
diff --git a/bin/tusk.cmd b/bin/tusk.cmd
@@ -0,0 +1 @@
+narwhal.cmd %~dpn0 %*
diff --git a/platforms/rhino/bin/narwhal-rhino.cmd b/platforms/rhino/bin/narwhal-rhino.cmd
@@ -21,5 +21,5 @@ set JAVA_MAIN=org.mozilla.javascript.tools.shell.Main
 if "%1" == "" (
 	java -cp "%CLASSPATH%" "%JAVA_MAIN%" -f "%BOOTSTRAP%" -f -
 ) else (
-	java -cp "%CLASSPATH%" "%JAVA_MAIN%" "%BOOTSTRAP%" "%0" "%*"
+	java -cp "%CLASSPATH%" "%JAVA_MAIN%" "%BOOTSTRAP%" "%0" %*
 )