blob: 4a2f5b168486a02049812902fa47568e15282752 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
diff -urN pig-0.14.0-src.orig/build.xml pig-0.14.0-src/build.xml
--- pig-0.14.0-src.orig/build.xml 2015-10-29 20:30:58.540000000 +0000
+++ pig-0.14.0-src/build.xml 2015-10-29 20:32:08.810000000 +0000
@@ -573,10 +573,10 @@
</path>
<property name="mr-apps-classpath" refid="mr-apps-test.classpath" />
<!-- Remove jython jar from mrapp-generated-classpath -->
- <script language="javascript">
+ <!-- <script language="javascript">
project.setProperty('mr-apps-classpath', project.getProperty('mr-apps-classpath').
replace(":" + project.getProperty('ivy.default.ivy.user.dir') + "/cache/org.python/jython-standalone/jars/jython-standalone-" + project.getProperty('jython.version') + ".jar", ""));
- </script>
+ </script>-->
<echo file="${test.build.classes}/mrapp-generated-classpath" message="${mr-apps-classpath}" />
</target>
@@ -777,12 +777,15 @@
</copy>
</target>
- <scriptdef name="propertyreset" language="javascript"
- description="Allows to assign @{property} new value">
+ <macrodef name="propertyreset">
<attribute name="name"/>
<attribute name="value"/>
- project.setProperty(attributes.get("name"), attributes.get("value"));
- </scriptdef>
+ <sequential>
+ <loadresource property="@{name}">
+ <string value="@{value}"/>
+ </loadresource>
+ </sequential>
+ </macrodef>
<target name="mvn-jar" description="Create pig.jar for maven deploy for Hadoop2/23 and Hadoop1/20">
<propertyreset name="hadoopversion" value="23" />
|
