commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbe...@apache.org
Subject svn commit: r1037484 - /commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml
Date Sun, 21 Nov 2010 15:45:23 GMT
Author: jbeard
Date: Sun Nov 21 15:45:23 2010
New Revision: 1037484

URL: http://svn.apache.org/viewvc?rev=1037484&view=rev
Log:
Intermediate commit. Correct mdoule paths are now passed to generated requirejs modules.

Modified:
    commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml?rev=1037484&r1=1037483&r2=1037484&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml Sun Nov 21 15:45:23 2010
@@ -610,7 +610,7 @@
 
 						<path id="@{built-dep-list}-path" location="@{built-dep-list}"/>
 
-						<pathconvert property="@{built-dep-list}-@{language-frontend}-path" refid="@{built-dep-list}-path">
+						<pathconvert property="@{built-dep-list}-@{language-frontend}-prop" refid="@{built-dep-list}-path">
 							<mapper>
 								<chainedmapper>
 									<flattenmapper/>
@@ -620,9 +620,20 @@
 							</mapper>
 						</pathconvert>
 
+						<path id="@{built-dep-list}-@{language-frontend}-path" location="${@{built-dep-list}-@{language-frontend}-prop}"/>
+
+						<pathconvert property="@{built-dep-list}-@{language-frontend}-require-js-module-basename"
refid="@{built-dep-list}-@{language-frontend}-path">
+							<mapper>
+								<chainedmapper>
+									<flattenmapper/>
+									<globmapper from="*.js" to="*"/>
+								</chainedmapper>
+							</mapper>
+						</pathconvert>
+
 						<xslt 
 							in="@{built-dep-list}"
-							out="${build-language-frontend-modules}/@{language-frontend}/${@{built-dep-list}-@{language-frontend}-path}"
+							out="${build-language-frontend-modules}/@{language-frontend}/${@{built-dep-list}-@{language-frontend}-prop}"
 							classpathref="maven.plugin.classpath" 
 							style="${src}/xslt/util/language-frontend-module-generators/@{language-frontend}${xslt-language-frontend-generator-basename}"
 							destdir="${build-language-frontend-modules}/@{language-frontend}"
@@ -630,7 +641,7 @@
 							useImplicitFileset="false"
 							force="true">
 
-							<param name="module-path" expression="target/language-frontend-modules/@{language-frontend}/${@{built-dep-list}-@{language-frontend}-path}"/>
+							<param name="module-path" expression="target/language-frontend-modules/@{language-frontend}/${@{built-dep-list}-@{language-frontend}-require-js-module-basename}"/>
 						</xslt>
 					</sequential>
 				</for>



Mime
View raw message