add apache commons-collections into ejp's weaver so pointcutargs will…

… work in Eclipse
OpenUniversity · Mar 13, 2015 · 5a1800e · 5a1800e
1 parent 575e57b
commit 5a1800e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/build.xml b/build.xml
@@ -94,6 +94,19 @@
                         </manifest>
                 </jar>
 
+                <if>
+                        <isset property="deps"/>
+                        <then>
+                                <for list="${deps}" param="dep">
+                                        <sequential>
+                                                <jar destfile="dist/awesome_weaver.jar" update="yes">
+						         <zipfileset src="@{dep}"/>
+                                                </jar>
+                                        </sequential>
+                                </for>
+                        </then>
+                </if>
+
                 <copy file="dist/awesome_weaver.jar" tofile="dist/org.aspectj.weaver_1.7.3.20130613144500-a.jar"/>
 	</target>
 

diff --git a/ejp_compile.scrpt b/ejp_compile.scrpt
@@ -1,4 +1,4 @@
 ant clean
 ant tools -Ddeps=libs/strategoxt.jar -Dfrontends=ejpf/target/ejpf-1.0-SNAPSHOT.jar
-ant weaver -Dmechanisms=ejpm/target/ejpm-1.0-SNAPSHOT.jar,aspectjm/target/aspectjm-1.0-SNAPSHOT.jar
+ant weaver -Dmechanisms=ejpm/target/ejpm-1.0-SNAPSHOT.jar,aspectjm/target/aspectjm-1.0-SNAPSHOT.jar -Ddeps=libs/commons-collections-3.2.1.jar
 ant runtime -Dmechanisms=ejpm/target/ejpm-1.0-SNAPSHOT.jar