Menu
▾
▴
[Barcode4j-cvs] barcode4j build.xml, 1.27, 1.28 ikvm-excludes.txt, 1.1, 1.2 build.properties, 1.11, 1.12
|
From: Jeremias M. <jm...@us...> - 2010-10-05 08:51:27
|
Update of /cvsroot/barcode4j/barcode4j In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2663 Modified Files: build.xml ikvm-excludes.txt build.properties Log Message: Removed Ivy again (require manual download of FOP) Removed Java 1.3 compatibility. Updated to latest IKVM version. Index: build.xml =================================================================== RCS file: /cvsroot/barcode4j/barcode4j/build.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** build.xml 13 Mar 2009 09:07:08 -0000 1.27 --- build.xml 5 Oct 2010 08:51:18 -0000 1.28 *************** *** 1,5 **** <?xml version="1.0"?> ! <project default="all" basedir="." ! xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> <property file="build.properties"/> <property file="build-local.properties"/> --- 1,4 ---- <?xml version="1.0"?> ! <project default="all" basedir="."> <property file="build.properties"/> <property file="build-local.properties"/> *************** *** 11,24 **** <property name="impl.vendor" value="The Barcode4J Project"/> <property name="impl.url" value="http://barcode4j.sourceforge.net"/> ! <property name="year" value="2000-2009"/> <property name="build.compiler" value="classic"/> - <!--property name="debug" value="on"/> - <property name="optimize" value="off"/> - <property name="deprecation" value="on"/--> - <property name="javac.source" value="1.3"/> - <property name="javac.target" value="1.3"/> <property name="src.dir" value="${basedir}/src"/> <property name="src.java.dir" value="${src.dir}/java"/> - <property name="src.java14.dir" value="${src.dir}/java-1.4"/> <property name="src.test.java.dir" value="${src.dir}/test/java"/> <property name="src.conf.dir" value="${src.dir}/conf"/> --- 10,17 ---- <property name="impl.vendor" value="The Barcode4J Project"/> <property name="impl.url" value="http://barcode4j.sourceforge.net"/> ! <property name="year" value="2000-2010"/> <property name="build.compiler" value="classic"/> <property name="src.dir" value="${basedir}/src"/> <property name="src.java.dir" value="${src.dir}/java"/> <property name="src.test.java.dir" value="${src.dir}/test/java"/> <property name="src.conf.dir" value="${src.dir}/conf"/> *************** *** 38,41 **** --- 31,35 ---- <property name="build.dest.fop-0.20.5" value="${build.dir}/fop-0.20.5/classes"/> <property name="build.dest.fop-trunk" value="${build.dir}/fop-trunk/classes"/> + <property name="build.dotnet.dir" value="${build.dir}/dotnet"/> <property name="xalan.dir" value="${src.dir}/xalan"/> <property name="saxon6.dir" value="${src.dir}/saxon"/> *************** *** 48,59 **** <property name="ikvmc" value="${ikvm.dir}/bin/ikvmc.exe"/> ! <property name="ivy.install.version" value="1.4.1" /> ! <condition property="ivy.home" value="${env.IVY_HOME}"> ! <isset property="env.IVY_HOME" /> ! </condition> ! <property name="ivy.home" value="${user.home}/.ivy" /> ! <property name="ivy.jar.dir" value="${ivy.home}/jars" /> ! <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" /> ! <!-- jars --> <path id="project.classpath"> --- 42,50 ---- <property name="ikvmc" value="${ikvm.dir}/bin/ikvmc.exe"/> ! <presetdef name="javac"> ! <javac debug="${debug}" deprecation="${deprecation}" optimize="${optimize}" ! source="${javac.source}" target="${javac.target}" encoding="${encoding}"/> ! </presetdef> ! <!-- jars --> <path id="project.classpath"> *************** *** 79,105 **** <!-- =================================================================== --> - <!-- Ivy setup --> - <!-- =================================================================== --> - <target name="download-ivy" unless="offline"> - <mkdir dir="${ivy.jar.dir}"/> - <!-- download Ivy from web site so that it can be used even without any special installation --> - <get src="http://www.jayasoft.org/downloads/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" - dest="${ivy.jar.file}" usetimestamp="true"/> - </target> - - <target name="init-ivy" depends="download-ivy"> - <!-- try to load ivy here from ivy home, in case the user has not already dropped - it into ant's lib dir (note that the latter copy will always take precedence). - We will not fail as long as local lib dir exists (it may be empty) and - ivy is in at least one of ant's lib dir or the local lib dir. --> - <path id="ivy.lib.path"> - <fileset dir="${ivy.jar.dir}" includes="*.jar"/> - </path> - <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" - uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> - <ivy:resolve/> - </target> - - <!-- =================================================================== --> <!-- Initialization target --> <!-- =================================================================== --> --- 70,73 ---- *************** *** 115,123 **** </tstamp> </target> - <target name="ivy-fop" depends="pre-init, init-ivy"> - <property name="build.fop0205.lib" value="${build.dir}/ext/fop-0.20.5/lib"/> - <mkdir dir="${build.fop0205.lib}"/> - <ivy:retrieve pattern="${build.fop0205.lib}/[artifact].[ext]" conf="fop-0.20.5-extension"/> - </target> <target name="init" depends="pre-init"> <available property="junit.present" classname="junit.framework.TestCase" --- 83,86 ---- *************** *** 149,153 **** <isset property="fop.home"/> </condition> ! <condition property="IKVM.present"> <and> --- 112,116 ---- <isset property="fop.home"/> </condition> ! <condition property="IKVM.present"> <and> *************** *** 206,209 **** --- 169,177 ---- </condition> </target> + <target name="info.jdk14" unless="jdk14.present"> + <echo message="===================================================================="/> + <echo message="Barcode4J requires at least Java 1.4"/> + <echo message="===================================================================="/> + </target> <target name="info.xalan" depends="init" unless="xalan.present"> <echo message="===================================================================="/> *************** *** 251,258 **** <!-- Prepares the build directory --> <!-- =================================================================== --> ! <target name="echo-jdk14" if="jdk14.present"> ! <echo message="JDK 1.4 present."/> ! </target> ! <target name="prepare" depends="init, init.fop-0.20.5, info.fop-0.20.5, init.fop-trunk, info.fop-trunk, info.xalan, info.saxon6, info.saxon8, info.jdom, info.ikvm"> <!-- create directories --> <echo message="Preparing the build directories"/> --- 219,223 ---- <!-- Prepares the build directory --> <!-- =================================================================== --> ! <target name="prepare" depends="init, info.jdk14, init.fop-0.20.5, info.fop-0.20.5, init.fop-trunk, info.fop-trunk, info.xalan, info.saxon6, info.saxon8, info.jdom, info.ikvm"> <!-- create directories --> <echo message="Preparing the build directories"/> *************** *** 260,274 **** <mkdir dir="${build.dest}"/> <mkdir dir="${resource-jar.dir}"/> - <!-- echo options --> - <antcall target="echo-jdk14"/> </target> <!-- =================================================================== --> <!-- Compiles the source directory --> <!-- =================================================================== --> ! <target name="compile-jdk13" depends="prepare"> <echo message="Compiling the core sources"/> ! <javac srcdir="${src.java.dir}" destdir="${build.dest}" ! debug="${debug}" deprecation="${deprecation}" optimize="${optimize}" ! source="${javac.source}" target="${javac.target}" encoding="${encoding}"> <classpath refid="project.classpath"/> </javac> --- 225,235 ---- <mkdir dir="${build.dest}"/> <mkdir dir="${resource-jar.dir}"/> </target> <!-- =================================================================== --> <!-- Compiles the source directory --> <!-- =================================================================== --> ! <target name="compile" depends="prepare"> <echo message="Compiling the core sources"/> ! <javac srcdir="${src.java.dir}" destdir="${build.dest}"> <classpath refid="project.classpath"/> </javac> *************** *** 280,292 **** </copy> </target> ! <target name="compile-jdk14" depends="prepare" if="jdk14.present"> ! <echo message="Compiling the JDK-1.4-dependant sources"/> ! <javac srcdir="${src.java14.dir}" destdir="${build.dest}" ! debug="${debug}" deprecation="${deprecation}" optimize="${optimize}" ! source="${javac.source}" target="${javac.target}" encoding="${encoding}"> ! <classpath refid="project.classpath"/> ! </javac> ! </target> ! <target name="compile-xalan" depends="compile-jdk13" if="xalan.present"> <echo message="Compiling the Apache Xalan-J extension"/> <javac srcdir="${xalan.dir}/java" destdir="${build.dest}" --- 241,245 ---- </copy> </target> ! <target name="compile-xalan" depends="compile" if="xalan.present"> <echo message="Compiling the Apache Xalan-J extension"/> <javac srcdir="${xalan.dir}/java" destdir="${build.dest}" *************** *** 296,300 **** </javac> </target> ! <target name="compile-saxon6" depends="compile-jdk13" if="saxon6.present"> <echo message="Compiling the SAXON 6.5.x extension"/> <javac srcdir="${saxon6.dir}/java" destdir="${build.dest}" --- 249,253 ---- </javac> </target> ! <target name="compile-saxon6" depends="compile" if="saxon6.present"> <echo message="Compiling the SAXON 6.5.x extension"/> <javac srcdir="${saxon6.dir}/java" destdir="${build.dest}" *************** *** 304,308 **** </javac> </target> ! <target name="compile-saxon8" depends="compile-jdk13" if="saxon8.present"> <echo message="Compiling the SAXON 8.x extension"/> <javac srcdir="${saxon8.dir}/java" destdir="${build.dest}" --- 257,261 ---- </javac> </target> ! <target name="compile-saxon8" depends="compile" if="saxon8.present"> <echo message="Compiling the SAXON 8.x extension"/> <javac srcdir="${saxon8.dir}/java" destdir="${build.dest}" *************** *** 312,316 **** </javac> </target> ! <target name="compile-jdom" depends="compile-jdk13" if="jdom.present"> <echo message="Compiling the JDOM-related classes"/> <javac srcdir="${jdom.dir}/java" destdir="${build.dest}" --- 265,269 ---- </javac> </target> ! <target name="compile-jdom" depends="compile" if="jdom.present"> <echo message="Compiling the JDOM-related classes"/> <javac srcdir="${jdom.dir}/java" destdir="${build.dest}" *************** *** 320,324 **** </javac> </target> ! <target name="compile-fop-0.20.5" depends="compile-jdk13" if="fop-0.20.5.present"> <echo message="Compiling the Apache FOP 0.20.5 extension"/> <mkdir dir="${build.dest.fop-0.20.5}"/> --- 273,277 ---- </javac> </target> ! <target name="compile-fop-0.20.5" depends="compile" if="fop-0.20.5.present"> <echo message="Compiling the Apache FOP 0.20.5 extension"/> <mkdir dir="${build.dest.fop-0.20.5}"/> *************** *** 332,336 **** </javac> </target> ! <target name="compile-fop-trunk" depends="compile-jdk13" if="fop-trunk.present"> <echo message="Compiling the Apache FOP Trunk extension"/> <mkdir dir="${build.dest.fop-trunk}"/> --- 285,289 ---- </javac> </target> ! <target name="compile-fop-trunk" depends="compile" if="fop-trunk.present"> <echo message="Compiling the Apache FOP Trunk extension"/> <mkdir dir="${build.dest.fop-trunk}"/> *************** *** 344,348 **** </javac> </target> ! <target name="compile" depends="compile-jdk13, compile-jdk14, compile-xalan, compile-saxon6, compile-saxon8, compile-jdom, compile-fop-0.20.5, compile-fop-trunk" description="Compiles the sources"/> <!-- =================================================================== --> <!-- Creates Java docs --> --- 297,301 ---- </javac> </target> ! <target name="compile-all" depends="compile, compile-xalan, compile-saxon6, compile-saxon8, compile-jdom, compile-fop-0.20.5, compile-fop-trunk" description="Compiles the sources"/> <!-- =================================================================== --> <!-- Creates Java docs --> *************** *** 375,379 **** <!-- Creates the class package --> <!-- =================================================================== --> ! <target name="package-base" depends="compile"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> --- 328,332 ---- <!-- Creates the class package --> <!-- =================================================================== --> ! <target name="package-base" depends="compile-all"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> *************** *** 435,439 **** </jar> </target> ! <target name="package-fop-0.20.5" depends="compile" if="fop-0.20.5.present"> <echo message="Creating the jar file ${build.dir}/${name}-fop-ext-0.20.5.jar"/> <jar jarfile="${build.dir}/${name}-fop-ext-0.20.5.jar"> --- 388,392 ---- </jar> </target> ! <target name="package-fop-0.20.5" depends="compile-all" if="fop-0.20.5.present"> <echo message="Creating the jar file ${build.dir}/${name}-fop-ext-0.20.5.jar"/> <jar jarfile="${build.dir}/${name}-fop-ext-0.20.5.jar"> *************** *** 475,479 **** </jar> </target> ! <target name="package-fop-trunk" depends="compile" if="fop-trunk.present"> <echo message="Creating the jar file ${build.dir}/${name}-fop-ext.jar"/> <jar jarfile="${build.dir}/${name}-fop-ext.jar"> --- 428,432 ---- </jar> </target> ! <target name="package-fop-trunk" depends="compile-all" if="fop-trunk.present"> <echo message="Creating the jar file ${build.dir}/${name}-fop-ext.jar"/> <jar jarfile="${build.dir}/${name}-fop-ext.jar"> *************** *** 528,552 **** </jar> </target> ! <target name="package" depends="package-base, package-fop-0.20.5, package-fop-trunk" description="Creates the Barcode JAR package(s)"/> <!-- =================================================================== --> <!-- Creates .NET binaries using IKVM --> <!-- =================================================================== --> <target name="package.NET" depends="package-base" if="IKVM.present" description="Generates the .NET DLL using IKVM"> ! <exec executable="${ikvmc}"> ! <arg value="-reference:${ikvm.dir}/bin/IKVM.GNU.Classpath.dll"/> ! <arg value="-exclude:ikvm-excludes.txt"/> ! <arg value="-target:library"/> ! <arg value="-out:${build.dir}\${name}-light-${version}.dll"/> ! <arg value="${build.dir}\${name}-light.jar"/> ! </exec> ! <exec executable="${ikvmc}"> ! <arg value="-reference:${ikvm.dir}/bin/IKVM.GNU.Classpath.dll"/> ! <arg value="-exclude:ikvm-excludes.txt"/> ! <arg value="-target:exe"/> ! <arg value="-out:${build.dir}\${name}.exe"/> ! <arg value="${build.dir}\${name}.jar"/> ! <arg value="${lib.dir}\avalon-framework-4.2.0.jar"/> ! <arg value="${lib.dir}\commons-cli-1.0.jar"/> ! </exec> </target> <!-- =================================================================== --> --- 481,559 ---- </jar> </target> ! <target name="package" depends="package-base, package-fop-0.20.5, package-fop-trunk, package.NET" description="Creates the Barcode JAR package(s)"/> <!-- =================================================================== --> <!-- Creates .NET binaries using IKVM --> <!-- =================================================================== --> + + <macrodef name="ikvm-compile"> + <element name="args"/> + + <sequential> + <exec executable="${ikvmc}"> + <arg value="-exclude:ikvm-excludes.txt"/> + <arg value="-debug"/> + <arg value="-reference:${build.dotnet.dir}/IKVM.*.dll"/> + <args/> + </exec> + </sequential> + </macrodef> + <target name="package.NET" depends="package-base" if="IKVM.present" description="Generates the .NET DLL using IKVM"> ! <property name="avalon.name" value="avalon-framework-4.2.0"/> ! <property name="cli.name" value="commons-cli-1.0"/> ! ! <mkdir dir="${build.dotnet.dir}"/> ! <copy todir="${build.dotnet.dir}"> ! <fileset dir="${ikvm.dir}/bin"> ! <include name="IKVM.Runtime*.dll"/> ! <include name="IKVM.OpenJDK*.dll"/> ! <include name="IKVM.AWT*.dll"/> ! </fileset> ! </copy> ! ! <echo message="=== Avalon DLL ==="/> ! <ikvm-compile> ! <args> ! <arg value="-target:library"/> ! <arg value="-version:4.2.0.0"/> ! <arg value="-out:${build.dotnet.dir}\${avalon.name}.dll"/> ! <arg value="${lib.dir}\${avalon.name}.jar"/> ! </args> ! </ikvm-compile> ! <echo message="=== Commons CLI DLL ==="/> ! <ikvm-compile> ! <args> ! <arg value="-target:library"/> ! <arg value="-version:1.0.0.0"/> ! <arg value="-out:${build.dotnet.dir}\${cli.name}.dll"/> ! <arg value="${lib.dir}\${cli.name}.jar"/> ! </args> ! </ikvm-compile> ! <echo message="=== Barcode4J DLL ==="/> ! <ikvm-compile> ! <args> ! <arg value="-reference:${build.dotnet.dir}\${avalon.name}.dll"/> ! <arg value="-reference:${build.dotnet.dir}\${cli.name}.dll"/> ! <arg value="-target:library"/> ! <arg value="-version:${barcode4j-version.net}"/> ! <arg value="-fileversion:${barcode4j-version}"/> ! <arg value="-out:${build.dotnet.dir}\${name}-${version}.dll"/> ! <arg value="${build.dir}\${name}.jar"/> ! </args> ! </ikvm-compile> ! <echo message="=== Barcode4J EXE ==="/> ! ! <ikvm-compile> ! <args> ! <arg value="-reference:${build.dotnet.dir}\${name}-${version}.dll"/> ! <arg value="-reference:${build.dotnet.dir}\${avalon.name}.dll"/> ! <arg value="-reference:${build.dotnet.dir}\${cli.name}.dll"/> ! <arg value="-target:exe"/> ! <arg value="-version:${barcode4j-version.net}"/> ! <arg value="-fileversion:${barcode4j-version}"/> ! <arg value="-out:${build.dotnet.dir}\${name}.exe"/> ! <arg value="-main:org.krysalis.barcode4j.cli.Main"/> ! </args> ! </ikvm-compile> </target> <!-- =================================================================== --> *************** *** 584,588 **** <!-- Tests --> <!-- =================================================================== --> ! <target name="test-init" depends="compile"> <mkdir dir="${build.test}/classes"/> </target> --- 591,595 ---- <!-- Tests --> <!-- =================================================================== --> ! <target name="test-init" depends="compile-all"> <mkdir dir="${build.test}/classes"/> </target> *************** *** 631,635 **** <target name="test" depends="compile,test-compile" if="junit.present"> <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/> ! <junit printsummary="yes" haltonfailure="yes" fork="yes"> <!--jvmarg value="-verbose:class"/--> <sysproperty key="java.awt.headless" value="true"/> --- 638,642 ---- <target name="test" depends="compile,test-compile" if="junit.present"> <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/> ! <junit printsummary="yes" haltonfailure="yes"> <!--jvmarg value="-verbose:class"/--> <sysproperty key="java.awt.headless" value="true"/> Index: build.properties =================================================================== RCS file: /cvsroot/barcode4j/barcode4j/build.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** build.properties 13 Mar 2009 09:07:08 -0000 1.11 --- build.properties 5 Oct 2010 08:51:18 -0000 1.12 *************** *** 1,12 **** barcode4j-version=2.1-dev debug=on optimize=off deprecation=on build.compiler=modern #optional.lib.dir=<path to a directory with additional libraries> #fop-0.20.5.home=<path to your FOP 0.20.5 installation> #fop.home=<path to your FOP Trunk installation> #ssh.uid=<your SourceForge id> #ssh.key=<path to your SF SSH2 private key> #ssh.key.passphrase=<passphrase for your private key> - encoding=ISO-8859-1 --- 1,18 ---- barcode4j-version=2.1-dev + barcode4j-version.net=2.1.0.0 + debug=on optimize=off deprecation=on + encoding=ISO-8859-1 + javac.source=1.4 + javac.target=1.4 build.compiler=modern + #optional.lib.dir=<path to a directory with additional libraries> #fop-0.20.5.home=<path to your FOP 0.20.5 installation> #fop.home=<path to your FOP Trunk installation> + #ssh.uid=<your SourceForge id> #ssh.key=<path to your SF SSH2 private key> #ssh.key.passphrase=<passphrase for your private key> Index: ikvm-excludes.txt =================================================================== RCS file: /cvsroot/barcode4j/barcode4j/ikvm-excludes.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ikvm-excludes.txt 6 Jan 2007 20:22:26 -0000 1.1 --- ikvm-excludes.txt 5 Oct 2010 08:51:18 -0000 1.2 *************** *** 5,9 **** org.krysalis.barcode4j.saxon.* org.krysalis.barcode4j.xalan.* ! org.apache.avalon.framework.logger.LogKit2AvalonLoggerAdapter org.apache.avalon.framework.logger.AvalonFormatter org.apache.log4j.* --- 5,11 ---- org.krysalis.barcode4j.saxon.* org.krysalis.barcode4j.xalan.* ! org.krysalis.barcode4j.ant.* ! org.apache.avalon.framework.logger.LogKit* ! org.apache.avalon.framework.logger.Log4J* org.apache.avalon.framework.logger.AvalonFormatter org.apache.log4j.* |
Thanks for helping keep SourceForge clean.
X