| |
@@ -184,15 +184,15 @@ |
| 184 |
184 |
|
|
| 185 |
185 |
|
protected Project instantiate( Class<? extends Project> pClass, File pProjectDir, String pProjectName, Map<Object, Object> pData ) |
| 186 |
186 |
|
{ |
| 187 |
|
- |
return instantiate( pClass, new Project.Parameters( pProjectName, pProjectDir, pData ) ); |
| |
187 |
+ |
return instantiate( pClass, new ProjectParameters( pProjectName, pProjectDir, pData ) ); |
| 188 |
188 |
|
} |
| 189 |
189 |
|
|
| 190 |
|
- |
protected Project instantiate( Class<? extends Project> pClass, Project.Parameters pParameters ) |
| |
190 |
+ |
protected Project instantiate( Class<? extends Project> pClass, ProjectParameters pParameters ) |
| 191 |
191 |
|
{ |
| 192 |
192 |
|
Throwable zCause; |
| 193 |
193 |
|
try |
| 194 |
194 |
|
{ |
| 195 |
|
- |
Constructor zConstructor = pClass.getConstructor( Project.Parameters.class ); |
| |
195 |
+ |
Constructor zConstructor = pClass.getConstructor( ProjectParameters.class ); |
| 196 |
196 |
|
return (Project) zConstructor.newInstance( pParameters ); |
| 197 |
197 |
|
} |
| 198 |
198 |
|
catch ( NoSuchMethodException e ) |
| |
@@ -546,10 +546,10 @@ |
| 546 |
546 |
|
|
| 547 |
547 |
|
String classesDir = project.path( "$target$/classes/" ); |
| 548 |
548 |
|
new Paths( classesDir, "**/*.class" ).copyTo( jarDir ); |
| 549 |
|
- |
project.getPaths( "resources" ).copyTo( jarDir ); |
| |
549 |
+ |
project.getResources().copyTo( jarDir ); |
| 550 |
550 |
|
|
| 551 |
551 |
|
String jarFile; |
| 552 |
|
- |
if ( project.has( "version" ) ) |
| |
552 |
+ |
if ( project.hasVersion() ) |
| 553 |
553 |
|
{ |
| 554 |
554 |
|
jarFile = project.path( "$target$/$name$-$version$.jar" ); |
| 555 |
555 |
|
} |
| |
@@ -1321,7 +1321,7 @@ |
| 1321 |
1321 |
|
|
| 1322 |
1322 |
|
// JAR with main class first. |
| 1323 |
1323 |
|
String projectJarName; |
| 1324 |
|
- |
if ( project.has( "version" ) ) |
| |
1324 |
+ |
if ( project.hasVersion() ) |
| 1325 |
1325 |
|
{ |
| 1326 |
1326 |
|
projectJarName = project.format( "$name$-$version$.jar" ); |
| 1327 |
1327 |
|
} |
| |
@@ -1437,9 +1437,9 @@ |
| 1437 |
1437 |
|
writer.write( "<head><title>Applet</title></head>\n" ); |
| 1438 |
1438 |
|
writer.write( "<body>\n" ); |
| 1439 |
1439 |
|
writer.write( "<applet code='org.lwjgl.util.applet.AppletLoader' archive='lwjgl_util_applet.jar, lzma.jar' codebase='.' width='640' height='480'>\n" ); |
| 1440 |
|
- |
if ( project.has( "version" ) ) |
| |
1440 |
+ |
if ( project.hasVersion() ) |
| 1441 |
1441 |
|
{ |
| 1442 |
|
- |
writer.write( "<param name='al_version' value='" + project.getInt( "version" ) + "'>\n" ); |
| |
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 |
1445 |
|
writer.write( "<param name='al_main' value='" + project.get( "main" ) + "'>\n" ); |
| |
@@ -1514,7 +1514,7 @@ |
| 1514 |
1514 |
|
String onejarDir = mkdir( project.path( "$target$/onejar/" ) ); |
| 1515 |
1515 |
|
String distDir = project.path( "$target$/dist/" ); |
| 1516 |
1516 |
|
String projectJarName; |
| 1517 |
|
- |
if ( project.has( "version" ) ) |
| |
1517 |
+ |
if ( project.hasVersion() ) |
| 1518 |
1518 |
|
{ |
| 1519 |
1519 |
|
projectJarName = project.format( "$name$-$version$.jar" ); |
| 1520 |
1520 |
|
} |
| |
@@ -1541,7 +1541,7 @@ |
| 1541 |
1541 |
|
unzip( distDir + projectJarName, onejarDir ); |
| 1542 |
1542 |
|
|
| 1543 |
1543 |
|
String onejarFile; |
| 1544 |
|
- |
if ( project.has( "version" ) ) |
| |
1544 |
+ |
if ( project.hasVersion() ) |
| 1545 |
1545 |
|
{ |
| 1546 |
1546 |
|
onejarFile = project.path( "$target$/dist/onejar/$name$-$version$-all.jar" ); |
| 1547 |
1547 |
|
} |
View this file contents
View the full history
Commits for