litesoft

URLs

Explore

Commits

Diff Revisions 357 vs 358 for /trunk/Java/ScarPlus/src/com/esotericsoftware/scar/Project.java

		@@ -39,8 +39,15 @@
39	39		return "1.6";
40	40		}
41	41
42		-	public void GWTcompile()
	42	+	public boolean GWTcompile()
43	43		{
	44	+	String zGWT = getGWT();
	45	+	if ( zGWT == null )
	46	+	{
	47	+	return false;
	48	+	}
	49	+	progress( "GWT Compile: " + this );
	50	+
44	51		// todo: GWT Compile
45	52		//
46	53		// http://stackoverflow.com/questions/502494/execute-a-java-program-from-our-java-program
		@@ -68,9 +75,20 @@
68	75		// </java>
69	76		// </target>
70	77		//
	78	+	return false;
71	79		}
72	80
73		-	// todo: WAR
	81	+	public boolean war()
	82	+	{
	83	+	// String zWar = getWar();
	84	+	// if ( zWar == null )
	85	+	// {
	86	+	// return false;
	87	+	// }
	88	+	// progress( "WAR: " + this );
	89	+	// todo: WAR
	90	+	return false;
	91	+	}
74	92
75	93		/**
76	94		* Assert that this project is currently a 'Versioned' GWT project, and then rev the version number by 1
		@@ -249,7 +267,10 @@
249	267		return true;
250	268		}
251	269		long zJarTimestamp = zJarFile.lastModified();
252		-	return (mProjectFileLastModified > zJarTimestamp) \|\| checkNewer( zJarTimestamp, compileClasspath() ) \|\| checkNewer( zJarTimestamp, getSource() ) \|\| checkNewer( zJarTimestamp, getResources() );
	270	+	return (mProjectFileLastModified > zJarTimestamp) \|\| //
	271	+	checkNewer( zJarTimestamp, compileClasspath() ) \|\| //
	272	+	checkNewer( zJarTimestamp, getSource() ) \|\| //
	273	+	checkNewer( zJarTimestamp, getResources() );
253	274		}
254	275
255	276		protected boolean checkNewer( long pJarTimestamp, Paths pPaths )
		@@ -268,10 +289,11 @@
268	289
269	290		protected boolean packageIt()
270	291		{
271		-	// todo: GWT Compile
272		-	// todo: WAR
273		-	String zDistDir = dist();
274		-	return (null != oneJAR()) \|\| (zDistDir != null);
	292	+	boolean zPackaged = GWTcompile();
	293	+	zPackaged \|= (null != dist());
	294	+	zPackaged \|= (null != oneJAR());
	295	+	zPackaged \|= war();
	296	+	return zPackaged;
275	297		}
276	298
277	299		/**

View View this file contents

History View the full history

Feeds

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