# HG changeset patch # User ryan # Date 1246389885 14400 # Node ID a86c195127e7539d5ac217dbc916a050768e5215 # Parent 8c0ed7ace7736ac8fce56dfc7f85aeda197a3120 build.xml tweaks (more exclusions) modified launcher to not try and svn update rebuilt launcher executable (repdev.exe) generated dist (not included in version control) diff -r 8c0ed7ace773 -r a86c195127e7 build.xml --- a/build.xml Tue Jun 30 15:04:45 2009 -0400 +++ b/build.xml Tue Jun 30 15:24:45 2009 -0400 @@ -38,11 +38,13 @@ - - + + + + @@ -53,6 +55,11 @@ + + + + + diff -r 8c0ed7ace773 -r a86c195127e7 com/repdev/launcher/Launcher.java --- a/com/repdev/launcher/Launcher.java Tue Jun 30 15:04:45 2009 -0400 +++ b/com/repdev/launcher/Launcher.java Tue Jun 30 15:24:45 2009 -0400 @@ -20,12 +20,9 @@ public static void main(String[] args) throws Exception { boolean log = false; - boolean noupdate = false; for(String arg: args) { if( arg.equals("--log") ) log = true; - if( arg.equals("--no-update") ) - noupdate = true; if( arg.equals("--help") || arg.equals("-h") ) { usage(); System.exit(1); @@ -45,48 +42,10 @@ System.err.println(">> Started: " + date + "\n"); } - // Try to update repdev via svn... - if( !noupdate ) { - try { - exec(System.getProperty("user.dir") + "\\svnbin\\svn.exe cleanup"); - exec(System.getProperty("user.dir") + "\\svnbin\\svn.exe update"); - System.out.println(); - System.err.println(); - } catch (Exception e) { - System.err.println("Could not update via subversion. This may not be a big issue, but to update you will need to download new zip packages"); - System.err.println("Error: " + e.getMessage()); - } - } - // Finally, we launch repdev... com.repdev.RepDevMain.main(args); } - /** - * Execute a command and log it to stderr and stdout... - * @param cmd - * @return Exit value of the process. - */ - private static int exec(String cmd) throws Exception { - Process p = Runtime.getRuntime().exec(cmd); - BufferedReader stdout = new BufferedReader(new InputStreamReader(p.getInputStream())); - BufferedReader stderr = new BufferedReader(new InputStreamReader(p.getErrorStream())); - - // We want this to finish before dumping output... - p.waitFor(); - - String line = ""; - while( (line = stdout.readLine()) != null ) - System.out.println(line); - while( (line = stderr.readLine()) != null ) - System.err.println(line); - - stdout.close(); - stderr.close(); - - return p.exitValue(); - } - private static void usage() { String[] usage = { "RepDev Launcher - Usage:", @@ -94,7 +53,6 @@ "\tCommand\tAction", "\t--help or -h\tThis message", "\t--log\tLog all output to stdout.txt and stderr.txt", - "\t--no-update\tSkip SVN update (faster startup)", "", }; diff -r 8c0ed7ace773 -r a86c195127e7 com/repdev/launcher/launch4j.xml --- a/com/repdev/launcher/launch4j.xml Tue Jun 30 15:04:45 2009 -0400 +++ b/com/repdev/launcher/launch4j.xml Tue Jun 30 15:24:45 2009 -0400 @@ -1,8 +1,8 @@ false gui - C:\workspace\RepDev\com\repdev\launcher\launcher.jar - C:\workspace\RepDev\repdev.exe + C:\workspace\RepDev-hg\com\repdev\launcher\launcher.jar + C:\workspace\RepDev-hg\repdev.exe --log @@ -12,7 +12,7 @@ true false - C:\workspace\RepDev\repdev-icons\monkeyIcon32.ico + C:\workspace\RepDev-hg\repdev-icons\monkeyIcon32.ico 1.5.0 @@ -23,12 +23,12 @@ -Djava.library.path=swt-win - 0.1.0.0 - 0.1.0.0 + 0.1.6.2 + 1.6.2 RepDev Launcher - (c) 2008 RepDev LLC - 1.6.0.0 - 1.6.0 + (c) 2008-2009 RepDev LLC + 1.6.2.0 + 1.6.2 RepDev RepDev LLC RepDev diff -r 8c0ed7ace773 -r a86c195127e7 com/repdev/launcher/launcher.jar Binary file com/repdev/launcher/launcher.jar has changed diff -r 8c0ed7ace773 -r a86c195127e7 repdev.exe Binary file repdev.exe has changed