diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:51:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:51:56 +0000 |
| commit | 94c076de971b978285a448aa16ed31394eb318c5 (patch) | |
| tree | 53f53455e2ef4e4280d05204cd1c24716d71e077 /odk/cfgWin.js | |
| parent | 2c9a9ca362a3b2d6418ddc7f9a9469c555c9c96a (diff) | |
INTEGRATION: CWS jsc18 (1.8.36); FILE MERGED
2007/07/24 15:41:17 jsc 1.8.36.4: #i74573# improve VC8 checking
2007/07/24 15:39:04 jsc 1.8.36.3: #i74573# improve VC8 checking
2007/07/23 13:52:36 jsc 1.8.36.2: #i74573# check cpp with suggestion to detect VC8 usage
2007/07/19 07:06:39 jsc 1.8.36.1: #i74573# initialize variable sVC8 earlier
Diffstat (limited to 'odk/cfgWin.js')
| -rw-r--r-- | odk/cfgWin.js | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/odk/cfgWin.js b/odk/cfgWin.js index 4d49f4f5016f..d6f5bba313f2 100644 --- a/odk/cfgWin.js +++ b/odk/cfgWin.js @@ -41,7 +41,7 @@ if (office_or_ure == "office") { } var oo_sdk_make_home = getMakeHome(); var oo_sdk_zip_home = getZipHome(); -var oo_sdk_vc8_used; +var oo_sdk_vc8_used = ""; var oo_sdk_cpp_home = getCppHome(); var oo_sdk_cli_home = getCliHome(); var oo_sdk_java_home = getJavaHome(); @@ -327,13 +327,13 @@ function getZipHome() function getCppHome() { var sSuggestedHome = WshSysEnv("OO_SDK_CPP_HOME"); +// var sVC8=""; if (sSuggestedHome.length == 0) { var sVC=""; - var sVC8=""; try { sVC = WshShell.RegRead(regKeyVCExpress80); - sVC8="true"; +// sVC8="true"; }catch (exc) {} if (sVC.length == 0) @@ -392,6 +392,7 @@ function getCppHome() if ( !bSkip) { //Check if the C++ compiler exist var cl = sHome + "\\cl.exe"; + var mt = sHome + "\\mt.exe"; if (! aFileSystemObject.FileExists(cl)) { @@ -399,6 +400,10 @@ function getCppHome() + cl + "\"."); sHome = ""; bSkip = true; + } else { + if (aFileSystemObject.FileExists(mt)) { + oo_sdk_vc8_used="true"; + } } } @@ -410,9 +415,7 @@ function getCppHome() continue; } } - - if (sVC8.length > 0) - oo_sdk_vc8_used=sVC8; + return sHome; } } |