From d2734fa8e8db34fc16eacf7786077ae13c9280e7 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 11 Jan 2012 13:59:39 +0100 Subject: [PATCH] Fixed eclipse project files --- app/.settings/org.eclipse.jdt.core.prefs | 8 +- app/src/processing/app/debug/Sizer.java | 93 ++++++++----------- build/windows/launcher/launch4j/.classpath | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 24 ++--- 4 files changed, 57 insertions(+), 71 deletions(-) diff --git a/app/.settings/org.eclipse.jdt.core.prefs b/app/.settings/org.eclipse.jdt.core.prefs index d6676cc6b09..109d1ff5d9c 100644 --- a/app/.settings/org.eclipse.jdt.core.prefs +++ b/app/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ -#Wed Jun 04 15:47:46 EDT 2008 +#Wed Jan 11 13:49:57 CET 2012 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -63,7 +63,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/app/src/processing/app/debug/Sizer.java b/app/src/processing/app/debug/Sizer.java index 2b4dfd80f38..d67728a3c85 100644 --- a/app/src/processing/app/debug/Sizer.java +++ b/app/src/processing/app/debug/Sizer.java @@ -1,77 +1,67 @@ /* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */ /* - Sizer - computes the size of a .hex file - Part of the Arduino project - http://www.arduino.cc/ + Sizer - computes the size of a .hex file + Part of the Arduino project - http://www.arduino.cc/ - Copyright (c) 2006 David A. Mellis + Copyright (c) 2006 David A. Mellis - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - $Id$ - */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + $Id$ +*/ package processing.app.debug; -import java.io.File; -import java.text.MessageFormat; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.StringTokenizer; +import processing.app.Base; + +import java.io.*; +import java.util.*; public class Sizer implements MessageConsumer { private String buildPath, sketchName; - private String firstLine; - private long size; - private RunnerException exception; - private Map prefs; - - public Sizer(String buildPath, String sketchName, - Map prefs) { + public Sizer(String buildPath, String sketchName) { this.buildPath = buildPath; this.sketchName = sketchName; - this.prefs = prefs; } - + public long computeSize() throws RunnerException { - String args[] = new String[3]; - args[0] = prefs.get("compiler.path"); - args[1] = prefs.get("compiler.size.cmd"); - args[2] = buildPath + File.separator + sketchName; - - String recipe = prefs.get("recipe.size.pattern"); - MessageFormat compileFormat = new MessageFormat(recipe); - String command = compileFormat.format(args); - String[] commandArray = command.split("\\|"); + String avrBasePath = Base.getAvrBasePath(); + String commandSize[] = new String[] { + avrBasePath + "avr-size", + " " + }; + + commandSize[1] = buildPath + File.separator + sketchName + ".hex"; int r = 0; try { exception = null; size = -1; firstLine = null; - Process process = Runtime.getRuntime().exec(commandArray); + Process process = Runtime.getRuntime().exec(commandSize); MessageSiphon in = new MessageSiphon(process.getInputStream(), this); MessageSiphon err = new MessageSiphon(process.getErrorStream(), this); boolean running = true; - while (running) { + while(running) { try { if (in.thread != null) in.thread.join(); @@ -79,28 +69,25 @@ public long computeSize() throws RunnerException { err.thread.join(); r = process.waitFor(); running = false; - } catch (InterruptedException intExc) { - } + } catch (InterruptedException intExc) { } } } catch (Exception e) { // The default Throwable.toString() never returns null, but apparently // some sub-class has overridden it to do so, thus we need to check for - // it. See: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1166589459 - if (e.toString() == null) - exception = new RunnerException(e.getClass().getName() + r); - else - exception = new RunnerException(e.toString() + r); + // it. See: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1166589459 + exception = new RunnerException( + (e.toString() == null) ? e.getClass().getName() + r : e.toString() + r); } - + if (exception != null) throw exception; - + if (size == -1) throw new RunnerException(firstLine); - + return size; } - + public void message(String s) { if (firstLine == null) firstLine = s; diff --git a/build/windows/launcher/launch4j/.classpath b/build/windows/launcher/launch4j/.classpath index 734d175a61f..2002cf16e9b 100755 --- a/build/windows/launcher/launch4j/.classpath +++ b/build/windows/launcher/launch4j/.classpath @@ -9,8 +9,7 @@ - - + diff --git a/build/windows/launcher/launch4j/.settings/org.eclipse.jdt.core.prefs b/build/windows/launcher/launch4j/.settings/org.eclipse.jdt.core.prefs index 056498058fa..ed784a2797d 100755 --- a/build/windows/launcher/launch4j/.settings/org.eclipse.jdt.core.prefs +++ b/build/windows/launcher/launch4j/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ -#Sun Jul 20 14:10:30 CEST 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.4 +#Wed Jan 11 13:54:29 CET 2012 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6