Revision 6125

View differences:

trunk/install/launcher/izpack-launcher-1.3/dist/launcher.ini
2 2 
## Ruta al achivo Jar a lanzar
3 3 
jar = %JARNAME%
4 4 

  		




  
  5
  
    

  		




  5
  6
  
    
## Parametros a incluir al lanzar el Jar


  		




  6
  7
  
    
jarParams = 


  		




  7
  8
  
    
## Lanzar el Jar en ansincrono o no:


  		




  ......




  11
  12
  
    

  		




  12
  13
  
    
## Version de JRE requerida


  		




  13
  14
  
    
jre_version = 1.4.2


  		




  
  15
  
    
jre_version_prefered = 1.4.2_06


  		




  14
  16
  
    

  		




  15
  
  
    

  		




  16
  17
  
    
## Descarga remota


  		




  17
  18
  
    
## 	* los valores valido de downloadEnabled son:


  		




  18
  19
  
    
##		- habilitado: S SI YES Y 1


  		












  

    
      trunk/install/launcher/izpack-launcher-1.3/src/launcher.h
    
  





  66
  66
  
    
 


  		




  67
  67
  
    
  


  		




  68
  68
  
    
  wxString paramsJreVersion;


  		




  
  69
  
    
  wxString paramsJreVersionPrefered;


  		




  69
  70
  
    

  		




  70
  71
  
    
  wxString localVersionToUse;


  		




  71
  72
  
    

  		












  

    
      trunk/install/launcher/izpack-launcher-1.3/src/compile.bat
    
  





  1
  1
  
    
@echo off


  		




  2
  2
  
    
color F0


  		




  
  3
  
    
PROMPT=$g


  		




  3
  4
  
    

  		




  4
  
  
    

  		




  5
  5
  
    
if not defined WXWIN goto wxwin_not_defined


  		




  6
  6
  
    

  		




  7
  7
  
    

  		












  

    
      trunk/install/launcher/izpack-launcher-1.3/src/launcher.ini
    
  





  10
  10
  
    

  		




  11
  11
  
    
## Version de JRE requerida


  		




  12
  12
  
    
jre_version = 1.4.2


  		




  
  13
  
    
jre_version_prefered = 1.4.2_06


  		




  13
  14
  
    

  		




  14
  15
  
    

  		




  15
  16
  
    
## Descarga remota


  		












  

    
      trunk/install/launcher/izpack-launcher-1.3/src/launcher.cpp
    
  





  126
  126
  
    
  cfg.Read( "jai_io",          &paramsJaiIo, wxEmptyString);


  		




  127
  127
  
    
  cfg.Read( "downloadJai_io",  &paramsJaiIoDownload, wxEmptyString);


  		




  128
  128
  
    
  cfg.Read( "jre_version",     &paramsJreVersion, wxEmptyString);


  		




  
  129
  
    
  cfg.Read( "jre_version_prefered",     &paramsJreVersionPrefered, wxEmptyString);


  		




  129
  130
  
    
  cfg.Read( "jarParams",       &paramsJarParams, wxEmptyString);


  		




  130
  131
  
    
  cfg.Read( "downloadEnabled", &downloadEnabled, wxEmptyString);


  		




  131
  132
  
    
  cfg.Read( "launchJarAsync",  &launchJarAsync, wxEmptyString);


  		




  ......




  138
  139
  
    
  {


  		




  139
  140
  
    
    error(_("The configuration file '") + cfgName + _("' does not contain a jar file entry."));


  		




  140
  141
  
    
  }


  		




  
  142
  
    
  if (paramsJreVersionPrefered == wxEmptyString ) {


  		




  
  143
  
    
     paramsJreVersionPrefered = wxString(paramsJreVersion);


  		




  
  144
  
    
  }


  		




  141
  145
  
    
}


  		




  142
  146
  
    

  		




  143
  147
  
    
void LauncherApp::error(const wxString &msg)


  		




  ......




  282
  286
  
    
bool LauncherApp::searchJRE()


  		




  283
  287
  
    
{


  		




  284
  288
  
    
  showStatusMsg(_("Searching for JRE..."));


  		




  285
  
  
    
  wxString version;


  		




  
  289
  
    
  wxString version("");


  		




  286
  290
  
    

  		




  287
  291
  
    
  // Windows[tm] registry lookup


  		




  288
  292
  
    
  wxString baseKey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft"


  		




  289
  293
  
    
                     "\\Java Runtime Environment\\";


  		




  290
  294
  
    

  		




  291
  295
  
    
  wxRegKey bKey(baseKey);


  		




  292
  
  
    
  if (bKey.Exists())  {


  		




  
  296
  
    
  if (!bKey.Exists())  {


  		




  
  297
  
    
     return false;


  		




  
  298
  
    
  }


  		




  293
  299
  
    

  		




  294
  
  
    
    if (bKey.QueryValue("CurrentVersion", version))


  		




  295
  
  
    
    {


  		




  296
  
  
    
      if (version != "1.1")


  		




  297
  
  
    
      {


  		




  298
  
  
    
		if (!compareVersions(version, paramsJreVersion))


  		




  299
  
  
    
		{


  		




  300
  
  
    
			//Nos recorremos las versiones instaladas


  		




  301
  
  
    
			version = "";


  		




  302
  
  
    
			wxString strTemp;


  		




  303
  
  
    
			wxRegKey sKey(baseKey);


  		




  304
  
  
    
			if (sKey.HasSubKey(paramsJreVersion)) {


  		




  305
  
  
    
               version = wxString(paramsJreVersion);


  		




  306
  
  
    
            } else {              


  		




  307
  
  
    
			  for(unsigned i=1;i<16;i++) {


  		




  308
  
  
    
                strTemp = wxString::Format(paramsJreVersion + "_%02d",i);


  		




  309
  
  
    
    			if (sKey.HasSubKey(strTemp)) {


  		




  310
  
  
    
    					version = strTemp;


  		




  311
  
  
    
    					break;


  		




  312
  
  
    
    			}


  		




  313
  
  
    
  			  }               


  		




  314
  
  
    
            }


  		




  315
  
  
    
		}


  		




  316
  
  
    
		if (version != "") {


  		




  317
  
  
    
			localVersionToUse = version;


  		




  318
  
  
    
			wxRegKey vKey(baseKey + version);


  		




  
  300
  
    
  if (!bKey.QueryValue("CurrentVersion", version)){


  		




  
  301
  
    
     return false;


  		




  
  302
  
    
  }


  		




  
  303
  
    
  


  		




  
  304
  
    
  if (version == "1.1") {


  		




  
  305
  
    
     return false;


  		




  
  306
  
    
  }


  		




  319
  307
  
    

  		




  320
  
  
    
			if (vKey.QueryValue("JavaHome", javaHome))


  		




  321
  
  
    
			{


  		




  322
  
  
    
				javaExecPath = javaHome + "\\bin\\javaw";


  		




  323
  
  
    
				return true;


  		




  324
  
  
    
			}


  		




  
  308
  
    
  if (!compareVersions(version, paramsJreVersionPrefered)){


  		




  
  309
  
    
	//Nos recorremos las versiones instaladas


  		




  
  310
  
    
	version = "";


  		




  
  311
  
    
	wxString strTemp;


  		




  
  312
  
    
	wxRegKey sKey(baseKey);


  		




  
  313
  
    
	if (sKey.HasSubKey(paramsJreVersionPrefered)) {


  		




  
  314
  
    
      version = wxString(paramsJreVersionPrefered);


  		




  
  315
  
    
    } else {              


  		




  
  316
  
    
	  for(unsigned i=20;i>1;i--) {


  		




  
  317
  
    
        strTemp = wxString::Format(paramsJreVersion + "_%02d",i);


  		




  
  318
  
    
        if (sKey.HasSubKey(strTemp)) {


  		




  
  319
  
    
			version = strTemp;


  		




  
  320
  
    
			break;


  		




  325
  321
  
    
		}


  		




  326
  
  
    

  		




  327
  
  
    
      }


  		




  
  322
  
    
	  }               


  		




  328
  323
  
    
    }


  		




  329
  324
  
    
  }


  		




  330
  
  
    
  return false;


  		




  
  325
  
    

  		




  
  326
  
    
	


  		




  
  327
  
    
  if (version == "") {


  		




  
  328
  
    
     return false;


  		




  
  329
  
    
  }            


  		




  
  330
  
    
  localVersionToUse = version;


  		




  
  331
  
    
  wxRegKey vKey(baseKey + version);


  		




  
  332
  
    

  		




  
  333
  
    
  if (!vKey.QueryValue("JavaHome", javaHome)){


  		




  
  334
  
    
     return false;


  		




  
  335
  
    
  }


  		




  
  336
  
    
  javaExecPath = javaHome + "\\bin\\javaw";


  		




  
  337
  
    
  return true;


  		




  331
  338
  
    
}


  		




  332
  339
  
    

  		




  333
  340
  
    
void LauncherApp::runJRE()


  		












Also available in:  Unified diff