|
 |
f0be2ee |
--- build.xml 2008-12-10 20:54:53.000000000 +1100
|
|
|
f0be2ee |
+++ build.xml.new 2008-12-10 20:55:13.000000000 +1100
|
|
|
f0be2ee |
@@ -118,7 +118,8 @@
|
|
|
f0be2ee |
<condition property="os.unixWithXlib">
|
|
|
f0be2ee |
<and>
|
|
|
f0be2ee |
<os family="unix"/>
|
|
|
f0be2ee |
- <available file="/usr/X11R6/include/X11/Xlib.h"/>
|
|
|
f0be2ee |
+ <available file="/usr/include/X11/Xlib.h"/>
|
|
|
f0be2ee |
+
|
|
|
f0be2ee |
</and>
|
|
|
f0be2ee |
</condition>
|
|
|
f0be2ee |
</target>
|
|
|
f0be2ee |
@@ -135,7 +136,7 @@
|
|
|
f0be2ee |
</target>
|
|
|
f0be2ee |
|
|
|
f0be2ee |
|
|
|
f0be2ee |
- description="Compile java sources for the framework, demos, and tests">
|
|
|
f0be2ee |
+ description="Compile java sources for the framework, and tests">
|
|
|
f0be2ee |
<javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true" source="1.4">
|
|
|
f0be2ee |
<src path="${java.src.core}" />
|
|
|
f0be2ee |
|
|
|
f0be2ee |
@@ -145,8 +146,6 @@
|
|
|
f0be2ee |
<src path="${java.src.drag}"/>
|
|
|
f0be2ee |
<src path="${java.src.perspective}"/>
|
|
|
f0be2ee |
</javac>
|
|
|
f0be2ee |
- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4"/>
|
|
|
f0be2ee |
- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/>
|
|
|
f0be2ee |
</target>
|
|
|
f0be2ee |
|
|
|
f0be2ee |
|
|
|
f0be2ee |
@@ -291,12 +290,15 @@
|
|
|
f0be2ee |
|
|
|
f0be2ee |
<exec executable="gcc" failonerror="true">
|
|
|
f0be2ee |
<arg value="-lX11"/>
|
|
|
f0be2ee |
- <arg value="-L/usr/X11R6/lib"/>
|
|
|
f0be2ee |
- <arg value="-I/usr/X11R6/include"/>
|
|
|
f0be2ee |
+ <arg value="-L/usr/lib"/>
|
|
|
f0be2ee |
+ <arg value="-I/usr/include/X11"/>
|
|
|
f0be2ee |
+ <arg value="-fPIC"/>
|
|
|
f0be2ee |
+ <arg value="-g"/>
|
|
|
f0be2ee |
<arg value="-o"/>
|
|
|
f0be2ee |
<arg value="${so.dir}/libRubberBand${library.key}.so"/>
|
|
|
f0be2ee |
<arg value="-shared"/>
|
|
|
f0be2ee |
<arg value="${c.dir}/RubberBand.c"/>
|
|
|
f0be2ee |
+ <arg value="-Wl,-soname=libRubberBand-0.so"/>
|
|
|
f0be2ee |
<arg line='${sdk.include.gcc.args}'/>
|
|
|
f0be2ee |
</exec>
|
|
|
f0be2ee |
</target>
|
|
|
f0be2ee |
@@ -414,60 +416,6 @@
|
|
|
f0be2ee |
<java fork="yes" dir="${bin.dir.demo}" classpathref="rt.classpath.demo" />
|
|
|
f0be2ee |
</presetdef>
|
|
|
f0be2ee |
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo" depends="resources,compile" description="Run org.flexdock.demos.AllDemos">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.AllDemos" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.maximizing" depends="resources,compile" description="Run org.flexdock.demos.maximizing.MaximizationDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.perspective.MaximizationDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.perspectives" depends="resources,compile" description="Run org.flexdock.demos.perspective.PerspectivesDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.perspective.PerspectivesDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.xmlperspectives" depends="resources,compile" description="Run org.flexdock.demos.perspective.XMLPerspectivesDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.perspective.XMLPerspectivesDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.adapter" depends="resources,compile" description="Run org.flexdock.demos.raw.adapter.AdapterDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.raw.adapter.AdapterDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.border" depends="resources,compile" description="Run org.flexdock.demos.raw.border.BorderDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.raw.border.BorderDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.compound" depends="resources,compile" description="Run org.flexdock.demos.raw.CompoundDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.raw.CompoundDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.elegant" depends="resources,compile" description="Run org.flexdock.demos.raw.elegant.ElegantDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.raw.elegant.ElegantDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.jmf" depends="resources,compile" description="Run org.flexdock.demos.raw.jmf.JMFDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.raw.jmf.JMFDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.simple" depends="resources,compile" description="Run org.flexdock.demos.raw.SimpleDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.raw.SimpleDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.splitpane" depends="resources,compile" description="Run org.flexdock.demos.raw.SplitPaneDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.raw.SplitPaneDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.tabbedpane" depends="resources,compile" description="Run org.flexdock.demos.raw.TabbedPaneDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.raw.TabbedPaneDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- <target name="demo.view" depends="resources,compile" description="Run org.flexdock.demos.view.ViewDemo">
|
|
|
f0be2ee |
- <java.demo classname="org.flexdock.demos.view.ViewDemo" />
|
|
|
f0be2ee |
- </target>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
|
|
|
f0be2ee |
|
|
|
f0be2ee |
<presetdef name="java.test">
|
|
|
f0be2ee |
@@ -555,9 +503,7 @@
|
|
|
f0be2ee |
<fileset dir="${webstart.src}"/>
|
|
|
f0be2ee |
<filterset begintoken="@" endtoken="@">
|
|
|
f0be2ee |
<filter token="VERSION" value="${version}"/>
|
|
|
f0be2ee |
- <filter token="DEMO_JAR_NAME" value="${dist.demo.jar.name}"/>
|
|
|
f0be2ee |
<filter token="FRAMEWORK_JAR_NAME" value="${dist.jar.name}"/>
|
|
|
f0be2ee |
- <filter token="JMF_JAR_NAME" value="jmf.jar"/>
|
|
|
f0be2ee |
<filter token="APACHE_LOGGING" value="commons-logging-1.1.jar"/>
|
|
|
f0be2ee |
<filter token="LOOKS" value="looks-2.1.1.jar"/>
|
|
|
f0be2ee |
<filter token="SKIN_LF" value="skinlf.jar"/>
|
|
|
f0be2ee |
@@ -567,12 +513,6 @@
|
|
|
f0be2ee |
jarname="${build.dir}/${dist.jar.name}"
|
|
|
f0be2ee |
sjarname="${bin.dir.webstart}/${dist.jar.name}"/>
|
|
|
f0be2ee |
|
|
|
f0be2ee |
- jarname="${build.dir}/${dist.demo.jar.name}"
|
|
|
f0be2ee |
- sjarname="${bin.dir.webstart}/${dist.demo.jar.name}"/>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
- jarname="${build.dir}/lib/jmf/lib/jmf.jar"
|
|
|
f0be2ee |
- sjarname="${bin.dir.webstart}/jmf.jar"/>
|
|
|
f0be2ee |
-
|
|
|
f0be2ee |
jarname="${build.dir}/lib/commons-logging-1.1.jar"
|
|
|
f0be2ee |
sjarname="${bin.dir.webstart}/commons-logging-1.1.jar"/>
|
|
|
f0be2ee |
|