[Esbox-commits] r1928 - branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-08-03 23:17:33 +0300 (Mon, 03 Aug 2009)
New Revision: 1928

Modified:
   branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/MaemoScriptInstallerMonitor.java
   branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java
   branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java
Log:
Add Fremantle beta 2 links and add a correction for license text parsing

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/MaemoScriptInstallerMonitor.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/MaemoScriptInstallerMonitor.java	2009-08-03 20:01:59 UTC (rev 1927)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/MaemoScriptInstallerMonitor.java	2009-08-03 20:17:33 UTC (rev 1928)
@@ -166,11 +166,17 @@
 	 * @throws InterruptedException 
 	 */
 	private boolean handleLicenseLine(String text) throws InterruptedException {
-		if (text.trim().length() >= 80 && text.trim().replaceAll("-", "").length() == 0) {
+		boolean oldLicenseLineStart = text.trim().length() >= 80 && text.trim().replaceAll("-", "").length() == 0;
+		boolean newLicenseLineStart = text.contains("1) IMPORTANT: READ CAREFULLY BEFORE");
+		boolean newLicenseLineEnd = text.contains("Press Enter to accept");
+		if (oldLicenseLineStart || newLicenseLineStart || newLicenseLineEnd) {
 			if (!readingLicense && !gotLicense) {
 				readingLicense = true;
 				licenseText = new StringBuilder();
-				return true;
+				if (oldLicenseLineStart) 
+					return true;
+				
+				// else fall through
 			} else if (!gotLicense) {
 				readingLicense = false;
 				gotLicense = true;
@@ -229,7 +235,8 @@
 				}
 				return true;
 			}
-		} else if (readingLicense) {
+		}
+		if (readingLicense) {
 			licenseText.append(text);
 			licenseText.append('\n');
 			return true;

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java	2009-08-03 20:01:59 UTC (rev 1927)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java	2009-08-03 20:17:33 UTC (rev 1928)
@@ -50,14 +50,37 @@
 						"scratchbox-toolchain-host-gcc"));
 			}
 			
-			//Fremantle Beta
+			//Fremantle Beta 2
 			urls = fetchScriptsFromUrl( 
+					"http://repository.maemo.org/unstable/5.0beta2/",
+					"maemo-scratchbox-install.*\\.sh");
+
+			for (URL url : urls) {
+				contents.add(new Scratchbox1SDKInstallerData(
+						"Maemo 5 Series (Fremantle) (Beta 2 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"
+						));
+			}			
+			//Fremantle Beta 1
+			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,
+						"Maemo 5 Series (Fremantle) (Beta 1 Release)",5,  url,
 						((IBuildMachine) newInput),
 						"deb http://scratchbox.org/debian/ maemo5-sdk main",
 						"scratchbox-core", "scratchbox-libs",

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java	2009-08-03 20:01:59 UTC (rev 1927)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java	2009-08-03 20:17:33 UTC (rev 1928)
@@ -53,14 +53,31 @@
 				));
 			}
 			
-//			Fremantle Beta release support
+			// Fremantle Beta 2 release support
 			urls = fetchScriptsFromUrl( 
+					"http://repository.maemo.org/unstable/5.0beta2/", 
+					"maemo-sdk-install.*\\.sh");
+
+			for (URL url : urls) {
+				contents.add(new Scratchbox1TargetInstallerData(
+						"Maemo 5.0 Fremantle (Beta 2 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" }
+				));
+			}
+			
+			// 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)",
+						"Maemo 5.0 Fremantle (Beta 1 Release)",
 						url,
 						sdks.size() > 0 ? sdks.get(0) : null,
 						"FREMANTLE",