Reorganized generic folder

Improved build file
jonbo372 · Jul 8, 2011 · 6b4b2f3 · 6b4b2f3
1 parent db29e1d
commit 6b4b2f3
Show file tree

Hide file tree

Showing 14 changed files with 1,031 additions and 78 deletions.
diff --git a/incubator/org.restlet.js/generic/build.xml b/incubator/org.restlet.js/generic/build.xml
@@ -1,18 +1,28 @@
 <project name="RestletJS" basedir=".">
 
-	<property name="browser.dir" value="." />
-	<property name="nodejs.client.dir" value="." />
+	<property name="browser.dir" value="../browser" />
+	<property name="nodejs.client.dir" value="../nodejs/client" />
 	<property name="target.browser.client.dir" value="${basedir}/target/browser" />
 	<property name="target.nodejs.client.dir" value="${basedir}/target/node.js/client" />
 
 	<path id="forge-path">
-		<fileset dir="${basedir}/forge" includes="**/*.jar" />
+		<fileset dir="${basedir}/lib/forge" includes="**/*.jar" />
 	</path>
 
-	<target name="generate-nodejs-client" description="Generate the client sources for node.js.">
+	<path id="jsmin-path">
+		<fileset dir="${basedir}/lib/jsmin" includes="**/*.jar" />
+	</path>
+
+	<taskdef name="jsmin"
+	        classname="net.matthaynes.jsmin.JSMin_Task"
+			classpathref="jsmin-path"/>
+
+	<target name="generate-nodejs-client"
+			description="Generate the client source for node.js.">
+		<delete dir="${target.nodejs.client.dir}"/>
 		<mkdir dir="${target.nodejs.client.dir}"/>
 		<copy todir="${target.nodejs.client.dir}" overwrite="true" includeEmptyDirs="false">
-			<fileset dir="${basedir}/" excludes="forge/**">
+			<fileset dir="${basedir}" excludes="forge/**,target/**">
 				<custom classname="selector.EditionFileSelector" classpathref="forge-path">
 					<param name="edition" value="nodejs"/>
 				</custom>
@@ -23,13 +33,27 @@
 					<param name="edition" value="nodejs" />
 				</filterreader>
 			</filterchain>
-	      </copy>
+	    </copy>
+		<jsmin suffix="true" destdir="${target.nodejs.client.dir}">
+		       <fileset dir="${target.nodejs.client.dir}" includes="**/*.js"/>
+		</jsmin>
+	</target>
+
+	<target name="install-nodejs-client" depends="generate-nodejs-client"
+			description="Install the generated client source for node.js">
+		<copy todir="${nodejs.client.dir}" overwrite="true" includeEmptyDirs="false">
+			<fileset dir="${target.nodejs.client.dir}">
+	        	<include name="**/*.js" />
+			</fileset>
+		</copy>
 	</target>
 
-	<target name="generate-browser" description="Generate the client sources for browser.">
+	<target name="generate-browser-client"
+			description="Generate the client source for browser.">
+		<delete dir="${target.browser.client.dir}"/>
 		<mkdir dir="${target.browser.client.dir}"/>
 		<copy todir="${target.browser.client.dir}" overwrite="true" includeEmptyDirs="false">
-			<fileset dir="${basedir}/" excludes="forge/**">
+			<fileset dir="${basedir}" excludes="forge/**">
 				<custom classname="selector.EditionFileSelector" classpathref="forge-path">
 					<param name="edition" value="browser"/>
 				</custom>
@@ -40,6 +64,19 @@
 					<param name="edition" value="browser" />
 				</filterreader>
 			</filterchain>
-	      </copy>
+	    </copy>
+		<jsmin suffix="true" destdir="${target.browser.client.dir}">
+		       <fileset dir="${target.browser.client.dir}" includes="**/*.js"/>
+		</jsmin>
+	</target>
+
+	<target name="install-browser-client" depends="generate-browser-client"
+			description="Install the generated client source for browser">
+		<copy todir="${browser.dir}" overwrite="true" includeEmptyDirs="false">
+			<fileset dir="${target.browser.client.dir}">
+	        	<include name="**/*.js" />
+			</fileset>
+		</copy>
 	</target>
+
 </project>
diff --git a/...rg.restlet.js/generic/forge/asm-3.3.1.jar → ...estlet.js/generic/lib/forge/asm-3.3.1.jar b/...rg.restlet.js/generic/forge/asm-3.3.1.jar → ...estlet.js/generic/lib/forge/asm-3.3.1.jar
diff --git a/...t.js/generic/forge/asm-analysis-3.3.1.jar → .../generic/lib/forge/asm-analysis-3.3.1.jar b/...t.js/generic/forge/asm-analysis-3.3.1.jar → .../generic/lib/forge/asm-analysis-3.3.1.jar
diff --git a/...et.js/generic/forge/asm-commons-3.3.1.jar → ...s/generic/lib/forge/asm-commons-3.3.1.jar b/...et.js/generic/forge/asm-commons-3.3.1.jar → ...s/generic/lib/forge/asm-commons-3.3.1.jar
diff --git a/...stlet.js/generic/forge/asm-tree-3.3.1.jar → ...t.js/generic/lib/forge/asm-tree-3.3.1.jar b/...stlet.js/generic/forge/asm-tree-3.3.1.jar → ...t.js/generic/lib/forge/asm-tree-3.3.1.jar
diff --git a/...stlet.js/generic/forge/asm-util-3.3.1.jar → ...t.js/generic/lib/forge/asm-util-3.3.1.jar b/...stlet.js/generic/forge/asm-util-3.3.1.jar → ...t.js/generic/lib/forge/asm-util-3.3.1.jar
diff --git a/...estlet.js/generic/forge/asm-xml-3.3.1.jar → ...et.js/generic/lib/forge/asm-xml-3.3.1.jar b/...estlet.js/generic/forge/asm-xml-3.3.1.jar → ...et.js/generic/lib/forge/asm-xml-3.3.1.jar
diff --git a/...tor/org.restlet.js/generic/forge/fmpp.jar → ...org.restlet.js/generic/lib/forge/fmpp.jar b/...tor/org.restlet.js/generic/forge/fmpp.jar → ...org.restlet.js/generic/lib/forge/fmpp.jar
diff --git a/...or/org.restlet.js/generic/forge/forge.jar → ...rg.restlet.js/generic/lib/forge/forge.jar b/...or/org.restlet.js/generic/forge/forge.jar → ...rg.restlet.js/generic/lib/forge/forge.jar
diff --git a/...let.js/generic/forge/javax.activation.jar → ...js/generic/lib/forge/javax.activation.jar b/...let.js/generic/forge/javax.activation.jar → ...js/generic/lib/forge/javax.activation.jar
diff --git a/...g.restlet.js/generic/forge/javax.mail.jar → ...stlet.js/generic/lib/forge/javax.mail.jar b/...g.restlet.js/generic/forge/javax.mail.jar → ...stlet.js/generic/lib/forge/javax.mail.jar
diff --git a/incubator/org.restlet.js/generic/lib/jsmin/jsmin.0.2.4.jar b/incubator/org.restlet.js/generic/lib/jsmin/jsmin.0.2.4.jar
diff --git a/incubator/org.restlet.js/generic/lib/jsmin/readme.txt b/incubator/org.restlet.js/generic/lib/jsmin/readme.txt
@@ -0,0 +1 @@
+http://code.google.com/p/jsmin-ant-task/