[Esbox-commits] r1531 - trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard

[fabricioepa at garage.maemo.org]

Author: fabricioepa
Date: 2009-05-04 23:01:24 +0300 (Mon, 04 May 2009)
New Revision: 1531

Modified:
   trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java
   trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java
Log:
Fremantle beta support

Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java	2009-05-04 19:58:15 UTC (rev 1530)
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java	2009-05-04 20:01:24 UTC (rev 1531)
@@ -50,6 +50,7 @@
 						"scratchbox-toolchain-host-gcc"));
 			}
 			
+			//Fremantle Aplha
 			urls = fetchScriptsFromUrl( 
 					"http://repository.maemo.org/unstable/5.0alpha/", 
 					"maemo-scratchbox-install.*\\.sh");
@@ -70,6 +71,31 @@
 				
 
 			}
+			
+			//Fremantle Beta
+			urls = fetchScriptsFromUrl( 
+					"http://repository.maemo.org/unstable/5.0beta/", 
+					"maemo-scratchbox-install.*\\.sh");
+
+			for (URL url : urls) {
+				contents.add(new Scratchbox1SDKInstallerData(
+						"Maemo 5 Series (Fremantle) (Beta Release)",5,  url,
+						((IBuildMachine) newInput),
+						"deb http://scratchbox.org/debian/ maemo5-sdk main",
+						"scratchbox-core", "scratchbox-libs",
+						"scratchbox-devkit-qemu",
+						"scratchbox-devkit-debian",
+						"scratchbox-devkit-doctools",
+						"scratchbox-devkit-perl",
+						"scratchbox-toolchain-host-gcc",
+						"scratchbox-toolchain-cs2007q3-glibc2.5-arm7",
+						"scratchbox-toolchain-cs2007q3-glibc2.5-i486",
+						"scratchbox-devkit-svn",
+						"scratchbox-devkit-git",
+						"scratchbox-devkit-apt-https"
+						));
+			}
+			
 		}
 	}
 

Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java	2009-05-04 19:58:15 UTC (rev 1530)
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java	2009-05-04 20:01:24 UTC (rev 1531)
@@ -64,13 +64,30 @@
 						url,
 						sdks.size() > 0 ? sdks.get(0) : null,
 						"FREMANTLE",
-						new String[] { "qemu-arm-cvs-m", "qemu-arm-cvs" },
+						new String[] { "qemu-arm-cvs-m" },
 						new String[] { "cs2007q3-glibc2.5-arm7", "cs2007q3-glibc2.5-i486" },
 						new String[] { "perl", "debian-etch", "doctools", "svn", "git", "cputransp" }
 				));
 			}
-		}
-		
+			
+			
+//			Fremantle Beta release support
+			urls = fetchScriptsFromUrl( 
+					"http://repository.maemo.org/unstable/5.0beta/", 
+					"maemo-sdk-install.*\\.sh");
+
+			for (URL url : urls) {
+				contents.add(new Scratchbox1TargetInstallerData(
+						"Maemo 5.0 Fremantle (Beta Release)",
+						url,
+						sdks.size() > 0 ? sdks.get(0) : null,
+						"FREMANTLE",
+						new String[] { "qemu-arm-sb" },
+						new String[] { "cs2007q3-glibc2.5-arm7", "cs2007q3-glibc2.5-i486" },
+						new String[] { "qemu", "perl", "debian-etch", "doctools", "svn", "git", "apt-https" }
+				));
+			}
+		}	
 	}
 	private Image platformImage;