[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7262 - freeway
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7262 - freeway |
Date: |
Sun, 15 Jun 2008 11:53:44 -0600 (MDT) |
Author: mdonoughe
Date: 2008-06-15 11:53:44 -0600 (Sun, 15 Jun 2008)
New Revision: 7262
Modified:
freeway/build.xml
Log:
Merge branch 'new-build'
Conflicts:
build.xml
Modified: freeway/build.xml
===================================================================
--- freeway/build.xml 2008-06-15 17:48:56 UTC (rev 7261)
+++ freeway/build.xml 2008-06-15 17:53:44 UTC (rev 7262)
@@ -4,236 +4,236 @@
<!ENTITY transports SYSTEM "transports.xml">
]>
<project name="Freeway" default="all" basedir=".">
- <!-- property name="build.compiler" value="javac" / -->
- <property name="build.sysclasspath" value="ignore" />
- <property file="build.properties" />
+ <!-- property name="build.compiler" value="javac" / -->
+ <property name="build.sysclasspath" value="ignore" />
+ <property file="build.properties" />
- <target name="init">
- <tstamp>
- <format property="stamp" pattern="yyyy-MM-dd HH:mm:ss"
timezone="GMT" />
- </tstamp>
+ <target name="init">
+ <tstamp>
+ <format property="stamp" pattern="yyyy-MM-dd HH:mm:ss" timezone="GMT" />
+ </tstamp>
- <property name="project.root" value="${basedir}" />
- <dirname property="project.parent" file="${project.root}" />
- <basename property="project.name" file="${project.root}" />
+ <property name="project.root" value="${basedir}" />
+ <dirname property="project.parent" file="${project.root}" />
+ <basename property="project.name" file="${project.root}" />
- <property name="project.build" location="${project.root}/build"
/>
- <property name="project.doc" location="${project.root}/doc" />
- <property name="project.etc" location="${project.root}/etc" />
- <property name="project.lib" location="${project.root}/lib" />
- <property name="project.res" location="${project.root}/res" />
- <property name="project.src" location="${project.root}/src" />
+ <property name="project.build" location="${project.root}/build" />
+ <property name="project.doc" location="${project.root}/doc" />
+ <property name="project.etc" location="${project.root}/etc" />
+ <property name="project.lib" location="${project.root}/lib" />
+ <property name="project.res" location="${project.root}/res" />
+ <property name="project.src" location="${project.root}/src" />
- <path id="build.classpath">
- <fileset dir="${project.lib}">
- <include name="*.jar" />
- </fileset>
- </path>
- </target>
+ <path id="build.classpath">
+ <fileset dir="${project.lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+ </target>
- <target name="build" depends="init">
- <mkdir dir="${project.build}/classes" />
+ <target name="build" depends="init">
+ <mkdir dir="${project.build}/classes" />
- <javac srcdir="${project.src}"
- destdir="${project.build}/classes"
- classpathref="build.classpath"
- includeJavaRuntime="no"
- includeAntRuntime="no"
- source="1.4"
- encoding="UTF-8"
- debug="on"
- optimize="off"
- />
+ <javac srcdir="${project.src}"
+ destdir="${project.build}/classes"
+ classpathref="build.classpath"
+ includeJavaRuntime="no"
+ includeAntRuntime="no"
+ source="1.4"
+ encoding="UTF-8"
+ debug="on"
+ optimize="off"
+ />
- <jar destfile="${project.build}/freeway.jar">
- <fileset dir="${project.build}/classes">
- <exclude name="org/gnu/freeway/protocol/*/*/**"
/>
- <exclude
name="org/gnu/freeway/transport/*/*/**" />
- </fileset>
- </jar>
+ <jar destfile="${project.build}/freeway.jar">
+ <fileset dir="${project.build}/classes">
+ <exclude name="org/gnu/freeway/protocol/*/*/**" />
+ <exclude name="org/gnu/freeway/transport/*/*/**" />
+ </fileset>
+ </jar>
- <!--build protocols in protocols.xml-->
- &protocols;
+ <!--build protocols in protocols.xml-->
+ &protocols;
- <!--build transports in transports.xml-->
- &transports;
+ <!--build transports in transports.xml-->
+ &transports;
- </target>
+ </target>
- <target name="fix-build" depends="build">
- <javac srcdir="${project.etc}/support"
- destdir="${project.build}/classes"
- includeJavaRuntime="no"
- includeAntRuntime="no"
- source="1.4"
- encoding="UTF-8"
- debug="on"
- optimize="off"
- includes="Cleaner.java">
- <classpath>
- <path refid="build.classpath" />
- <path location="${project.build}/classes" />
- </classpath>
- </javac>
- </target>
+ <target name="fix-build" depends="build">
+ <javac srcdir="${project.etc}/support"
+ destdir="${project.build}/classes"
+ includeJavaRuntime="no"
+ includeAntRuntime="no"
+ source="1.4"
+ encoding="UTF-8"
+ debug="on"
+ optimize="off"
+ includes="Cleaner.java">
+ <classpath>
+ <path refid="build.classpath" />
+ <path location="${project.build}/classes" />
+ </classpath>
+ </javac>
+ </target>
- <target name="fix-tabs" depends="fix-build">
- <java classname="Cleaner" fork="yes" dir="${project.build}">
- <classpath>
- <path refid="build.classpath" />
- <path location="${project.build}/classes" />
- </classpath>
+ <target name="fix-tabs" depends="fix-build">
+ <java classname="Cleaner" fork="yes" dir="${project.build}">
+ <classpath>
+ <path refid="build.classpath" />
+ <path location="${project.build}/classes" />
+ </classpath>
- <jvmarg value="-ea" />
- <arg value="${project.src}" />
- </java>
- </target>
+ <jvmarg value="-ea" />
+ <arg value="${project.src}" />
+ </java>
+ </target>
- <target name="all" depends="build, make-headers, switch-table" />
+ <target name="all" depends="build, make-headers, switch-table" />
- <target name="switch-table" depends="build">
- <java
classname="org.gnu.freeway.cwrappers.util.SwitchTableGenerator" fork="yes">
- <classpath>
- <path refid="build.classpath" />
- <path location="${project.build}/classes" />
- </classpath>
- </java>
+ <target name="switch-table" depends="build">
+ <java classname="org.gnu.freeway.cwrappers.util.SwitchTableGenerator"
fork="yes">
+ <classpath>
+ <path refid="build.classpath" />
+ <path location="${project.build}/classes" />
+ </classpath>
+ </java>
- <!-- compile the generated files -->
- <antcall target="build" />
- </target>
+ <!-- compile the generated files -->
+ <antcall target="build" />
+ </target>
- <target name="test" depends="init">
- <mkdir dir="${project.build}/classes" />
- <javac srcdir="${project.etc}/support"
- destdir="${project.build}/classes"
- classpathref="build.classpath"
- includeJavaRuntime="no"
- includeAntRuntime="no"
- source="1.4"
- encoding="UTF-8"
- debug="on"
- optimize="off"
- includes="ReachTest.java"
- />
- <java classname="ReachTest" fork="yes" dir="${project.build}">
- <classpath>
- <path refid="build.classpath" />
- <path location="${project.build}/classes" />
- </classpath>
+ <target name="test" depends="init">
+ <mkdir dir="${project.build}/classes" />
+ <javac srcdir="${project.etc}/support"
+ destdir="${project.build}/classes"
+ classpathref="build.classpath"
+ includeJavaRuntime="no"
+ includeAntRuntime="no"
+ source="1.4"
+ encoding="UTF-8"
+ debug="on"
+ optimize="off"
+ includes="ReachTest.java"
+ />
+ <java classname="ReachTest" fork="yes" dir="${project.build}">
+ <classpath>
+ <path refid="build.classpath" />
+ <path location="${project.build}/classes" />
+ </classpath>
- <jvmarg value="-ea" />
- <jvmarg value="-Djava.nio.preferSelect=true" />
- </java>
- </target>
+ <jvmarg value="-ea" />
+ <jvmarg value="-Djava.nio.preferSelect=true" />
+ </java>
+ </target>
- <target name="make-headers" depends="build">
- <javah outputFile="${project.etc}/support/clib/freeway-clib.h">
- <class name="org.gnu.freeway.util.OSAccess" />
- <classpath>
- <path refid="build.classpath" />
- <path location="${project.build}/freeway.jar" />
- </classpath>
- </javah>
- <javah destdir="native">
- <class name="org.gnu.freeway.server.CPluginLoader" />
- <classpath>
- <path refid="build.classpath" />
- <path location="${project.build}/freeway.jar" />
- </classpath>
- </javah>
- </target>
+ <target name="make-headers" depends="build">
+ <javah outputFile="${project.etc}/support/clib/freeway-clib.h">
+ <class name="org.gnu.freeway.util.OSAccess" />
+ <classpath>
+ <path refid="build.classpath" />
+ <path location="${project.build}/freeway.jar" />
+ </classpath>
+ </javah>
+ <javah destdir="native">
+ <class name="org.gnu.freeway.server.CPluginLoader" />
+ <classpath>
+ <path refid="build.classpath" />
+ <path location="${project.build}/freeway.jar" />
+ </classpath>
+ </javah>
+ </target>
- <!-- Delete All Compilation Generated Files -->
+ <!-- Delete All Compilation Generated Files -->
- <target name="clean" depends="init">
- <delete dir="${project.build}/classes" quiet="true" />
- <delete dir="${project.build}/doc" quiet="true" />
+ <target name="clean" depends="init">
+ <delete dir="${project.build}/classes" quiet="true" />
+ <delete dir="${project.build}/doc" quiet="true" />
- <delete quiet="true">
- <fileset dir="${project.build}"
includes="*.jar,*.o,*.jnilib" />
- </delete>
- </target>
+ <delete quiet="true">
+ <fileset dir="${project.build}" includes="*.jar,*.o,*.jnilib" />
+ </delete>
+ </target>
- <!-- API Documentation Generation -->
+ <!-- API Documentation Generation -->
- <target name="doc" depends="init">
- <mkdir dir="${project.build}/doc/api" />
+ <target name="doc" depends="init">
+ <mkdir dir="${project.build}/doc/api" />
- <javadoc sourcepath="${project.src}"
- destdir="${project.build}/doc/api"
- author="true" version="true" private="true" use="true"
splitindex="true"
- windowtitle="Freeway API"
- stylesheetfile="${project.res}/api.css"
- packagenames="org.gnu.*"
- classpathref="build.classpath"
- additionalparam="-breakiterator"
- source="1.4">
+ <javadoc sourcepath="${project.src}"
+ destdir="${project.build}/doc/api"
+ author="true" version="true" private="true" use="true" splitindex="true"
+ windowtitle="Freeway API"
+ stylesheetfile="${project.res}/api.css"
+ packagenames="org.gnu.*"
+ classpathref="build.classpath"
+ additionalparam="-breakiterator"
+ source="1.4">
- <doctitle><![CDATA[Freeway API ${stamp}]]></doctitle>
- <header><![CDATA[Freeway API ${stamp}]]></header>
- <bottom><![CDATA[<i>2008 GNU</i>]]></bottom>
+ <doctitle><![CDATA[Freeway API ${stamp}]]></doctitle>
+ <header><![CDATA[Freeway API ${stamp}]]></header>
+ <bottom><![CDATA[<i>2008 GNU</i>]]></bottom>
- <link href="http://java.sun.com/j2se/1.4/docs/api/" />
- <link href="http://xml.apache.org/batik/javadoc/" />
+ <link href="http://java.sun.com/j2se/1.4/docs/api/" />
+ <link href="http://xml.apache.org/batik/javadoc/" />
- <group title="NAT Transport Layer"
packages="org.gnu.freeway.transport.nat*" />
- <group title="TCP Transport Layer"
packages="org.gnu.freeway.transport.tcp*" />
- <group title="UDP Transport Layer"
packages="org.gnu.freeway.transport.udp*" />
+ <group title="NAT Transport Layer"
packages="org.gnu.freeway.transport.nat*" />
+ <group title="TCP Transport Layer"
packages="org.gnu.freeway.transport.tcp*" />
+ <group title="UDP Transport Layer"
packages="org.gnu.freeway.transport.udp*" />
- <group title="AFS Protocol"
packages="org.gnu.freeway.protocol.afs*" />
- <group title="Chat Protocol"
packages="org.gnu.freeway.protocol.chat*" />
- <group title="DHT Protocol"
packages="org.gnu.freeway.protocol.dht*" />
- <group title="TBench Protocol"
packages="org.gnu.freeway.protocol.tbench*" />
- <group title="TraceKit Protocol"
packages="org.gnu.freeway.protocol.tracekit*" />
- </javadoc>
- </target>
+ <group title="AFS Protocol" packages="org.gnu.freeway.protocol.afs*" />
+ <group title="Chat Protocol" packages="org.gnu.freeway.protocol.chat*" />
+ <group title="DHT Protocol" packages="org.gnu.freeway.protocol.dht*" />
+ <group title="TBench Protocol"
packages="org.gnu.freeway.protocol.tbench*" />
+ <group title="TraceKit Protocol"
packages="org.gnu.freeway.protocol.tracekit*" />
+ </javadoc>
+ </target>
- <!-- Nothing But A Clean Archive (Nor SVN, Neither Build Stuff) -->
+ <!-- Nothing But A Clean Archive (Nor SVN, Neither Build Stuff) -->
- <target name="make-archive" depends="clean" if="archive.target">
- <property name="backup.name"
value="${project.name}-${stamp}.tar.bz2" />
+ <target name="make-archive" depends="clean" if="archive.target">
+ <property name="backup.name" value="${project.name}-${stamp}.tar.bz2" />
- <delete file="${archive.target}/${backup.name}" quiet="true" />
+ <delete file="${archive.target}/${backup.name}" quiet="true" />
- <tar destfile="${archive.target}/${backup.name}"
- basedir="${project.parent}"
- compression="bzip2">
+ <tar destfile="${archive.target}/${backup.name}"
+ basedir="${project.parent}"
+ compression="bzip2">
- <include name="${project.name}/**/*" />
- <exclude name="${project.name}/.*" />
- <exclude name="${project.name}/.*/**/*" />
- </tar>
- </target>
+ <include name="${project.name}/**/*" />
+ <exclude name="${project.name}/.*" />
+ <exclude name="${project.name}/.*/**/*" />
+ </tar>
+ </target>
- <!-- JNLP Package Creation -->
+ <!-- JNLP Package Creation -->
- <target name="install-jnlp" depends="build" if="jnlp.target">
- <delete quiet="true">
- <fileset dir="${jnlp.target}" includes="**/*" />
- </delete>
+ <target name="install-jnlp" depends="build" if="jnlp.target">
+ <delete quiet="true">
+ <fileset dir="${jnlp.target}" includes="**/*" />
+ </delete>
- <copy todir="${jnlp.target}">
- <fileset dir="${project.build}"
includes="freeway-for-apps.jar" />
- <fileset dir="${project.lib}" includes="*.jar" />
- <fileset dir="${project.res}/jnlp" includes="logo.png"
/>
- </copy>
+ <copy todir="${jnlp.target}">
+ <fileset dir="${project.build}" includes="freeway-for-apps.jar" />
+ <fileset dir="${project.lib}" includes="*.jar" />
+ <fileset dir="${project.res}/jnlp" includes="logo.png" />
+ </copy>
- <copy todir="${jnlp.target}" overwrite="true">
- <fileset dir="${project.res}/jnlp" includes="*.jnlp" />
- <filterset>
- <filter token="REMOTE_URL"
value="${jnlp.target.url}"/>
- </filterset>
- </copy>
+ <copy todir="${jnlp.target}" overwrite="true">
+ <fileset dir="${project.res}/jnlp" includes="*.jnlp" />
+ <filterset>
+ <filter token="REMOTE_URL" value="${jnlp.target.url}"/>
+ </filterset>
+ </copy>
- <signjar jar="${jnlp.target}/freeway-for-apps.jar"
alias="${jnlp.sign.alias}" storepass="${jnlp.sign.password}" />
- <signjar jar="${jnlp.target}/batik-all.jar"
alias="${jnlp.sign.alias}" storepass="${jnlp.sign.password}" />
- <signjar jar="${jnlp.target}/concurrent.jar"
alias="${jnlp.sign.alias}" storepass="${jnlp.sign.password}" />
- <signjar
jar="${jnlp.target}/mysql-connector-java-3.0.10-stable-bin.jar"
alias="${jnlp.sign.alias}" storepass="${jnlp.sign.password}" />
+ <signjar jar="${jnlp.target}/freeway-for-apps.jar"
alias="${jnlp.sign.alias}" storepass="${jnlp.sign.password}" />
+ <signjar jar="${jnlp.target}/batik-all.jar" alias="${jnlp.sign.alias}"
storepass="${jnlp.sign.password}" />
+ <signjar jar="${jnlp.target}/concurrent.jar" alias="${jnlp.sign.alias}"
storepass="${jnlp.sign.password}" />
+ <signjar jar="${jnlp.target}/mysql-connector-java-3.0.10-stable-bin.jar"
alias="${jnlp.sign.alias}" storepass="${jnlp.sign.password}" />
- <mkdir dir="${jnlp.target}/daemon" />
- <copy todir="${jnlp.target}/daemon">
- <fileset dir="${project.build}" includes="*.jar"
excludes="freeway-for-apps.jar" />
- </copy>
- </target>
+ <mkdir dir="${jnlp.target}/daemon" />
+ <copy todir="${jnlp.target}/daemon">
+ <fileset dir="${project.build}" includes="*.jar"
excludes="freeway-for-apps.jar" />
+ </copy>
+ </target>
</project>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7262 - freeway,
gnunet <=