|
Line 0
Link Here
|
|
|
1 |
--- build.xml.orig 2020-03-13 16:37:05 UTC |
| 2 |
+++ build.xml |
| 3 |
@@ -515,7 +515,7 @@ |
| 4 |
<mkdir dir="${lib.dir}"/> |
| 5 |
|
| 6 |
<!-- compile everything under src/java --> |
| 7 |
- <javac srcdir="${src.dir}/java" destdir="${build.classes}" |
| 8 |
+ <javac srcdir="${src.dir}/java" destdir="${build.classes}" nativeheaderdir="${src.dir}/c" |
| 9 |
deprecation="on" |
| 10 |
debug="on" |
| 11 |
optimize="on" |
| 12 |
@@ -524,6 +524,7 @@ |
| 13 |
target="${javac.target.version}"> |
| 14 |
<classpath refid="project.class.path"/> |
| 15 |
</javac> |
| 16 |
+ <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_*.h" eol="lf" /> |
| 17 |
|
| 18 |
<!-- copy resource files to build directory --> |
| 19 |
<copy todir="${build.classes}" > |
| 20 |
@@ -545,39 +546,6 @@ |
| 21 |
</fileset> |
| 22 |
</copy> |
| 23 |
|
| 24 |
- <!-- Generate the jni header files. This is done here rather than with the |
| 25 |
- c code to make intermediate pre-release distributions possible. --> |
| 26 |
- <javah |
| 27 |
- destdir="${src.dir}/c" |
| 28 |
- classpath="${build.classes}"> |
| 29 |
- <class name="org.tanukisoftware.wrapper.WrapperManager"/> |
| 30 |
- </javah> |
| 31 |
- <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperManager.h" eol="lf" /> |
| 32 |
- <javah |
| 33 |
- destdir="${src.dir}/c" |
| 34 |
- classpath="${build.classes}"> |
| 35 |
- <class name="org.tanukisoftware.wrapper.WrapperProcessInputStream"/> |
| 36 |
- </javah> |
| 37 |
- <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessInputStream.h" eol="lf" /> |
| 38 |
- <javah |
| 39 |
- destdir="${src.dir}/c" |
| 40 |
- classpath="${build.classes}"> |
| 41 |
- <class name="org.tanukisoftware.wrapper.WrapperProcessOutputStream"/> |
| 42 |
- </javah> |
| 43 |
- <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessOutputStream.h" eol="lf" /> |
| 44 |
- <javah |
| 45 |
- destdir="${src.dir}/c" |
| 46 |
- classpath="${build.classes}"> |
| 47 |
- <class name="org.tanukisoftware.wrapper.WrapperProcessConfig"/> |
| 48 |
- </javah> |
| 49 |
- <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessConfig.h" eol="lf" /> |
| 50 |
- <javah |
| 51 |
- destdir="${src.dir}/c" |
| 52 |
- classpath="${build.classes}"> |
| 53 |
- <class name="org.tanukisoftware.wrapper.WrapperResources"/> |
| 54 |
- </javah> |
| 55 |
- <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperResources.h" eol="lf" /> |
| 56 |
- |
| 57 |
<available property="junit.present" |
| 58 |
classname="junit.framework.TestCase"> |
| 59 |
<classpath refid="project.class.path"/> |