Changeset 368:c1a5702c1e0f in mediastreamer2

Timestamp:

Mar 27, 2009 3:20:04 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

fix build.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@371 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

p2pproxy

Files:

• Makefile.am (modified) (1 diff)
• build.xml (modified) (4 diffs)
• configure.ac (modified) (1 diff)
• launcher/src/p2pproxy.c (modified) (2 diffs)
• plugin-src/fonis.c (modified) (1 diff)

p2pproxy/Makefile.am

@@ -4 +4 @@
 
 ALL_JARS= \
-        antbuild/dist/p2pproxy_0.1/bcprov-jdk14.jar   antbuild/dist/p2pproxy_0.1/log4j.jar \
-        antbuild/dist/p2pproxy_0.1/javax.servlet.jar  antbuild/dist/p2pproxy_0.1/org.mortbay.jetty.jar \
-        antbuild/dist/p2pproxy_0.1/jstun-0.7.0.jar    antbuild/dist/p2pproxy_0.1/p2pproxy.jar \
-        antbuild/dist/p2pproxy_0.1/junit-4.3.1.jar    antbuild/dist/p2pproxy_0.1/sip.jar
+        $(top_builddir)/antbuild/dist/p2pproxy_0.1/bcprov-jdk14.jar   $(top_builddir)/antbuild/dist/p2pproxy_0.1/log4j.jar \
+        $(top_builddir)/antbuild/dist/p2pproxy_0.1/javax.servlet.jar  $(top_builddir)/antbuild/dist/p2pproxy_0.1/org.mortbay.jetty.jar \
+        $(top_builddir)/antbuild/dist/p2pproxy_0.1/jstun-0.7.0.jar    $(top_builddir)/antbuild/dist/p2pproxy_0.1/p2pproxy.jar \
+        $(top_builddir)/antbuild/dist/p2pproxy_0.1/junit-4.3.1.jar    $(top_builddir)/antbuild/dist/p2pproxy_0.1/sip.jar
 
 $(ALL_JARS):    src/org/linphone/p2pproxy/*/*.java

p2pproxy/build.xml

@@ -35 +35 @@
    <mkdir dir="${dist.dir}"/>
    <mkdir dir="antbuild/META-INF"/>
-   <copy todir="antbuild" includeemptydirs="false">
+   <copy overwrite="true" todir="antbuild" includeemptydirs="false">
      <fileset dir="src" excludes="**/*.launch, **/*.java"/>
    </copy>
@@ -67 +67 @@
       <classpath refid="p2pproxy.classpath"/>
     </javac>
-   <copy todir="antbuild/p2pproxy">
+    <copy overwrite="true" todir="antbuild/p2pproxy">
          <fileset dir="${jxta-src}/impl/src">
             <include name="**/*.properties"/>
@@ -73 +73 @@
          </fileset>  
    </copy> 
-      <copy todir="antbuild/p2pproxy">
+   <copy overwrite="true" todir="antbuild/p2pproxy">
             <fileset dir="${jxta-src}/api/src">
                <include name="**/*.properties"/>
@@ -161 +161 @@
   <target name="dist" depends="build-project">
    <!--prep-->
-   <copy todir="${dist.dir}">
+   <copy overwrite="true" todir="${dist.dir}" >
             <fileset dir="dependencies">
                <include name="*"/>

p2pproxy/configure.ac

@@ -46 +46 @@
 
 AC_PATH_PROG(ANT,ant,false)
+
+AC_PATH_PROG(SWIG,swig,false)
 
 if test x$ANT = xfalse ; then

p2pproxy/launcher/src/p2pproxy.c

@@ -21 +21 @@
         JNIEnv *lJniEnv = 0;\
         jclass  lMainClass = 0;\
+        if (p2pproxy_application_jvm==0) return P2PPROXY_ERROR_APPLICATION_NOT_STARTED; \
         lResult = (*p2pproxy_application_jvm)->AttachCurrentThread(p2pproxy_application_jvm,(void**)&lJniEnv,NULL);\
         if (lResult != 0) { \
@@ -177 +178 @@
         jmethodID stateMethod;
         GET_JNI_ENV
-        
         stateMethod = (*lJniEnv)->GetStaticMethodID(lJniEnv, lMainClass, "getState", "()I");
         lResult = (*lJniEnv)->CallStaticIntMethod(lJniEnv, lMainClass, stateMethod);

p2pproxy/plugin-src/fonis.c

@@ -41 +41 @@
                 ms_thread_create(&fonis_thread,NULL,fonis_thread_func,NULL);
                 initd=TRUE;
+                while( p2pproxy_application_get_state()==P2PPROXY_ERROR_APPLICATION_NOT_STARTED){
+                        usleep(200000);
+                        ms_message("Waiting for p2pproxy to start");
+                }
         }
-        sleep(4);
         return TRUE;
 }