dev-java/bsh/files/bsh2-build.patch


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
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54

--- BeanShell/build.xml~	2004-01-20 19:12:20.888557245 -0500
+++ BeanShell/build.xml	2004-01-20 19:13:36.150184282 -0500
@@ -103,50 +103,7 @@
 		value="docs/manual/bshcommands-bshdoc.xml"/>
 
 <!-- Begin Targets -->
-
-	<!-- The javacc targets could be smarter... -->
-	<target name="checkjjt">
-		<uptodate property="jjtree.notRequired" 
-				targetfile="${src-dir}/bsh/bsh.jj"
-		>
-			<srcfiles dir="${src-dir}/bsh" includes="bsh.jjt"/>
-		</uptodate>
-	</target>
-	<target name="checkjj">
-		<uptodate property="javacc.notRequired" 
-				targetfile="${src-dir}/bsh/Parser.java"
-		>
-			<srcfiles dir="${src-dir}/bsh" includes="bsh.jj"/>
-		</uptodate>
-	</target>
-
-	<!-- Create bsh.jj when bsh.jjt changes. -->
-	<target name="jjtree" unless="jjtree.notRequired" depends="checkjjt">
-		<java classname="jjtree"
-			fork="yes"
-			failonerror="yes" >
-			<arg 
-				line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jjt"/>
-			<classpath>
-				<fileset refid="lib-fileset"/>
-			</classpath>
-		</java>
-	</target>
-
-	<!-- Create Parser.java when bsh.jj changes. -->
-	<target name="javacc" unless="javacc.notRequired" depends="checkjj">
-		<java classname="javacc"
-			fork="yes"
-			failonerror="yes" >
-			<!-- classpath="${javacc-lib}" -->
-			<arg line="-OUTPUT_DIRECTORY=${src-dir}/bsh ${src-dir}/bsh/bsh.jj"/>
-			<classpath>
-				<fileset refid="lib-fileset"/>
-			</classpath>
-		</java>
-	</target>
-
-	<target name="compile" depends="jjtree,javacc,builddir">
+	<target name="compile" depends="builddir">
 		<!-- exclude the ${excludes} as well as anything under a "bak" dir -->
 		<!--compiler="${build-compiler}"-->
 		<javac srcdir="${src-dir}:${test-src-dir}:${bsf-src-dir}"