cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhigg...@apache.org
Subject [1/3] webworks commit: CB-5660 Revert CB-5443 due to issues with parentheses in Windows PATH
Date Tue, 11 Feb 2014 20:28:27 GMT
Updated Branches:
  refs/heads/3.4.x aa6bfa69c -> 7a0aff9ce


CB-5660 Revert CB-5443 due to issues with parentheses in Windows PATH


Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/c678cbdb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/c678cbdb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/c678cbdb

Branch: refs/heads/3.4.x
Commit: c678cbdbb8bc559a72e7f90219e14b6c00e8fe45
Parents: aa6bfa6
Author: Bryan Higgins <bhiggins@blackberry.com>
Authored: Thu Dec 19 08:56:20 2013 -0500
Committer: Bryan Higgins <bhiggins@blackberry.com>
Committed: Tue Feb 11 09:30:44 2014 -0500

----------------------------------------------------------------------
 blackberry10/bin/init.bat | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/c678cbdb/blackberry10/bin/init.bat
----------------------------------------------------------------------
diff --git a/blackberry10/bin/init.bat b/blackberry10/bin/init.bat
index b90e871..60f8b19 100644
--- a/blackberry10/bin/init.bat
+++ b/blackberry10/bin/init.bat
@@ -23,28 +23,6 @@ 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 (
@@ -85,6 +63,15 @@ if exist "%LOCAL_BBTOOLS_BINARY%" (
 
 :end
 
+set FOUNDJAVA=
+for %%e in (%PATHEXT%) do (
+  for %%X in (java%%e) do (
+    if not defined FOUNDJAVA (
+      set FOUNDJAVA=%%~$PATH:X
+    )
+  )
+)
+
 if not exist "%LOCAL_NODE_BINARY%" (
   if not exist "%CORDOVA_NODE%\node.exe" (
     echo node cannot be found on the path. Aborting.


Mime
View raw message