View | Details | Raw Unified | Return to bug 152732
Collapse All | Expand All

(-)files/patch-gluegen_make_build.xml (-3 / +21 lines)
Lines 1-5 Link Here
1
--- gluegen/make/build.xml.orig	2008-05-14 18:54:48.000000000 +1000
1
--- gluegen/make/build.xml.orig	2008-05-14 18:54:48.000000000 -0700
2
+++ gluegen/make/build.xml	2008-06-09 10:41:50.000000000 +1000
2
+++ gluegen/make/build.xml	2010-10-27 03:34:48.000000000 -0700
3
@@ -11,8 +11,8 @@
3
@@ -11,8 +11,8 @@
4
   -->
4
   -->
5
 <project name="GlueGen" basedir="." default="all">
5
 <project name="GlueGen" basedir="." default="all">
Lines 11-22 Link Here
11
 
11
 
12
   <target name="load.user.properties" unless="user.properties.file">
12
   <target name="load.user.properties" unless="user.properties.file">
13
     <!-- Load the user specified properties file that defines various host
13
     <!-- Load the user specified properties file that defines various host
14
@@ -95,7 +95,7 @@
15
     - @param output.dir the directory to write the generated files to.  If
16
     -        the directory does not exist, it will be created.
17
     -->
18
-  <target name="generate.c.grammar">
19
+  <target name="generate.c.grammar" depends="init">
20
     <!-- Generate the Java files -->
21
     <antlr target="${output.dir}/${target}" outputdirectory="${output.dir}">
22
       <classpath refid="antlr.classpath" />
23
@@ -111,7 +111,7 @@
24
     - @param output.dir the directory to write the generated files to.  If
25
     -        the directory does not exist, it will be created.
26
    -->
27
-  <target name="generate.c.grammar.glib">
28
+  <target name="generate.c.grammar.glib" depends="init">
29
     <!-- Generate the Java files -->
30
     <antlr target="${output.dir}/${target}" glib="${output.dir}/${glib}" outputdirectory="${output.dir}">
31
       <classpath refid="antlr.classpath" />
14
@@ -281,7 +281,7 @@
32
@@ -281,7 +281,7 @@
15
       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd" />
33
       <property name="compiler.cfg.id"                      value="compiler.cfg.freebsd" />
16
       <property name="linker.cfg.id"                        value="linker.cfg.linux" />
34
       <property name="linker.cfg.id"                        value="linker.cfg.linux" />
17
       <property name="c.src.dir"                            value="unix" />
35
       <property name="c.src.dir"                            value="unix" />
18
-      <property name="java.includes.dir.freebsd"            value="${java.includes.dir}/freebsd" />
36
-      <property name="java.includes.dir.freebsd"            value="${java.includes.dir}/freebsd" />
19
+      <property name="java.includes.dir.platform"            value="${java.includes.dir}/freebsd" />
37
+      <property name="java.includes.dir.platform"           value="${java.includes.dir}/freebsd" />
20
     </target>
38
     </target>
21
 
39
 
22
     <target name="declare.hpux" if="isHPUX">
40
     <target name="declare.hpux" if="isHPUX">

Return to bug 152732