deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

return success (0) after exporting jar, use portable firmware paths in exported config

Browse source
This commit is contained in:
fros4943 2010-03-19 09:08:38 +00:00
parent 09446c0ee7
commit c5c6c3b775
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/cooja/java/se/sics/cooja/util/ExecuteJAR.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: ExecuteJAR.java,v 1.6 2010/03/10 14:47:58 fros4943 Exp $ * $Id: ExecuteJAR.java,v 1.7 2010/03/19 09:08:38 fros4943 Exp $
*/ */
package se.sics.cooja.util; package se.sics.cooja.util;
@ -109,7 +109,7 @@ public class ExecuteJAR {
buildExecutableJAR(s.getGUI(), jar); buildExecutableJAR(s.getGUI(), jar);
} catch (RuntimeException e) { } catch (RuntimeException e) {
} }
System.exit(1); System.exit(0);
} }
final static boolean OVERWRITE = false; final static boolean OVERWRITE = false;
@ -362,8 +362,8 @@ public class ExecuteJAR {
"Error when writing firmware file: " + firmwareFile "Error when writing firmware file: " + firmwareFile
); );
} }
logger.info("Simconfig: Update firmware path reference: " + firmwareFile.getAbsolutePath() + " -> " + (executeDir + "/" + newName)); logger.info("Simconfig: Update firmware path reference: " + firmwareFile.getAbsolutePath() + " -> " + ("[CONFIG_DIR]/" + newName));
((Element)pathElement).setText(executeDir + "/" + newName); ((Element)pathElement).setText("[CONFIG_DIR]/" + newName);
} }
} }
} }