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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
Index: libflexdock-java-0.5.1-dfsg1/build.xml
===================================================================
--- libflexdock-java-0.5.1-dfsg1.orig/build.xml 2007-03-09 21:16:08.000000000 +0100
+++ libflexdock-java-0.5.1-dfsg1/build.xml 2009-06-29 19:13:03.000000000 +0200
@@ -118,7 +118,7 @@
<condition property="os.unixWithXlib">
<and>
<os family="unix"/>
- <available file="/usr/X11R6/include/X11/Xlib.h"/>
+ <available file="/usr/include/X11/Xlib.h"/>
</and>
</condition>
</target>
@@ -145,7 +145,7 @@
<src path="${java.src.drag}"/>
<src path="${java.src.perspective}"/>
</javac>
- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4"/>
+ <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" excludes="org/flexdock/demos/raw/jmf//**" debug="true" source="1.4"/>
<javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/>
</target>
@@ -176,10 +176,12 @@
<path id="sdk.include.dirset">
<dirset dir="${sdk.include}"/>
</path>
+ <!--
<pathconvert property="sdk.include.gcc.args.temp"
refid="sdk.include.dirset"
pathsep='" "-I'/>
- <property name="sdk.include.gcc.args" value='"-I${sdk.include.gcc.args.temp}"'/>
+ -->
+ <property name="sdk.include.gcc.args" value='"-I/usr/lib/jvm/java-6-openjdk/include/"'/>
</target>
@@ -291,11 +293,12 @@
<exec executable="gcc" failonerror="true">
<arg value="-lX11"/>
- <arg value="-L/usr/X11R6/lib"/>
- <arg value="-I/usr/X11R6/include"/>
+ <arg value="-L/usr/lib"/>
+ <arg value="-I/usr/include/X11"/>
<arg value="-o"/>
<arg value="${so.dir}/libRubberBand${library.key}.so"/>
<arg value="-shared"/>
+ <arg value="-fPIC"/>
<arg value="${c.dir}/RubberBand.c"/>
<arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs -->
</exec>
@@ -313,7 +316,7 @@
<isset property="generic.jar"/>
</condition>
<property name="jar.suffix" value=""/>
- <property name="jar.excludes" value=""/>
+ <property name="jar.excludes" value="**/*.so"/>
<!-- after this method is called, other targets can use these props -->
@@ -334,7 +337,7 @@
I believe this BUG is the cause: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4490798 -->
<manifest>
<!-- matches core jar name -->
- <attribute name="Class-Path" value="${dist.jar.name} lib/commons-logging-1.1.jar lib/jmf/lib/jmf.jar lib/looks-2.1.1.jar"/>
+ <attribute name="Class-Path" value="${dist.jar.name} commons-logging.jar looks.jar skinlf.jar"/>
<attribute name="Main-Class" value="org.flexdock.demos.AllDemos"/>
</manifest>
</jar>
@@ -557,7 +560,6 @@
<filter token="VERSION" value="${version}"/>
<filter token="DEMO_JAR_NAME" value="${dist.demo.jar.name}"/>
<filter token="FRAMEWORK_JAR_NAME" value="${dist.jar.name}"/>
- <filter token="JMF_JAR_NAME" value="jmf.jar"/>
<filter token="APACHE_LOGGING" value="commons-logging-1.1.jar"/>
<filter token="LOOKS" value="looks-2.1.1.jar"/>
<filter token="SKIN_LF" value="skinlf.jar"/>
@@ -570,9 +572,6 @@
jarname="${build.dir}/${dist.demo.jar.name}"
sjarname="${bin.dir.webstart}/${dist.demo.jar.name}"/>
<mysignjar
- jarname="${build.dir}/lib/jmf/lib/jmf.jar"
- sjarname="${bin.dir.webstart}/jmf.jar"/>
- <mysignjar
jarname="${build.dir}/lib/commons-logging-1.1.jar"
sjarname="${bin.dir.webstart}/commons-logging-1.1.jar"/>
<mysignjar
|
