litesoft

URLs

Explore

Commits

Diff Revisions 289 vs 290 for /trunk/Java/ScarPlus/src/com/esotericsoftware/scar/Scar.java

		@@ -333,7 +333,7 @@
333	333		String[] zLevels = LoggerLevel.LEVELS;
334	334		for ( int i = 0; i < zLevels.length; i++ )
335	335		{
336		-	if ( args.has( zLevels[i] ) )
	336	+	if ( null != args.get( zLevels[i] ) )
337	337		{
338	338		zLevel = i;
339	339		break;
		@@ -438,7 +438,7 @@
438	438		throws IOException
439	439		{
440	440		Util.assertNotNull( "Project", project );
441		-	for ( String dependency : project.getList( "dependencies" ) )
	441	+	for ( String dependency : project.getDependencies() )
442	442		{
443	443		Project dependencyProject = project( project.path( dependency ) );
444	444		String dependencyTarget = dependencyProject.path( "$target$/" );
		@@ -701,7 +701,7 @@
701	701		{
702	702		Util.assertNotNull( "Project", project );
703	703
704		-	for ( String dependency : project.getList( "dependencies" ) )
	704	+	for ( String dependency : project.getDependencies() )
705	705		{
706	706		Project dependencyProject = project( project.path( dependency ) );
707	707		String dependencyTarget = dependencyProject.path( "$target$/" );
		@@ -1667,51 +1667,6 @@
1667	1667		}
1668	1668
1669	1669		/**
1670		-	* Calls {@link #build(Project)} for each dependency project in the specified project.
1671		-	*/
1672		-	public void buildDependencies( Project project )
1673		-	throws IOException
1674		-	{
1675		-	Util.assertNotNull( "Project", project );
1676		-
1677		-	for ( String dependency : project.getList( "dependencies" ) )
1678		-	{
1679		-	Project dependencyProject = project( project.path( dependency ) );
1680		-
1681		-	if ( builtProjects.contains( dependencyProject.get( "name" ) ) )
1682		-	{
1683		-	LOGGER.debug.log( "Dependency project already built: ", dependencyProject );
1684		-	return;
1685		-	}
1686		-
1687		-	String jarFile;
1688		-	if ( dependencyProject.has( "version" ) )
1689		-	{
1690		-	jarFile = dependencyProject.path( "$target$/$name$-$version$.jar" );
1691		-	}
1692		-	else
1693		-	{
1694		-	jarFile = dependencyProject.path( "$target$/$name$.jar" );
1695		-	}
1696		-
1697		-	LOGGER.debug.log( "Building dependency: ", dependencyProject );
1698		-	if ( !executeDocument( dependencyProject ) )
1699		-	{
1700		-	build( dependencyProject );
1701		-	}
1702		-	}
1703		-	}
1704		-
1705		-	/**
1706		-	* Calls {@link #project(String)} and then {@link #build(Project)}.
1707		-	*/
1708		-	public void build( String path )
1709		-	throws IOException
1710		-	{
1711		-	build( project( path ) );
1712		-	}
1713		-
1714		-	/**
1715	1670		* Executes Java code in the specified project's document, if any.
1716	1671		*
1717	1672		* @return true if code was executed.
		@@ -1799,24 +1754,6 @@
1799	1754		scar.initLoggerFactory();
1800	1755
1801	1756		Project project = scar.project( arguments.get( "file", "." ) );
1802		-	scar.build( project );
	1757	+	project.build();
1803	1758		}
1804		-
1805		-	/**
1806		-	* Executes the buildDependencies, clean, compile, jar, and dist utility metshods.
1807		-	*/
1808		-	public void build( Project project )
1809		-	throws IOException
1810		-	{
1811		-	Util.assertNotNull( "Project", project );
1812		-
1813		-	buildDependencies( project );
1814		-	clean( project );
1815		-	compile( project );
1816		-	jar( project );
1817		-	dist( project );
1818		-
1819		-	builtProjects.add( project.get( "name" ) );
1820		-	}
1821		-
1822	1759		}

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/ScarPlus/src/com/esotericsoftware/scar/Scar.java