[GNUnet-SVN] r7246 - in freeway: . etc/support/clib native

[gnunet]

Author: mdonoughe
Date: 2008-06-15 11:30:40 -0600 (Sun, 15 Jun 2008)
New Revision: 7246

Modified:
   freeway/Makefile.am
   freeway/build.properties
   freeway/build.sh
   freeway/build.xml
   freeway/configure.ac
   freeway/etc/support/clib/Makefile.am
   freeway/native/org_gnu_freeway_server_CPluginLoader.h
Log:
make now calls ant when necessary


Modified: freeway/Makefile.am
===================================================================
--- freeway/Makefile.am 2008-06-15 17:30:33 UTC (rev 7245)
+++ freeway/Makefile.am 2008-06-15 17:30:40 UTC (rev 7246)
@@ -1,2 +1,2 @@
-SUBDIRS = po native etc
+SUBDIRS = po src native etc
 ACLOCAL_AMFLAGS = -I m4

Modified: freeway/build.properties
===================================================================
--- freeway/build.properties    2008-06-15 17:30:33 UTC (rev 7245)
+++ freeway/build.properties    2008-06-15 17:30:40 UTC (rev 7246)
@@ -1,8 +1,6 @@
 # Put here some additional configuration you need to execute targets
 #
 
-api.target=../freeway-docs/doc/api
-
 archive.target=..
 
 jnlp.target=../freeway-docs/doc/jnlp

Modified: freeway/build.sh
===================================================================
--- freeway/build.sh    2008-06-15 17:30:33 UTC (rev 7245)
+++ freeway/build.sh    2008-06-15 17:30:40 UTC (rev 7246)
@@ -3,7 +3,7 @@
 # Build Freeway and its C libraries.
 #
 
-ant && make || exit 1
+make || exit 1
 cp native/.libs/lib*.so* etc/support/clib/.libs/*.so* native/.libs/lib*.dylib 
etc/support/clib/.libs/lib*.dylib build/ > /dev/null 2>&1
 mv build/libfreeway-clib.dylib build/libfreeway-clib.jnilib > /dev/null 2>&1
 mv build/libcpluginloader.dylib build/libcpluginloader.jnilib > /dev/null 2>&1

Modified: freeway/build.xml
===================================================================
--- freeway/build.xml   2008-06-15 17:30:33 UTC (rev 7245)
+++ freeway/build.xml   2008-06-15 17:30:40 UTC (rev 7246)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE project [
-<!ENTITY protocols SYSTEM "file:protocols.xml">
-<!ENTITY transports SYSTEM "file:transports.xml">
+<!ENTITY protocols SYSTEM "protocols.xml">
+<!ENTITY transports SYSTEM "transports.xml">
 ]>
 <project name="Freeway" default="build" basedir=".">
        <!-- property name="build.compiler" value="javac" / -->
@@ -58,16 +58,6 @@
                <!--build transports in transports.xml-->
                &transports;
 
-               <jar destfile="${project.build}/freeway-for-apps.jar">
-                       <fileset dir="${project.build}/classes" />
-                       <zipfileset dir="${project.res}/tests" prefix="tests" />
-                       <zipfileset dir="${project.res}/swing" prefix="" />
-                       <zipfileset dir="${project.res}" includes="*.template" 
prefix="" />
-                       <manifest>
-                               <attribute name="Main-Class" 
value="org.gnu.freeway.GNUNetSwing" />
-                       </manifest>
-               </jar>
-
        </target>
 
        <target name="fix-build" depends="build">
@@ -140,7 +130,7 @@
                                <path location="${project.build}/freeway.jar" />
                        </classpath>
                       </javah>
-                      <javah destdir="${project.native}">
+                      <javah destdir="native">
                         <class name="org.gnu.freeway.server.CPluginLoader" />
                         <classpath>
                           <path refid="build.classpath" />
@@ -162,7 +152,7 @@
 
        <!-- API Documentation Generation -->
 
-       <target name="doc" depends="init" if="api.target">
+       <target name="doc" depends="init">
                <mkdir dir="${project.build}/doc/api" />
 
                <javadoc sourcepath="${project.src}"
@@ -175,7 +165,7 @@
                        additionalparam="-breakiterator"
                        source="1.4">
 
-                       <doctitle><![CDATA[<h1>Freeway API 
${stamp}</h1>]]></doctitle>
+                       <doctitle><![CDATA[Freeway API ${stamp}]]></doctitle>
                        <header><![CDATA[Freeway API ${stamp}]]></header>
                        <bottom><![CDATA[<i>2008 GNU</i>]]></bottom>
 
@@ -192,17 +182,9 @@
                        <group title="TBench Protocol" 
packages="org.gnu.freeway.protocol.tbench*" />
                        <group title="TraceKit Protocol" 
packages="org.gnu.freeway.protocol.tracekit*" />
                </javadoc>
-
-               <delete quiet="true">
-                       <fileset dir="${api.target}" excludes="**/CVS/**/*" />
-               </delete>
-
-               <copy todir="${api.target}">
-                       <fileset dir="${project.build}/doc/api" />
-               </copy>
        </target>
 
-       <!-- Nothing But A Clean Archive (Nor CVS, 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" />

Modified: freeway/configure.ac
===================================================================
--- freeway/configure.ac        2008-06-15 17:30:33 UTC (rev 7245)
+++ freeway/configure.ac        2008-06-15 17:30:40 UTC (rev 7246)
@@ -142,6 +142,7 @@
 AC_CONFIG_FILES([
 po/Makefile.in
 Makefile
+src/Makefile
 native/Makefile
 etc/Makefile
 etc/support/Makefile

Modified: freeway/etc/support/clib/Makefile.am
===================================================================
--- freeway/etc/support/clib/Makefile.am        2008-06-15 17:30:33 UTC (rev 
7245)
+++ freeway/etc/support/clib/Makefile.am        2008-06-15 17:30:40 UTC (rev 
7246)
@@ -6,7 +6,7 @@
 libfreeway_clib_la_LDFLAGS = \
   -export-dynamic -version-info 0:0:0 
 
-BUILT_SOURCES=freeway-clib.h
+BUILT_SOURCES = freeway-clib.h
 
 libfreeway_clib_la_SOURCES = \
   signals.c signals.h links.c links.h jni.h \

Modified: freeway/native/org_gnu_freeway_server_CPluginLoader.h
===================================================================
--- freeway/native/org_gnu_freeway_server_CPluginLoader.h       2008-06-15 
17:30:33 UTC (rev 7245)
+++ freeway/native/org_gnu_freeway_server_CPluginLoader.h       2008-06-15 
17:30:40 UTC (rev 7246)
@@ -7,6 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+/* Inaccessible static: _00024assertionsDisabled */
+/* Inaccessible static: _ */
+/* Inaccessible static: 
class_00024org_00024gnu_00024freeway_00024server_00024CPluginLoader */
+/* Inaccessible static: 
class_00024org_00024gnu_00024freeway_00024util_00024net_00024CSNativeMessage */
 /*
  * Class:     org_gnu_freeway_server_CPluginLoader
  * Method:    cLoadService