1.1 --- a/build.xml Tue Jun 30 15:04:45 2009 -0400
1.2 +++ b/build.xml Tue Jun 30 15:24:45 2009 -0400
1.3 @@ -38,11 +38,13 @@
1.4 <fileset dir="${src}">
1.5 <exclude name="**/*.java" />
1.6 <exclude name="**/*.conf" />
1.7 - <exclude name="**/.svn/**" />
1.8 - <exclude name="**/.hg/**" />
1.9 <exclude name="**/bin/**" />
1.10 <exclude name="**/dist/**" />
1.11 <exclude name="**/backup/**" />
1.12 + <exclude name="**/swt-lin/**" />
1.13 + <exclude name="**/.settings/**" />
1.14 + <exclude name="**/.svn/**" />
1.15 + <exclude name="**/.hg/**" />
1.16 </fileset>
1.17 </copy>
1.18
1.19 @@ -53,6 +55,11 @@
1.20
1.21 <!-- Now that the config is in the main folder, dont dist it -->
1.22 <delete file="${dist}/repdev.conf"/>
1.23 + <delete file="${dist}/.hgignore"/>
1.24 + <delete file="${dist}/.classpath"/>
1.25 + <delete file="${dist}/.project"/>
1.26 + <delete file="${dist}/stdout.txt"/>
1.27 + <delete file="${dist}/stderr.txt"/>
1.28
1.29 </target>
1.30
2.1 --- a/com/repdev/launcher/Launcher.java Tue Jun 30 15:04:45 2009 -0400
2.2 +++ b/com/repdev/launcher/Launcher.java Tue Jun 30 15:24:45 2009 -0400
2.3 @@ -20,12 +20,9 @@
2.4
2.5 public static void main(String[] args) throws Exception {
2.6 boolean log = false;
2.7 - boolean noupdate = false;
2.8 for(String arg: args) {
2.9 if( arg.equals("--log") )
2.10 log = true;
2.11 - if( arg.equals("--no-update") )
2.12 - noupdate = true;
2.13 if( arg.equals("--help") || arg.equals("-h") ) {
2.14 usage();
2.15 System.exit(1);
2.16 @@ -45,48 +42,10 @@
2.17 System.err.println(">> Started: " + date + "\n");
2.18 }
2.19
2.20 - // Try to update repdev via svn...
2.21 - if( !noupdate ) {
2.22 - try {
2.23 - exec(System.getProperty("user.dir") + "\\svnbin\\svn.exe cleanup");
2.24 - exec(System.getProperty("user.dir") + "\\svnbin\\svn.exe update");
2.25 - System.out.println();
2.26 - System.err.println();
2.27 - } catch (Exception e) {
2.28 - 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");
2.29 - System.err.println("Error: " + e.getMessage());
2.30 - }
2.31 - }
2.32 -
2.33 // Finally, we launch repdev...
2.34 com.repdev.RepDevMain.main(args);
2.35 }
2.36
2.37 - /**
2.38 - * Execute a command and log it to stderr and stdout...
2.39 - * @param cmd
2.40 - * @return Exit value of the process.
2.41 - */
2.42 - private static int exec(String cmd) throws Exception {
2.43 - Process p = Runtime.getRuntime().exec(cmd);
2.44 - BufferedReader stdout = new BufferedReader(new InputStreamReader(p.getInputStream()));
2.45 - BufferedReader stderr = new BufferedReader(new InputStreamReader(p.getErrorStream()));
2.46 -
2.47 - // We want this to finish before dumping output...
2.48 - p.waitFor();
2.49 -
2.50 - String line = "";
2.51 - while( (line = stdout.readLine()) != null )
2.52 - System.out.println(line);
2.53 - while( (line = stderr.readLine()) != null )
2.54 - System.err.println(line);
2.55 -
2.56 - stdout.close();
2.57 - stderr.close();
2.58 -
2.59 - return p.exitValue();
2.60 - }
2.61 -
2.62 private static void usage() {
2.63 String[] usage = {
2.64 "RepDev Launcher - Usage:",
2.65 @@ -94,7 +53,6 @@
2.66 "\tCommand\tAction",
2.67 "\t--help or -h\tThis message",
2.68 "\t--log\tLog all output to stdout.txt and stderr.txt",
2.69 - "\t--no-update\tSkip SVN update (faster startup)",
2.70 "",
2.71 };
2.72
3.1 --- a/com/repdev/launcher/launch4j.xml Tue Jun 30 15:04:45 2009 -0400
3.2 +++ b/com/repdev/launcher/launch4j.xml Tue Jun 30 15:24:45 2009 -0400
3.3 @@ -1,8 +1,8 @@
3.4 <launch4jConfig>
3.5 <dontWrapJar>false</dontWrapJar>
3.6 <headerType>gui</headerType>
3.7 - <jar>C:\workspace\RepDev\com\repdev\launcher\launcher.jar</jar>
3.8 - <outfile>C:\workspace\RepDev\repdev.exe</outfile>
3.9 + <jar>C:\workspace\RepDev-hg\com\repdev\launcher\launcher.jar</jar>
3.10 + <outfile>C:\workspace\RepDev-hg\repdev.exe</outfile>
3.11 <errTitle></errTitle>
3.12 <cmdLine>--log</cmdLine>
3.13 <chdir></chdir>
3.14 @@ -12,7 +12,7 @@
3.15 <customProcName>true</customProcName>
3.16 <stayAlive>false</stayAlive>
3.17 <manifest></manifest>
3.18 - <icon>C:\workspace\RepDev\repdev-icons\monkeyIcon32.ico</icon>
3.19 + <icon>C:\workspace\RepDev-hg\repdev-icons\monkeyIcon32.ico</icon>
3.20 <jre>
3.21 <path></path>
3.22 <minVersion>1.5.0</minVersion>
3.23 @@ -23,12 +23,12 @@
3.24 <opt>-Djava.library.path=swt-win</opt>
3.25 </jre>
3.26 <versionInfo>
3.27 - <fileVersion>0.1.0.0</fileVersion>
3.28 - <txtFileVersion>0.1.0.0</txtFileVersion>
3.29 + <fileVersion>0.1.6.2</fileVersion>
3.30 + <txtFileVersion>1.6.2</txtFileVersion>
3.31 <fileDescription>RepDev Launcher</fileDescription>
3.32 - <copyright>(c) 2008 RepDev LLC</copyright>
3.33 - <productVersion>1.6.0.0</productVersion>
3.34 - <txtProductVersion>1.6.0</txtProductVersion>
3.35 + <copyright>(c) 2008-2009 RepDev LLC</copyright>
3.36 + <productVersion>1.6.2.0</productVersion>
3.37 + <txtProductVersion>1.6.2</txtProductVersion>
3.38 <productName>RepDev</productName>
3.39 <companyName>RepDev LLC</companyName>
3.40 <internalName>RepDev</internalName>
4.1 Binary file com/repdev/launcher/launcher.jar has changed
5.1 Binary file repdev.exe has changed