| |
@@ -394,7 +394,7 @@ |
| 394 |
394 |
|
// parent = parent.getParentFile(); |
| 395 |
395 |
|
// } |
| 396 |
396 |
|
// |
| 397 |
|
- |
// for ( String include : actualProject.getList( "include" ) ) |
| |
397 |
+ |
// for ( String include : actualProject.getInclude() ) |
| 398 |
398 |
|
// { |
| 399 |
399 |
|
// try |
| 400 |
400 |
|
// { |
| |
@@ -426,7 +426,7 @@ |
| 426 |
426 |
|
throws IOException |
| 427 |
427 |
|
{ |
| 428 |
428 |
|
Util.assertNotNull( "Project", project ); |
| 429 |
|
- |
Paths classpath = project.getPaths( "classpath" ); |
| |
429 |
+ |
Paths classpath = project.getClasspath(); |
| 430 |
430 |
|
classpath.add( dependencyClasspaths( project, classpath, true, errorIfDependenciesNotBuilt ) ); |
| 431 |
431 |
|
return classpath; |
| 432 |
432 |
|
} |
| |
@@ -468,7 +468,7 @@ |
| 468 |
468 |
|
{ |
| 469 |
469 |
|
Util.assertNotNull( "Project", project ); |
| 470 |
470 |
|
Paths classpath = classpath( project, true ); |
| 471 |
|
- |
Paths source = project.getPaths( "source" ); |
| |
471 |
+ |
Paths source = project.getSource(); |
| 472 |
472 |
|
|
| 473 |
473 |
|
String classesDir = mkdir( project.path( "$target$/classes/" ) ); |
| 474 |
474 |
|
|
| |
@@ -565,10 +565,10 @@ |
| 565 |
565 |
|
mkdir( manifestFile.getParent() ); |
| 566 |
566 |
|
Manifest manifest = new Manifest(); |
| 567 |
567 |
|
manifest.getMainAttributes().putValue( Attributes.Name.MANIFEST_VERSION.toString(), "1.0" ); |
| 568 |
|
- |
if ( project.has( "main" ) ) |
| |
568 |
+ |
if ( project.hasMain() ) |
| 569 |
569 |
|
{ |
| 570 |
|
- |
LOGGER.debug.log( "Main class: ", project.get( "main" ) ); |
| 571 |
|
- |
manifest.getMainAttributes().putValue( Attributes.Name.MAIN_CLASS.toString(), project.get( "main" ) ); |
| |
570 |
+ |
LOGGER.debug.log( "Main class: ", project.getMain() ); |
| |
571 |
+ |
manifest.getMainAttributes().putValue( Attributes.Name.MAIN_CLASS.toString(), project.getMain() ); |
| 572 |
572 |
|
StringBuilder buffer = new StringBuilder( 512 ); |
| 573 |
573 |
|
buffer.append( fileName( jarFile ) ); |
| 574 |
574 |
|
buffer.append( " ." ); |
| |
@@ -689,7 +689,7 @@ |
| 689 |
689 |
|
|
| 690 |
690 |
|
String distDir = mkdir( project.path( "$target$/dist/" ) ); |
| 691 |
691 |
|
classpath( project, true ).copyTo( distDir ); |
| 692 |
|
- |
Paths distPaths = project.getPaths( "dist" ); |
| |
692 |
+ |
Paths distPaths = project.getDist(); |
| 693 |
693 |
|
dependencyDistPaths( project, distPaths ); |
| 694 |
694 |
|
distPaths.copyTo( distDir ); |
| 695 |
695 |
|
new Paths( project.path( "$target$" ), "*.jar" ).copyTo( distDir ); |
| |
@@ -1281,7 +1281,7 @@ |
| 1281 |
1281 |
|
LOGGER.info.log( "JNLP: ", project ); |
| 1282 |
1282 |
|
} |
| 1283 |
1283 |
|
|
| 1284 |
|
- |
if ( !project.has( "main" ) ) |
| |
1284 |
+ |
if ( !project.hasMain() ) |
| 1285 |
1285 |
|
{ |
| 1286 |
1286 |
|
throw new RuntimeException( "Unable to generate JNLP: project has no main class" ); |
| 1287 |
1287 |
|
} |
| |
@@ -1370,7 +1370,7 @@ |
| 1370 |
1370 |
|
writer.write( "\t<nativelib href='" + path + nativePaths.getNames().get( 0 ) + "'/>\n" ); |
| 1371 |
1371 |
|
writer.write( "</resources>\n" ); |
| 1372 |
1372 |
|
} |
| 1373 |
|
- |
writer.write( "<application-desc main-class='" + project.get( "main" ) + "'/>\n" ); |
| |
1373 |
+ |
writer.write( "<application-desc main-class='" + project.getMain() + "'/>\n" ); |
| 1374 |
1374 |
|
writer.write( "</jnlp>" ); |
| 1375 |
1375 |
|
} |
| 1376 |
1376 |
|
finally |
| |
@@ -1424,7 +1424,7 @@ |
| 1424 |
1424 |
|
{ |
| 1425 |
1425 |
|
return appletDir; |
| 1426 |
1426 |
|
} |
| 1427 |
|
- |
if ( !project.has( "main" ) ) |
| |
1427 |
+ |
if ( !project.hasMain() ) |
| 1428 |
1428 |
|
{ |
| 1429 |
1429 |
|
LOGGER.debug.log( "Unable to generate applet.html: project has no main class" ); |
| 1430 |
1430 |
|
return appletDir; |
| |
@@ -1442,7 +1442,7 @@ |
| 1442 |
1442 |
|
writer.write( "<param name='al_version' value='" + project.getVersion() + "'>\n" ); |
| 1443 |
1443 |
|
} |
| 1444 |
1444 |
|
writer.write( "<param name='al_title' value='" + project + "'>\n" ); |
| 1445 |
|
- |
writer.write( "<param name='al_main' value='" + project.get( "main" ) + "'>\n" ); |
| |
1445 |
+ |
writer.write( "<param name='al_main' value='" + project.getMain() + "'>\n" ); |
| 1446 |
1446 |
|
writer.write( "<param name='al_jars' value='" ); |
| 1447 |
1447 |
|
int i = 0; |
| 1448 |
1448 |
|
for ( String name : new Paths( appletDir, "*.jar.pack.lzma" ).getNames() ) |
View this file contents
View the full history
Commits for