witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

fix build.

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@371 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
smorlat 2009-03-27 14:20:04 +00:00
parent ba2381e3e3
commit df5bc2715c
5 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
p2pproxy/Makefile.am
View file

@ -3,10 +3,10 @@ EXTRA_DIST=dependencies dependencies-src src test-src
SUBDIRS=launcher plugin-src SUBDIRS=launcher plugin-src
ALL_JARS= \ ALL_JARS= \
antbuild/dist/p2pproxy_0.1/bcprov-jdk14.jar antbuild/dist/p2pproxy_0.1/log4j.jar \ $(top_builddir)/antbuild/dist/p2pproxy_0.1/bcprov-jdk14.jar $(top_builddir)/antbuild/dist/p2pproxy_0.1/log4j.jar \
antbuild/dist/p2pproxy_0.1/javax.servlet.jar antbuild/dist/p2pproxy_0.1/org.mortbay.jetty.jar \ $(top_builddir)/antbuild/dist/p2pproxy_0.1/javax.servlet.jar $(top_builddir)/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 \ $(top_builddir)/antbuild/dist/p2pproxy_0.1/jstun-0.7.0.jar $(top_builddir)/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/junit-4.3.1.jar $(top_builddir)/antbuild/dist/p2pproxy_0.1/sip.jar
$(ALL_JARS): src/org/linphone/p2pproxy/*/*.java $(ALL_JARS): src/org/linphone/p2pproxy/*/*.java
$(ANT) dist $(ANT) dist

8
p2pproxy/build.xml
View file

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

2
p2pproxy/configure.ac
View file

@ -46,6 +46,8 @@ AC_SUBST(javadir)
AC_PATH_PROG(ANT,ant,false) AC_PATH_PROG(ANT,ant,false)
AC_PATH_PROG(SWIG,swig,false)
if test x$ANT = xfalse ; then if test x$ANT = xfalse ; then
AC_MSG_ERROR([ant not found: you must install ant to build this package.]) AC_MSG_ERROR([ant not found: you must install ant to build this package.])
fi fi

2
p2pproxy/launcher/src/p2pproxy.c
View file

@ -20,6 +20,7 @@ JavaVM *p2pproxy_application_jvm = 0;
jint lResult = 0 ;\ jint lResult = 0 ;\
JNIEnv *lJniEnv = 0;\ JNIEnv *lJniEnv = 0;\
jclass lMainClass = 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);\ lResult = (*p2pproxy_application_jvm)->AttachCurrentThread(p2pproxy_application_jvm,(void**)&lJniEnv,NULL);\
if (lResult != 0) { \ if (lResult != 0) { \
fprintf(stderr,"cannot attach VM\n");\ fprintf(stderr,"cannot attach VM\n");\
@ -176,7 +177,6 @@ int p2pproxy_resourcemgt_revoke_sip_proxy(const char* proxy_uri) {
int p2pproxy_application_get_state() { int p2pproxy_application_get_state() {
jmethodID stateMethod; jmethodID stateMethod;
GET_JNI_ENV GET_JNI_ENV
stateMethod = (*lJniEnv)->GetStaticMethodID(lJniEnv, lMainClass, "getState", "()I"); stateMethod = (*lJniEnv)->GetStaticMethodID(lJniEnv, lMainClass, "getState", "()I");
lResult = (*lJniEnv)->CallStaticIntMethod(lJniEnv, lMainClass, stateMethod); lResult = (*lJniEnv)->CallStaticIntMethod(lJniEnv, lMainClass, stateMethod);
(*p2pproxy_application_jvm)->DetachCurrentThread(p2pproxy_application_jvm); (*p2pproxy_application_jvm)->DetachCurrentThread(p2pproxy_application_jvm);

5
p2pproxy/plugin-src/fonis.c
View file

@ -40,8 +40,11 @@ static bool_t fonis_init(void){
if (!initd){ if (!initd){
ms_thread_create(&fonis_thread,NULL,fonis_thread_func,NULL); ms_thread_create(&fonis_thread,NULL,fonis_thread_func,NULL);
initd=TRUE; 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; return TRUE;
} }