You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bh...@apache.org on 2013/12/05 21:00:25 UTC
webworks commit: CB-5443 Windows: Handle installed 64 bit Java
Updated Branches:
refs/heads/master 1b906511c -> 5689a49b0
CB-5443 Windows: Handle installed 64 bit Java
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/5689a49b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/5689a49b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/5689a49b
Branch: refs/heads/master
Commit: 5689a49b058623e27dc87bb19d303540c798f3a2
Parents: 1b90651
Author: Josh Soref <js...@blackberry.com>
Authored: Tue Nov 19 16:56:10 2013 -0500
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Thu Dec 5 15:01:39 2013 -0500
----------------------------------------------------------------------
blackberry10/bin/init.bat | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/5689a49b/blackberry10/bin/init.bat
----------------------------------------------------------------------
diff --git a/blackberry10/bin/init.bat b/blackberry10/bin/init.bat
index aad56c6..b6c8363 100644
--- a/blackberry10/bin/init.bat
+++ b/blackberry10/bin/init.bat
@@ -23,6 +23,28 @@ set CORDOVA_HOME_DIR=%USERPROFILE%\.cordova\lib\blackberry10\cordova\%CORDOVA_VE
set LOCAL_NODE_BINARY=%CORDOVA_HOME_DIR%\bin\dependencies\node\bin
set LOCAL_BBTOOLS_BINARY=%CORDOVA_HOME_DIR%\bin\dependencies\bb-tools\bin
+set FOUNDJAVA=
+for %%e in (%PATHEXT%) do (
+ for %%X in (java%%e) do (
+ if not defined FOUNDJAVA (
+ set FOUNDJAVA=%%~$PATH:X
+ )
+ )
+)
+if not defined FOUNDJAVA (
+ set JAVAPATH="%ProgramFiles(x86)%\java\jre7\bin;%ProgramW6432%\java\jre7\bin;"
+ for %%e in (%PATHEXT%) do (
+ for %%X in (java%%e) do (
+ if not defined FOUNDJAVAAT (
+ set FOUNDJAVAAT=%%~dp$JAVAPATH:X
+ )
+ )
+ )
+)
+if defined FOUNDJAVAAT (
+ set PATH=%PATH%;%FOUNDJAVAAT%
+)
+
if defined CORDOVA_NODE (
if exist "%CORDOVA_NODE%" (
if defined CORDOVA_BBTOOLS (
@@ -61,14 +83,6 @@ if exist "%LOCAL_BBTOOLS_BINARY%" (
)
)
-set FOUNDJAVA=
-for %%e in (%PATHEXT%) do (
- for %%X in (java%%e) do (
- if not defined FOUNDJAVA (
- set FOUNDJAVA=%%~$PATH:X
- )
- )
-)
if not exist "%CORDOVA_NODE%\node.exe" (
echo node cannot be found on the path. Aborting.
exit /b 2