--- build.xml 2008-12-10 20:54:53.000000000 +1100 +++ build.xml.new 2008-12-10 20:55:13.000000000 +1100 @@ -118,7 +118,8 @@ <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> @@ -135,7 +136,7 @@ </target> <target name="compile" depends="init, resources" - description="Compile java sources for the framework, demos, and tests"> + description="Compile java sources for the framework, and tests"> <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true" source="1.4"> <src path="${java.src.core}" /> <!-- the next 3 are interdependent --> @@ -145,8 +146,6 @@ <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.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/> </target> @@ -291,12 +290,15 @@ <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="-fPIC"/> + <arg value="-g"/> <arg value="-o"/> <arg value="${so.dir}/libRubberBand${library.key}.so"/> <arg value="-shared"/> <arg value="${c.dir}/RubberBand.c"/> + <arg value="-Wl,-soname=libRubberBand-0.so"/> <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs --> </exec> </target> @@ -414,60 +416,6 @@ <java fork="yes" dir="${bin.dir.demo}" classpathref="rt.classpath.demo" /> </presetdef> - <!-- Targets to run demos --> - - <target name="demo" depends="resources,compile" description="Run org.flexdock.demos.AllDemos"> - <java.demo classname="org.flexdock.demos.AllDemos" /> - </target> - - <target name="demo.maximizing" depends="resources,compile" description="Run org.flexdock.demos.maximizing.MaximizationDemo"> - <java.demo classname="org.flexdock.demos.perspective.MaximizationDemo" /> - </target> - - <target name="demo.perspectives" depends="resources,compile" description="Run org.flexdock.demos.perspective.PerspectivesDemo"> - <java.demo classname="org.flexdock.demos.perspective.PerspectivesDemo" /> - </target> - - <target name="demo.xmlperspectives" depends="resources,compile" description="Run org.flexdock.demos.perspective.XMLPerspectivesDemo"> - <java.demo classname="org.flexdock.demos.perspective.XMLPerspectivesDemo" /> - </target> - - <target name="demo.adapter" depends="resources,compile" description="Run org.flexdock.demos.raw.adapter.AdapterDemo"> - <java.demo classname="org.flexdock.demos.raw.adapter.AdapterDemo" /> - </target> - - <target name="demo.border" depends="resources,compile" description="Run org.flexdock.demos.raw.border.BorderDemo"> - <java.demo classname="org.flexdock.demos.raw.border.BorderDemo" /> - </target> - - <target name="demo.compound" depends="resources,compile" description="Run org.flexdock.demos.raw.CompoundDemo"> - <java.demo classname="org.flexdock.demos.raw.CompoundDemo" /> - </target> - - <target name="demo.elegant" depends="resources,compile" description="Run org.flexdock.demos.raw.elegant.ElegantDemo"> - <java.demo classname="org.flexdock.demos.raw.elegant.ElegantDemo" /> - </target> - - <target name="demo.jmf" depends="resources,compile" description="Run org.flexdock.demos.raw.jmf.JMFDemo"> - <java.demo classname="org.flexdock.demos.raw.jmf.JMFDemo" /> - </target> - - <target name="demo.simple" depends="resources,compile" description="Run org.flexdock.demos.raw.SimpleDemo"> - <java.demo classname="org.flexdock.demos.raw.SimpleDemo" /> - </target> - - <target name="demo.splitpane" depends="resources,compile" description="Run org.flexdock.demos.raw.SplitPaneDemo"> - <java.demo classname="org.flexdock.demos.raw.SplitPaneDemo" /> - </target> - - <target name="demo.tabbedpane" depends="resources,compile" description="Run org.flexdock.demos.raw.TabbedPaneDemo"> - <java.demo classname="org.flexdock.demos.raw.TabbedPaneDemo" /> - </target> - - <target name="demo.view" depends="resources,compile" description="Run org.flexdock.demos.view.ViewDemo"> - <java.demo classname="org.flexdock.demos.view.ViewDemo" /> - </target> - <!-- define a java task preset to run tests forked from the test bin dir with the right stuff in the classpath --> <presetdef name="java.test"> @@ -555,9 +503,7 @@ <fileset dir="${webstart.src}"/> <filterset begintoken="@" endtoken="@"> <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"/> @@ -567,12 +513,6 @@ jarname="${build.dir}/${dist.jar.name}" sjarname="${bin.dir.webstart}/${dist.jar.name}"/> <mysignjar - 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