diff --git a/build.xml b/build.xml
index 38b86e26458cc567a57a0189f33a84632cc6038a..91b6eb007693a83aed317c0b3a8e625e3a17c5f9 100644 (file)
--- a/build.xml
+++ b/build.xml
<mkdir dir="${build}"/>
<mkdir dir="${build}/java"/>
<mkdir dir="${build}/java/classes"/>
+ <mkdir dir="${build}/java/lib"/>
<mkdir dir="${build}"/>
<mkdir dir="${dist}"/>
<!-- Compile from source to build -->
<cc cc="${arch}gcc" cxx="${arch}g++"
- destdir="${build}/obj">
+ destdir="${build}/obj"
+ continueOnError="false">
<fileset dir="${src}">
<!-- THINGS TO EXCLUDE -->
<exclude name="2geom/chebyshev.cpp"/>
<exclude name="removeoverlap/remove_rectangle_overlap-test.cpp"/>
<exclude name="removeoverlap/remove_rectangle_overlap-test.h"/>
</fileset>
+ <excludeinc dir="${src}">
+ <file name="extension/param"/>
+ </excludeinc>
<flags>
- -Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
+ -Wall -Wformat -Werror=format-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch
-O2
-mms-bitfields
</flags>
</target>
- <!--
- ########################################################################
- ## T A R G E T : JAVA
- ########################################################################
- -->
- <target name="java" depends="init"
- description="compile java binding classes">
- <javac srcdir="${src}/bind/java" destdir="${build}/java/classes"/>
- </target>
-
-
<!--
########################################################################
## T A R G E T : L I B
<copy file="${gtk}/bin/libgtk-win32-2.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libgthread-2.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libcairo-2.dll" todir="${dist}"/>
- <copy file="${gtk}/bin/libpoppler-2.dll" todir="${dist}"/>
+ <copy file="${gtk}/bin/libpoppler-3.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpangocairo-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpango-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/libpangoft2-1.0-0.dll" todir="${dist}"/>
<copy file="${gtk}/bin/gspawn-win32-helper.exe" todir="${dist}"/>
<copy file="${gtk}/bin/gspawn-win32-helper-console.exe" todir="${dist}"/>
- <!-- Java -->
- <!--<copy todir="${dist}/share"> <fileset dir="${build}/java"/> </copy>-->
-
<!-- PERL -->
<copy file="${gtk}/perl/bin/perl58.dll" todir="${dist}"/>
<!-- PYTHON -->
<copy file="${gtk}/python/python25.dll" todir="${dist}"/>
<copy file="${gtk}/python/python.exe" todir="${dist}/python"/>
+ <copy file="${gtk}/python/pythonw.exe" todir="${dist}/python"/>
<copy todir="${dist}/python"> <fileset dir="${gtk}/python/Lib"/> </copy>
<copy todir="${dist}/python"> <fileset dir="${gtk}/python/DLLs"/> </copy>
<copy todir="${dist}/python"> <fileset dir="${gtk}/python/Scripts"/> </copy>
</target>
+ <!--
+ ########################################################################
+ ## T A R G E T : JAVAC
+ ########################################################################
+ -->
+ <target name="javac" depends="init"
+ description="compile java binding classes">
+ <javac srcdir="${src}/bind/java" destdir="${build}/java/classes"/>
+ </target>
+
+
+ <!--
+ ########################################################################
+ ## T A R G E T : JAR
+ ########################################################################
+ -->
+ <target name="jar" depends="javac"
+ description="pack java classes and resources into a jar file">
+ <copy todir="${build}/java/classes"> <fileset dir="${gtk}/bind/data"/> </copy>
+ <jar basedir="${build}/java/classes" destfile="${build}/java/lib/inkscape.jar"/>
+ </target>
+
+ <!--
+ ########################################################################
+ ## T A R G E T : BINDDIST
+ ########################################################################
+ -->
+ <target name="binddist" depends="jar"
+ description="pack java classes and resources into a jar file">
+ <copy todir="${dist}/share/bind"> <fileset dir="${gtk}/bind/java"/> </copy>
+ <copy todir="${dist}/share/bind/java"> <fileset dir="${build}/java/lib"/> </copy>
+
+ </target>
+
+ <!--
+ ########################################################################
+ ## T A R G E T : BINDCLEAN
+ ########################################################################
+ -->
+ <target name="bindclean" depends=""
+ description="clean up java binding classes">
+ <delete dir="${build}/java"/>
+ </target>
+
+
<!--
+
<!--
########################################################################
## T A R G E T : C L E A N
########################################################################
-->
- <target name="clean"
+ <target name="clean" depends="bindclean"
description="clean up. deleting build and distro dirs" >
<delete dir="${build}"/>