diff --git a/build.xml b/build.xml
index 9d59f85113c1ae67ea2b638d655975595bd20167..486a43d865a5cca29d5157483c4bcab643834209 100644 (file)
--- a/build.xml
+++ b/build.xml
</description>
<!-- set global properties for this build -->
+ <property environment="env"/>
<property name="version" value="0.46+devel"/>
<property name="src" location="src"/>
<property name="lib" location="lib"/>
query="both" property="gtkmm" prefix="${gtk}"/>
-->
+ <mkdir dir="${build}"/>
+ <mkdir dir="${build}/java"/>
+ <mkdir dir="${build}/java/classes"/>
+ <mkdir dir="${build}/java/lib"/>
+
<mkdir dir="${build}"/>
<mkdir dir="${dist}"/>
<copy file="${src}/helper/sp-marshal.h.mingw"
<copy file="${src}/helper/sp-marshal.cpp.mingw"
tofile="${src}/helper/sp-marshal.cpp"/>
<makefile file="inkscape_version.h">
- #define INKSCAPE_VERSION "${version}+devel"
+ #define INKSCAPE_VERSION "${version}"
</makefile>
<makefile file="config.h">
#ifndef _CONFIG_H_
-I${gtk}/include/libwpg-0.1
-I${gtk}/include/libwpd-0.8
<!-- PERL -->
- -Wno-comment -I${gtk}/perl/lib/CORE
+ <!-- -Wno-comment -I${gtk}/perl/lib/CORE -->
<!-- PYTHON -->
-I${gtk}/python/include
+ <!-- JAVA -->
+ -I${src}/bind/javainc -I${src}/bind/javainc/win32
</includes>
</cc>
</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
########################################################################
-->
+ <!-- set depends to "compile,java" if you want to test that -->
<target name="lib" depends="compile"
description="create a static library">
<staticlib command="${archutil}ar crsv"
## T A R G E T : D I S T
########################################################################
-->
- <target name="dist" depends="link,linkinkview,i18n"
+ <target name="dist" depends="link,i18n"
description="generate the distribution directory with all needed files">
<!-- Create the distribution directory -->
<copy file="${gtk}/bin/gspawn-win32-helper.exe" todir="${dist}"/>
<copy file="${gtk}/bin/gspawn-win32-helper-console.exe" todir="${dist}"/>
+ <!-- Java - copying this dir is ok even if you dont use it -->
+ <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>
## T A R G E T : D I S T - A L L
########################################################################
-->
- <target name="dist-all" depends="dist,linkinkview"
+ <target name="dist-all" depends="dist"
description="generate the distribution, along with inkview" >
<copy file="${build}/inkview.exe" todir="${dist}"/>