[GNUnet-SVN] r2994 - in freeway: . etc etc/support etc/support/clib native src/org/gnu/freeway/cwrappers/util

[mdonoughe]

Author: mdonoughe
Date: 2006-06-09 20:00:29 -0700 (Fri, 09 Jun 2006)
New Revision: 2994

Added:
   freeway/etc/Makefile.am
   freeway/etc/support/Makefile.am
   freeway/etc/support/clib/Makefile.am
Modified:
   freeway/Makefile.am
   freeway/build.sh
   freeway/configure.ac
   freeway/etc/
   freeway/etc/support/
   freeway/etc/support/clib/
   freeway/etc/support/clib/signals.c
   freeway/native/org_gnu_freeway_server_CPluginLoader.c
   freeway/native/switch-table.c
   freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java
Log:
Now we can build libfreeway-clib on Linux PCs and probably others. 
Library files must currently be coppied to the build directory as in 
build.sh. There is probably a better way.


Modified: freeway/Makefile.am
===================================================================
--- freeway/Makefile.am 2006-06-09 17:49:37 UTC (rev 2993)
+++ freeway/Makefile.am 2006-06-10 03:00:29 UTC (rev 2994)
@@ -1,2 +1,2 @@
-SUBDIRS = native .
+SUBDIRS = native etc .
 ACLOCAL_AMFLAGS = -I m4

Modified: freeway/build.sh
===================================================================
--- freeway/build.sh    2006-06-09 17:49:37 UTC (rev 2993)
+++ freeway/build.sh    2006-06-10 03:00:29 UTC (rev 2994)
@@ -1,37 +1,6 @@
 #!/bin/sh
 #
-# Build C library used by Freeway.
+# Build Freeway and it's C libraries.
 #
 
-test -z $JAVA_HOME && test -d /opt/java && JAVA_HOME=/opt/java
-test -z $JAVA_HOME && test -d 
/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK && 
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK
-
-rm -f  \
-       build/*.o       \
-       build/*.jnilib
-
-cc -Wall       \
-       -I etc/support/clib     \
-       -c etc/support/clib/signals.c   \
-       -o build/signals.o
-
-cc -Wall       \
-       -I etc/support/clib     \
-       -c etc/support/clib/links.c     \
-       -o build/links.o
-
-cc -Wall       \
-       -I etc/support/clib     \
-       -I $JAVA_HOME/include   \
-       -I $JAVA_HOME/Headers   \
-       -c etc/support/clib/freeway-clib.c      \
-       -o build/freeway-clib.o
-
-
-# fixme: Mac OS X specific
-
-cc -dynamiclib \
-       -framework JavaVM       \
-       build/signals.o build/links.o build/freeway-clib.o      \
-       -o build/libfreeway-clib.jnilib
-
+ant && make && cp native/.libs/lib*.so* build/ && cp 
etc/support/clib/.libs/lib*.so* build/

Modified: freeway/configure.ac
===================================================================
--- freeway/configure.ac        2006-06-09 17:49:37 UTC (rev 2993)
+++ freeway/configure.ac        2006-06-10 03:00:29 UTC (rev 2994)
@@ -125,6 +125,9 @@
 AC_CONFIG_FILES([
 Makefile
 native/Makefile
+etc/Makefile
+etc/support/Makefile
+etc/support/clib/Makefile
 ])
 
 AC_OUTPUT


Property changes on: freeway/etc
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile


Added: freeway/etc/Makefile.am
===================================================================
--- freeway/etc/Makefile.am     2006-06-09 17:49:37 UTC (rev 2993)
+++ freeway/etc/Makefile.am     2006-06-10 03:00:29 UTC (rev 2994)
@@ -0,0 +1 @@
+SUBDIRS = support


Property changes on: freeway/etc/support
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile


Added: freeway/etc/support/Makefile.am
===================================================================
--- freeway/etc/support/Makefile.am     2006-06-09 17:49:37 UTC (rev 2993)
+++ freeway/etc/support/Makefile.am     2006-06-10 03:00:29 UTC (rev 2994)
@@ -0,0 +1 @@
+SUBDIRS = clib


Property changes on: freeway/etc/support/clib
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile
.libs
.deps


Added: freeway/etc/support/clib/Makefile.am
===================================================================
--- freeway/etc/support/clib/Makefile.am        2006-06-09 17:49:37 UTC (rev 
2993)
+++ freeway/etc/support/clib/Makefile.am        2006-06-10 03:00:29 UTC (rev 
2994)
@@ -0,0 +1,13 @@
+SUBDIRS = .
+
+lib_LTLIBRARIES = \
+  libfreeway-clib.la
+
+libfreeway_clib_la_LDFLAGS = \
+  -export-dynamic -version-info 0:0:0 
+libfreeway_clib_la_LIBADD = \
+  -lgnunetutil
+
+libfreeway_clib_la_SOURCES = \
+  signals.c signals.h links.c links.h jni.h \
+  freeway-clib.c freeway-clib.h

Modified: freeway/etc/support/clib/signals.c
===================================================================
--- freeway/etc/support/clib/signals.c  2006-06-09 17:49:37 UTC (rev 2993)
+++ freeway/etc/support/clib/signals.c  2006-06-10 03:00:29 UTC (rev 2994)
@@ -9,6 +9,14 @@
 
 #include "signals.h"
 
+#ifndef PTHREAD_MUTEX_NORMAL
+#ifdef PTHREAD_MUTEX_TIMED_NP
+#define PTHREAD_MUTEX_NORMAL PTHREAD_MUTEX_TIMED_NP
+#else
+#define PTHREAD_MUTEX_NORMAL NULL
+#endif
+#endif
+
 static void signals_handler( int num );
 
 #define FIFO_SIZE      16

Modified: freeway/native/org_gnu_freeway_server_CPluginLoader.c
===================================================================
--- freeway/native/org_gnu_freeway_server_CPluginLoader.c       2006-06-09 
17:49:37 UTC (rev 2993)
+++ freeway/native/org_gnu_freeway_server_CPluginLoader.c       2006-06-10 
03:00:29 UTC (rev 2994)
@@ -134,9 +134,9 @@
   jmethodID method;
   PointerObject * po;
 
-  po = malloc(sizeof(PointerObject));
-  if(po == NULL)
-    return NULL;
+  po = MALLOC(sizeof(PointerObject));
+//  if(po == NULL)
+//    return NULL;
   
   if(input == NULL)
     return NULL;
@@ -201,7 +201,7 @@
   if(method != NULL) {
     (*env)->CallVoidMethod(env, target, method, input->pointer);
     (*env)->ReleaseByteArrayElements(env, input->object, input->pointer, 0);
-    free(input);
+    FREE(input);
 fprintf(stderr, "leaving updateObjectFromPtr\n");
     return;
   }

Modified: freeway/native/switch-table.c
===================================================================
--- freeway/native/switch-table.c       2006-06-09 17:49:37 UTC (rev 2993)
+++ freeway/native/switch-table.c       2006-06-10 03:00:29 UTC (rev 2994)
@@ -3,7 +3,6 @@
 int jargLength = (*env)->GetArrayLength(env, arguments);
 if(jargLength > 0) {
   jargs = malloc(sizeof(jobject) * jargLength);
-  GNUNET_ASSERT(jargs != NULL);
   int jargsI;
   for(jargsI = 0; jargsI < jargLength; jargsI++) {
     jargs[jargsI] = (*env)->GetObjectArrayElement(env, arguments, jargsI);

Modified: freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java
===================================================================
--- freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java        
2006-06-09 17:49:37 UTC (rev 2993)
+++ freeway/src/org/gnu/freeway/cwrappers/util/SwitchTableGenerator.java        
2006-06-10 03:00:29 UTC (rev 2994)
@@ -407,7 +407,6 @@
                writerC.write("int jargLength = (*env)->GetArrayLength(env, 
arguments);\n");
                writerC.write("if(jargLength > 0) {\n");
                writerC.write("  jargs = malloc(sizeof(jobject) * 
jargLength);\n");
-               writerC.write("  GNUNET_ASSERT(jargs != NULL);\n");
                writerC.write("  int jargsI;\n");
                writerC.write("  for(jargsI = 0; jargsI < jargLength; jargsI++) 
{\n");
                writerC.write("    jargs[jargsI] = 
(*env)->GetObjectArrayElement(env, arguments, jargsI);\n");