Revision 38440

View differences:

branches/v2_0_0_prep/build/projects/gvsig-standard/gvsig-standard-installer/src/main/installjammer/gvsig-standard-installer.mpi
7318 7318
{<%AppName%> add-ons manager}
7319 7319

  
7320 7320
385BE7D0-EFF9-B688-FFC5-C2EAC8979C85,ProgramCommandLine
7321
{<%ProgramExecutable%> --applicationName=gvSIG --pluginsFolder=gvSIG/extensiones --install --installURL=http://downloads.gvsig.org/download/gvsig-desktop/dists/<%Version%>/packages.gvspki;http://gvsig.freegis.ru/download/gvsig-desktop/dists/<%Version%>/packages.gvspki;http://dl.dropbox.com/u/50540894/gvSIG-desktop/dists/<%Version%>/packages.gvspki;http://ubuntuone.com/6eZyYCSAiUzBPBH4imhug6  language=<%Language%>}
7321
{<%ProgramExecutable%> --applicationName=gvSIG --pluginsFolder=gvSIG/extensiones --install --installVersion=<%Version%>-<%BuildVersion%> --installURL=http://downloads.gvsig.org/download/gvsig-desktop/dists/<%Version%>/packages.gvspki;http://gvsig.freegis.ru/download/gvsig-desktop/dists/<%Version%>/packages.gvspki;http://dl.dropbox.com/u/50540894/gvSIG-desktop/dists/<%Version%>/packages.gvspki;http://ubuntuone.com/6eZyYCSAiUzBPBH4imhug6  language=<%Language%>}
7322 7322

  
7323 7323
385BE7D0-EFF9-B688-FFC5-C2EAC8979C85,WorkingDirectory
7324 7324
{<%InstallDir%>}
branches/v2_0_0_prep/build/projects/gvsig-standard/gvsig-standard-installer/src/main/launch4j/gvsig_package_installer.xml
4 4
  <jar>C:\dev\ew\gv2standard\build\product\lib\org.gvsig.andamiupdater-1.0.0-SNAPSHOT.jar</jar>
5 5
  <outfile>C:\dev\ew\gv2standard\build\product\gvsig-package-installer.exe</outfile>
6 6
  <errTitle>gvSIG package installer launch error</errTitle>
7
  <cmdLine>--applicationName=gvSIG --pluginsFolder=gvSIG/extensiones --install --installURL=http://downloads.gvsig.org/download/gvsig-desktop/dists/2.0.0/packages.gvspki;http://gvsig.freegis.ru/download/gvsig-desktop/dists/2.0.0/packages.gvspki;http://dl.dropbox.com/u/50540894/gvSIG-desktop/dists/2.0.0/packages.gvspki;http://ubuntuone.com/6eZyYCSAiUzBPBH4imhug6</cmdLine>
7
  <cmdLine>--applicationName=gvSIG --pluginsFolder=gvSIG/extensiones --install --installVersion=2.0.0-2048 --installURL=http://downloads.gvsig.org/download/gvsig-desktop/dists/2.0.0/packages.gvspki;http://gvsig.freegis.ru/download/gvsig-desktop/dists/2.0.0/packages.gvspki;http://dl.dropbox.com/u/50540894/gvSIG-desktop/dists/2.0.0/packages.gvspki;http://ubuntuone.com/6eZyYCSAiUzBPBH4imhug6</cmdLine>
8 8
  <chdir>.</chdir>
9 9
  <priority>normal</priority>
10 10
  <downloadUrl>http://java.com/download</downloadUrl>
branches/v2_0_0_prep/frameworks/_fwAndami/src/org/gvsig/andami/Launcher.java
2999 2999
		config.setLocaleLanguage(locale.getLanguage());
3000 3000
		config.setLocaleCountry(locale.getCountry());
3001 3001
		config.setLocaleVariant(locale.getVariant());
3002
		
3003
		InstallerManager installerManager = InstallerLocator
3004
				.getInstallerManager();
3005
		// set the gvSIG version to the install manager, to compose the download
3006
		// URL:
3007
		installerManager.setVersion(gvSIGVersion);
3002 3008

  
3009

  
3003 3010
		// Configure default index download URL
3004 3011
		if (installURL != null) {
3005 3012
			SwingInstallerLocator.getSwingInstallerManager()
......
3017 3024

  
3018 3025
		File defaultAddonsRepository = PluginsLocator.getManager()
3019 3026
				.getPluginsFolder();
3020
		InstallerManager installerManager = InstallerLocator
3021
				.getInstallerManager();
3022 3027
		installerManager.addLocalAddonRepository(defaultAddonsRepository);
3023 3028
		installerManager
3024 3029
				.setDefaultLocalAddonRepository(defaultAddonsRepository);
......
3044 3049
		// default packages will be selected.
3045 3050
		installPackageWizard.setSelectDefaultPackages(true);
3046 3051

  
3047
		// set the gvSIG version to the install manager, to compose the download
3048
		// URL:
3049
		InstallerLocator.getInstallerManager().setVersion(gvSIGVersion);
3050 3052

  
3051 3053
		// 1. Create the frame.
3052 3054
		JFrame frame = new JFrame(Messages.get("gvsig_package_installer"));

Also available in: Unified diff