rpms/java-flexdock
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b42d01db57
java-flexdock/java-flexdock-0.5.2-build_xml.patch

164 lines
7.5 KiB
Diff
Raw Blame History

--- build.xml 2010-08-18 17:44:16.000000000 +0200
+++ build.xml-gil 2011-02-04 12:14:33.000000000 +0100
@@ -40,6 +40,7 @@
<property name="version" value="0.5.2" />
<property name="dist.jar.basename" value="${ant.project.name}-${version}" />
<property name="dist.demo.jar.basename" value="${ant.project.name}-demo-${version}" />
+ <property name="j2se.api" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
<!-- sourcepaths -->
<path id="sourcepath">
@@ -118,7 +119,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>
@@ -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" includeAntRuntime="no">
<src path="${java.src.core}" />
<!-- the next 3 are interdependent -->
@@ -145,12 +146,10 @@
<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" includeAntRuntime="no"/>
- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4" includeAntRuntime="no"/>
</target>
- <target name="compile.native" depends="compile.dll,compile.unix.lib"
+ <target name="compile.native" depends="compile.unix.lib"
description="Compile the native code for the current platform"/>
<target name="native.init" depends="init">
@@ -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>
@@ -333,8 +335,7 @@
See: http://forum.java.sun.com/thread.jspa?forumID=22&threadID=568620,
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"/>
+ <!-- matches core jar name -->
<attribute name="Main-Class" value="org.flexdock.demos.AllDemos"/>
</manifest>
</jar>
@@ -361,7 +362,7 @@
<packageset dir="${java.src.drag}" />
<packageset dir="${java.src.perspective}" />
<packageset dir="${java.src.view}" />
- <link href="http://java.sun.com/j2se/1.4.2/docs/api/" />
+ <link href="${j2se.api}" />
<!-- add links to the j2se 1.4 docs -->
</javadoc>
</target>
@@ -414,60 +415,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 +502,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 +512,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
Reference in New Issue View Git Blame Copy Permalink