| |
@@ -1,30 +1,16 @@ |
| 1 |
1 |
|
package com.esotericsoftware.scar; |
| 2 |
2 |
|
|
| 3 |
|
- |
import com.esotericsoftware.filesystem.FilePath; |
| 4 |
|
- |
import com.esotericsoftware.filesystem.Paths; |
| 5 |
|
- |
import com.esotericsoftware.filesystem.RootedPaths; |
| 6 |
|
- |
import com.esotericsoftware.filesystem.ZipFactory; |
| 7 |
|
- |
import com.esotericsoftware.scar.support.Parameter; |
| 8 |
|
- |
import com.esotericsoftware.scar.support.ProjectFactory; |
| 9 |
|
- |
import com.esotericsoftware.utils.FileUtil; |
| 10 |
|
- |
import com.esotericsoftware.utils.Util; |
| 11 |
|
- |
import com.esotericsoftware.utils.WrappedIOException; |
| 12 |
|
- |
import org.litesoft.logger.Logger; |
| 13 |
|
- |
import org.litesoft.logger.LoggerFactory; |
| 14 |
|
- |
|
| 15 |
|
- |
import javax.tools.JavaCompiler; |
| 16 |
|
- |
import javax.tools.ToolProvider; |
| 17 |
3 |
|
import java.io.*; |
| 18 |
|
- |
import java.util.ArrayList; |
| 19 |
|
- |
import java.util.Arrays; |
| 20 |
|
- |
import java.util.List; |
| 21 |
|
- |
import java.util.jar.Attributes; |
| 22 |
|
- |
import java.util.jar.JarEntry; |
| 23 |
|
- |
import java.util.jar.JarOutputStream; |
| 24 |
|
- |
import java.util.jar.Manifest; |
| 25 |
|
- |
import java.util.zip.ZipEntry; |
| 26 |
|
- |
import java.util.zip.ZipInputStream; |
| 27 |
|
- |
import java.util.zip.ZipOutputStream; |
| |
4 |
+ |
import java.util.*; |
| |
5 |
+ |
import java.util.jar.*; |
| |
6 |
+ |
import java.util.zip.*; |
| |
7 |
+ |
import javax.tools.*; |
| |
8 |
+ |
|
| |
9 |
+ |
import org.litesoft.logger.*; |
| |
10 |
+ |
|
| |
11 |
+ |
import com.esotericsoftware.filesystem.*; |
| |
12 |
+ |
import com.esotericsoftware.scar.support.*; |
| |
13 |
+ |
import com.esotericsoftware.utils.*; |
| 28 |
14 |
|
|
| 29 |
15 |
|
/** |
| 30 |
16 |
|
* Generic Data structure that contains information needed to perform tasks. |
| |
@@ -289,7 +275,7 @@ |
| 289 |
275 |
|
|
| 290 |
276 |
|
protected boolean GWTcompileIt() |
| 291 |
277 |
|
{ |
| 292 |
|
- |
String[] args = // |
| |
278 |
+ |
String[] args = // |
| 293 |
279 |
|
{ // |
| 294 |
280 |
|
getPathJavaJRE(), // |
| 295 |
281 |
|
"-Xmx" + getGWTmx(), // |
| |
@@ -650,7 +636,7 @@ |
| 650 |
636 |
|
Long zLastModified = pPaths.getGreatestLastModified(); |
| 651 |
637 |
|
if ( (zLastModified != null) && (zLastModified > pOutputLastModified) ) |
| 652 |
638 |
|
{ |
| 653 |
|
- |
System.out.println( this + ": " + pWhat + " newer by " + (zLastModified - pOutputLastModified) + "ms" ); |
| |
639 |
+ |
System.out.println( this + ": " + pWhat + " - " + new NewerBy( pOutputLastModified, zLastModified ) ); |
| 654 |
640 |
|
return true; |
| 655 |
641 |
|
} |
| 656 |
642 |
|
return false; |
| |
@@ -769,12 +755,12 @@ |
| 769 |
755 |
|
if ( zError != 0 ) |
| 770 |
756 |
|
{ |
| 771 |
757 |
|
String zMessage = "Error (" + zError + ") during compilation of project: " + this + |
| 772 |
|
- |
"\nSource: " + pSource.count() + " files\nCompilerArgs: " + pCompileArgs; |
| 773 |
|
- |
if (LOGGER.debug.isEnabled()) |
| |
758 |
+ |
"\nSource: " + pSource.count() + " files\nCompilerArgs: " + pCompileArgs; |
| |
759 |
+ |
if ( LOGGER.debug.isEnabled() ) |
| 774 |
760 |
|
{ |
| 775 |
|
- |
zMessage += "\nClasspath: " + pClasspath + "\nSource: " + pSource.toString(" "); |
| |
761 |
+ |
zMessage += "\nClasspath: " + pClasspath + "\nSource: " + pSource.toString( " " ); |
| 776 |
762 |
|
} |
| 777 |
|
- |
throw new RuntimeException(zMessage); |
| |
763 |
+ |
throw new RuntimeException( zMessage ); |
| 778 |
764 |
|
} |
| 779 |
765 |
|
try |
| 780 |
766 |
|
{ |
View this file contents
View the full history
Commits for