- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5619 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: achaloyan Date: Mon Aug 20 08:44:13 2007 New Revision: 5619 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: mutex must be locked before channel_add call Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 08:44:13 2007 @@ -331,9 +331,8 @@ return SWITCH_STATUS_FALSE; } - mrcp_client_context_channel_add(asr_session->profile->mrcp_context, asr_session->client_session, asr_channel, NULL); - switch_mutex_lock(asr_session->flag_mutex); + mrcp_client_context_channel_add(asr_session->profile->mrcp_context, asr_session->client_session, asr_channel, NULL); if(switch_thread_cond_timedwait(asr_session->wait_object,asr_session->flag_mutex,5000*1000) != APR_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No response from client stack\n"); } @@ -577,9 +576,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create synthesizer channel\n"); return SWITCH_STATUS_FALSE; } - mrcp_client_context_channel_add(tts_session->profile->mrcp_context, tts_session->client_session, tts_channel, NULL); - switch_mutex_lock(tts_session->flag_mutex); + mrcp_client_context_channel_add(tts_session->profile->mrcp_context, tts_session->client_session, tts_channel, NULL); if(switch_thread_cond_timedwait(tts_session->wait_object,tts_session->flag_mutex,5000*1000) != APR_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No response from client stack\n"); }

1 0

[commit] r5618 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: achaloyan Date: Mon Aug 20 06:57:26 2007 New Revision: 5618 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: dos2unix Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 06:57:26 2007 @@ -91,7 +91,7 @@ apr_pool_t *pool; switch_speech_flag_t flags; switch_mutex_t *flag_mutex; - switch_thread_cond_t *wait_object; + switch_thread_cond_t *wait_object; } openmrcp_session_t; typedef enum { @@ -137,10 +137,10 @@ openmrcp_session->mrcp_message_last_rcvd = NULL; switch_mutex_init(&openmrcp_session->flag_mutex, SWITCH_MUTEX_NESTED, openmrcp_session->pool); - - if (switch_thread_cond_create(&openmrcp_session->wait_object, openmrcp_session->pool)) { + + if (switch_thread_cond_create(&openmrcp_session->wait_object, openmrcp_session->pool)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "wait object creation failed\n"); - } + } openmrcp_session->client_session = mrcp_client_context_session_create(openmrcp_session->profile->mrcp_context,openmrcp_session); if (!openmrcp_session->client_session) { @@ -184,11 +184,11 @@ if(!openmrcp_session) { return MRCP_STATUS_FAILURE; } - switch_mutex_lock(openmrcp_session->flag_mutex); + switch_mutex_lock(openmrcp_session->flag_mutex); openmrcp_session->control_channel = control_channel; openmrcp_session->audio_channel = audio_channel; - switch_thread_cond_signal(openmrcp_session->wait_object); - switch_mutex_unlock(openmrcp_session->flag_mutex); + switch_thread_cond_signal(openmrcp_session->wait_object); + switch_mutex_unlock(openmrcp_session->flag_mutex); return MRCP_STATUS_SUCCESS; } @@ -333,11 +333,11 @@ mrcp_client_context_channel_add(asr_session->profile->mrcp_context, asr_session->client_session, asr_channel, NULL); - switch_mutex_lock(asr_session->flag_mutex); - if(switch_thread_cond_timedwait(asr_session->wait_object,asr_session->flag_mutex,5000*1000) != APR_SUCCESS) { + switch_mutex_lock(asr_session->flag_mutex); + if(switch_thread_cond_timedwait(asr_session->wait_object,asr_session->flag_mutex,5000*1000) != APR_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No response from client stack\n"); - } - switch_mutex_unlock(asr_session->flag_mutex); + } + switch_mutex_unlock(asr_session->flag_mutex); if(!asr_session->control_channel) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No recognizer channel available\n"); return SWITCH_STATUS_FALSE; @@ -579,11 +579,11 @@ } mrcp_client_context_channel_add(tts_session->profile->mrcp_context, tts_session->client_session, tts_channel, NULL); - switch_mutex_lock(tts_session->flag_mutex); - if(switch_thread_cond_timedwait(tts_session->wait_object,tts_session->flag_mutex,5000*1000) != APR_SUCCESS) { + switch_mutex_lock(tts_session->flag_mutex); + if(switch_thread_cond_timedwait(tts_session->wait_object,tts_session->flag_mutex,5000*1000) != APR_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No response from client stack\n"); - } - switch_mutex_unlock(tts_session->flag_mutex); + } + switch_mutex_unlock(tts_session->flag_mutex); if(!tts_session->control_channel) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No synthesizer channel available\n"); return SWITCH_STATUS_FALSE; @@ -631,8 +631,8 @@ { openmrcp_session_t *tts_session = (openmrcp_session_t *) sh->private_info; size_t return_len=0; - media_frame_t media_frame; - audio_source_t *audio_source; + media_frame_t media_frame; + audio_source_t *audio_source; if (switch_test_flag(tts_session, FLAG_SPEAK_COMPLETE)) { /* tell fs we are done */ @@ -640,7 +640,7 @@ return SWITCH_STATUS_BREAK; } - audio_source = mrcp_client_audio_source_get(tts_session->audio_channel); + audio_source = mrcp_client_audio_source_get(tts_session->audio_channel); if(!audio_source) { return SWITCH_STATUS_BREAK; } @@ -654,16 +654,16 @@ /* sampling rate and frame size should be retrieved from audio source */ *rate = 8000; - media_frame.codec_frame.size = 160; - while(return_len < *datalen) { - media_frame.codec_frame.buffer = (char*)data + return_len; - audio_source->method_set->read_frame(audio_source,&media_frame); - if(media_frame.type != MEDIA_FRAME_TYPE_AUDIO) { - memset(media_frame.codec_frame.buffer,0,media_frame.codec_frame.size); - } - return_len += media_frame.codec_frame.size; - } - *datalen = return_len; + media_frame.codec_frame.size = 160; + while(return_len < *datalen) { + media_frame.codec_frame.buffer = (char*)data + return_len; + audio_source->method_set->read_frame(audio_source,&media_frame); + if(media_frame.type != MEDIA_FRAME_TYPE_AUDIO) { + memset(media_frame.codec_frame.buffer,0,media_frame.codec_frame.size); + } + return_len += media_frame.codec_frame.size; + } + *datalen = return_len; return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r5617 - in freeswitch/trunk: . src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 19 Aug '07

19 Aug '07

Author: mikej Date: Sun Aug 19 17:20:32 2007 New Revision: 5617 Modified: freeswitch/trunk/configure.in freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Log: fix fresh build. We need to configure later becasue apr must be built before libopenmrcp configure Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sun Aug 19 17:20:32 2007 @@ -400,6 +400,6 @@ AC_CONFIG_SUBDIRS(libs/speex) AC_CONFIG_SUBDIRS(libs/xmlrpc-c) AC_CONFIG_SUBDIRS(libs/portaudio) -AC_CONFIG_SUBDIRS(libs/openmrcp) +#AC_CONFIG_SUBDIRS(libs/openmrcp) AC_OUTPUT Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Sun Aug 19 17:20:32 2007 @@ -23,7 +23,7 @@ include ../../../../build/modmake.rules $(OPENMRCP_DIR)/Makefile: - cd $(OPENMRCP_DIR) && ./configure --with-apr=../apr --with-apr-util=../apr-util --with-sofia-sip=../sofia-sip + cd $(OPENMRCP_DIR) && ./bootstrap && ./configure --with-apr=../apr --with-apr-util=../apr-util --with-sofia-sip=../sofia-sip $(OPENMRCP_LIBS): $(OPENMRCP_DIR)/Makefile cd $(OPENMRCP_DIR) && make

1 0

[commit] r5616 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 19 Aug '07

19 Aug '07

Author: mikej Date: Sun Aug 19 16:44:05 2007 New Revision: 5616 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Log: fix mod_openmrcp build on OS X Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Sun Aug 19 16:44:05 2007 @@ -18,6 +18,8 @@ LOCAL_LIBADD=$(OPENMRCP_LIBS) +LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework CoreFoundation -framework SystemConfiguration -lssl -lcrypto" ; fi ; + include ../../../../build/modmake.rules $(OPENMRCP_DIR)/Makefile:

1 0

[commit] r5615 - in freeswitch/trunk: . build src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 19 Aug '07

19 Aug '07

Author: mikej Date: Sun Aug 19 16:22:00 2007 New Revision: 5615 Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/configure.in freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Log: cleaner mod_openmrcp build in tree Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Sun Aug 19 16:22:00 2007 @@ -8,6 +8,7 @@ #applications/mod_soundtouch #applications/mod_rss #asr_tts/mod_cepstral +#asr_tts/mod_openmrcp #codecs/mod_amr codecs/mod_g711 #codecs/mod_g722 @@ -28,6 +29,7 @@ endpoints/mod_sofia #endpoints/mod_wanpipe endpoints/mod_woomera +#../../libs/openzap/mod_openzap #event_handlers/mod_cdr #event_handlers/mod_event_multicast event_handlers/mod_event_socket Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sun Aug 19 16:22:00 2007 @@ -400,5 +400,6 @@ AC_CONFIG_SUBDIRS(libs/speex) AC_CONFIG_SUBDIRS(libs/xmlrpc-c) AC_CONFIG_SUBDIRS(libs/portaudio) +AC_CONFIG_SUBDIRS(libs/openmrcp) AC_OUTPUT Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Sun Aug 19 16:22:00 2007 @@ -1,33 +1,27 @@ # define these targets in your makefile if you wish # local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: -# and define these variables to impact your build - -# TO GET THIS TO COMPILE -# hack ../../../../build/modmake.rules and remove the -# -Werror from the ALL_CFLAGS variable. - # TODO -# - re-enable the -Werror flag after openmrcp compilation warnings are fixed # - needs to compile/link against the _freeswitch_ sofia libs (see FIXME) -# - Should this download and build openmrcp? What's the plan? (see FIXME) -# - somehow consolidate libs and includes into less files -# FIXME!!! -OPENMRCP_DIR=/usr/src/openmrcp_trunk +OPENMRCP_DIR=../../../../libs/openmrcp OPENMRCP_INCLUDE=-I$(OPENMRCP_DIR)/mrcpcore/client/include/ -I$(OPENMRCP_DIR)/platform/openmrcpclient/include/ -I$(OPENMRCP_DIR)/mediaframe/include/ -I$(OPENMRCP_DIR)/mrcpcore/engine/include/ -I$(OPENMRCP_DIR)/mrcpcore/include/ -I$(OPENMRCP_DIR)/mrcpcore/parser/include/ -I$(OPENMRCP_DIR)/mrcpcore/server/include/ -I$(OPENMRCP_DIR)/mrcpcore/media/include/ -I$(OPENMRCP_DIR)/mrcpcore/util/include -I$(OPENMRCP_DIR)/mrcpcore/resource/include/ -OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/openmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/platform/openmrcpserver/.libs/libopenmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/server/.libs/libmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/plugin/demo/.libs/libdemoplugin.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcpmediaframe/.libs/libmrcpmediaframe.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a +OPENMRCP_LIBS=$(OPENMRCP_DIR)/platform/openmrcpclient/.libs/libopenmrcpclient.a $(OPENMRCP_DIR)/platform/openmrcpserver/.libs/libopenmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/client/.libs/libmrcpclient.a $(OPENMRCP_DIR)/mediaframe/.libs/libmediaframe.a $(OPENMRCP_DIR)/mrcpcore/engine/.libs/libmrcpengine.a $(OPENMRCP_DIR)/mrcpcore/parser/.libs/libmrcpparser.a $(OPENMRCP_DIR)/mrcpcore/server/.libs/libmrcpserver.a $(OPENMRCP_DIR)/mrcpcore/media/.libs/libmrcpmedia.a $(OPENMRCP_DIR)/mrcpcore/util/.libs/libmrcputil.a $(OPENMRCP_DIR)/mrcpcore/resource/.libs/libmrcpresource.a $(OPENMRCP_DIR)/module/plugin/demo/.libs/libdemoplugin.a $(OPENMRCP_DIR)/module/mrcpv2agent/.libs/libmrcpv2agent.a $(OPENMRCP_DIR)/module/mrcpmediaframe/.libs/libmrcpmediaframe.a $(OPENMRCP_DIR)/module/mrcpsofiasip/.libs/libmrcpsofiasip.a $(OPENMRCP_DIR)/mrcpcore/.libs/libmrcpcore.a MRCP_APR_INCLUDES = -I../../../../libs/apr/include MRCP_APU_INCLUDES = -I../../../../libs/apr-util/include -MRCP_SOFIA_INCLUDES = -I/usr/local/include/sofia-sip-1.12 # FIXME!! LOCAL_CFLAGS= -Wno-unused -LOCAL_CFLAGS+= -Wno-comment -Wno-sign-compare $(OPENMRCP_INCLUDE) $(MRCP_APR_INCLUDES) $(MRCP_APU_INCLUDES) $(MRCP_SOFIA_INCLUDES) +LOCAL_CFLAGS+= -Wno-comment -Wno-sign-compare $(OPENMRCP_INCLUDE) $(MRCP_APR_INCLUDES) $(MRCP_APU_INCLUDES) + +LOCAL_LIBADD=$(OPENMRCP_LIBS) -LOCAL_LDFLAGS=$(OPENMRCP_LIBS) -VERBOSE=TRUE include ../../../../build/modmake.rules +$(OPENMRCP_DIR)/Makefile: + cd $(OPENMRCP_DIR) && ./configure --with-apr=../apr --with-apr-util=../apr-util --with-sofia-sip=../sofia-sip + +$(OPENMRCP_LIBS): $(OPENMRCP_DIR)/Makefile + cd $(OPENMRCP_DIR) && make

1 0

[commit] r5614 - freeswitch/trunk/src/mod/codecs/mod_h26x
by Freeswitch SVN 19 Aug '07

19 Aug '07

Author: mikej Date: Sun Aug 19 04:36:25 2007 New Revision: 5614 Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/Makefile freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c Log: fix for MODCODEC-2 Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_h26x/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_h26x/Makefile Sun Aug 19 04:36:25 2007 @@ -1,2 +1,2 @@ BASE=../../../.. -include /usr/src/freeswitch.trunk/build/modmake.rules +include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c Sun Aug 19 04:36:25 2007 @@ -117,13 +117,33 @@ /*.next = */&h264_90000_implementation }; +static switch_codec_implementation_t h261_90000_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_VIDEO, + /*.ianacode */ 31, + /*.iananame */ "H261", + /*.fmtp */ NULL, + /*.samples_per_second = */ 90000, + /*.bits_per_second = */ 0, + /*.microseconds_per_frame = */ 0, + /*.samples_per_frame = */ 0, + /*.bytes_per_frame = */ 0, + /*.encoded_bytes_per_frame = */ 0, + /*.number_of_channels = */ 1, + /*.pref_frames_per_packet = */ 1, + /*.max_frames_per_packet = */ 1, + /*.init = */ switch_h26x_init, + /*.encode = */ switch_h26x_encode, + /*.decode = */ switch_h26x_decode, + /*.destroy = */ switch_h26x_destroy, + /*.next = */&h263_90000_implementation +}; SWITCH_MODULE_LOAD_FUNCTION(mod_h26x_load) { switch_codec_interface_t *codec_interface; /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_CODEC(codec_interface, "h26x video (passthru)", &h263_90000_implementation); + SWITCH_ADD_CODEC(codec_interface, "h26x video (passthru)", &h261_90000_implementation); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r5612 - freeswitch/trunk/libs/win32
by Freeswitch SVN 19 Aug '07

19 Aug '07

Author: mikej Date: Sun Aug 19 04:08:04 2007 New Revision: 5612 Modified: freeswitch/trunk/libs/win32/util.vbs Log: make windows build update version info out of configure.in settings like the autotools build. Modified: freeswitch/trunk/libs/win32/util.vbs ============================================================================== --- freeswitch/trunk/libs/win32/util.vbs (original) +++ freeswitch/trunk/libs/win32/util.vbs Sun Aug 19 04:08:04 2007 @@ -199,6 +199,30 @@ showpath = f.path & "\" End Function + +Function FindVersionStringInConfigure(strConfigFile, strVersionString) + +Set objRegEx = CreateObject("VBScript.RegExp") +objRegEx.Pattern = "[^#]AC_SUBST\(" & strVersionString & ".*\[([^\[]*)\]" + +Set objFSO = CreateObject("Scripting.FileSystemObject") +Set objFile = objFSO.OpenTextFile(strConfigFile, 1) +strSearchString = objFile.ReadAll +objFile.Close + +Set colMatches = objRegEx.Execute(strSearchString) + +strResult = "" +If colMatches.Count > 0 Then + For Each strMatch in colMatches + strResult = objRegEx.Replace(strMatch.Value, "$1") + Next +End If + + FindVersionStringInConfigure = strResult + +End Function + Sub FindReplaceInFile(FileName, sFind, sReplace) Const OpenAsASCII = 0 ' Opens the file as ASCII (TristateFalse) Const OpenAsUnicode = -1 ' Opens the file as Unicode (TristateTrue) @@ -219,30 +243,43 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest) Dim oExec + + strVerMajor = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MAJOR") + strVerMinor = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MINOR") + strVerMicro = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MICRO") + strVerRev = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_REVISION") + If Right(tmpFolder, 1) <> "\" Then tmpFolder = tmpFolder & "\" End If If Not FSO.FileExists(tmpFolder & "svnversion.exe") Then Wget ToolsBase & "svnversion.exe", tmpFolder End If Dim sLastFile - Const OverwriteIfExist = -1 - Const ForReading = 1 - VersionCmd="svnversion " & quote & VersionDir & "." & quote & " -n" - Set MyFile = fso.CreateTextFile(tmpFolder & "tmpVersion.Bat", True) - MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote ) - MyFile.WriteLine("@" & VersionCmd) - MyFile.Close - Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote) - Do - strFromProc = OExec.StdOut.ReadLine() - VERSION=strFromProc - Loop While Not OExec.StdOut.atEndOfStream - sLastVersion = "" - Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII) - If Not sLastFile.atEndOfStream Then - sLastVersion = sLastFile.ReadLine() - End If - sLastFile.Close + Const OverwriteIfExist = -1 + Const ForReading = 1 + + if strVerRev = "" Then + VersionCmd="svnversion " & quote & VersionDir & "." & quote & " -n" + Set MyFile = fso.CreateTextFile(tmpFolder & "tmpVersion.Bat", True) + MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote ) + MyFile.WriteLine("@" & VersionCmd) + MyFile.Close + Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote) + Do + strFromProc = OExec.StdOut.ReadLine() + VERSION=strFromProc + Loop While Not OExec.StdOut.atEndOfStream + sLastVersion = "" + Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII) + If Not sLastFile.atEndOfStream Then + sLastVersion = sLastFile.ReadLine() + End If + sLastFile.Close + End If + if strVerRev <> "" Then + VERSION = strVerRev + End If + If VERSION = "" Then VERSION = "UNKNOWN" End If @@ -253,7 +290,11 @@ MyFile.Close FSO.CopyFile includebase, includedest, true - FindReplaceInFile includedest, "@SVN_VERSION@", VERSION + FindReplaceInFile includedest, "@SWITCH_VERSION_REVISION@", VERSION + FindReplaceInFile includedest, "@SWITCH_VERSION_MAJOR@", strVerMajor + FindReplaceInFile includedest, "@SWITCH_VERSION_MINOR@", strVerMinor + FindReplaceInFile includedest, "@SWITCH_VERSION_MICRO@", strVerMicro + End If End Sub

1 0

[commit] r5611 - freeswitch/trunk
by Freeswitch SVN 19 Aug '07

19 Aug '07

Author: mikej Date: Sun Aug 19 01:13:01 2007 New Revision: 5611 Modified: freeswitch/trunk/Freeswitch.sln Log: remove some files that are no longer in tree from the solution. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sun Aug 19 01:13:01 2007 @@ -550,13 +550,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build System", "_Build System", "{DB1024A8-41BF-4AD7-9AE6-13202230D1F3}" ProjectSection(SolutionItems) = preProject acsite.m4 = acsite.m4 - build\addenv.sh = build\addenv.sh - build\build.sh = build\build.sh build\buildlib.sh = build\buildlib.sh - build\checkversion.sh = build\checkversion.sh configure.in = configure.in Makefile.am = Makefile.am - build\modmake.sh = build\modmake.sh build\modules.conf.in = build\modules.conf.in libs\win32\util.vbs = libs\win32\util.vbs EndProjectSection

1 0

[commit] r5610 - in freeswitch/trunk: . src/include w32/Library
by Freeswitch SVN 19 Aug '07

19 Aug '07

Author: mikej Date: Sun Aug 19 01:01:08 2007 New Revision: 5610 Added: freeswitch/trunk/src/include/switch_version.h.template Removed: freeswitch/trunk/src/include/switch_version.h.in Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: modify how we build switch_version.h so we can better handle releases Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Aug 19 01:01:08 2007 @@ -161,13 +161,20 @@ touch .version src/include/switch_version.h: $(top_srcdir)/src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS) - @force=0 ; \ - version=`svnversion . -n || echo hacked` ; \ - oldversion=`cat .version 2>/dev/null || echo "0"` ; \ - test ! -f src/include/switch_version.h || grep "@SVN_VERSION@" src/include/switch_version.h && force=1 ; \ - if test "$$oldversion" != "$$version" || test $$force = 1 ; then \ - cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$$version/g" > src/include/switch_version.h ; \ - echo $$version > .version ; \ + @have_version=1 ; \ + force=0 ; \ + grep "@SWITCH_VERSION_REVISION@" src/include/switch_version.h.in > /dev/null && have_version=0 ; \ + test ! -f src/include/switch_version.h || grep "@SWITCH_VERSION_REVISION@" src/include/switch_version.h > /dev/null && force=1 ; \ + if test $$have_version = 1 ; then \ + cat src/include/switch_version.h.in > src/include/switch_version.h ; \ + touch .version ; \ + else \ + version=`svnversion . -n || echo hacked` ; \ + oldversion=`cat .version 2>/dev/null || echo "0"` ; \ + if test "$$oldversion" != "$$version" || test $$force = 1 ; then \ + cat src/include/switch_version.h.in | sed "s/@SWITCH_VERSION_REVISION@/$$version/g" > src/include/switch_version.h ; \ + echo $$version > .version ; \ + fi ; \ fi ; update: Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sun Aug 19 01:01:08 2007 @@ -1,8 +1,16 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. +# Must change all of the below together +# For a release, set revision for that tagged release as well and uncomment +AC_INIT([freeswitch], [1.0.pre1], BUG-REPORT-ADDRESS) +AC_SUBST(SWITCH_VERSION_MAJOR, [1]) +AC_SUBST(SWITCH_VERSION_MINOR, [0]) +AC_SUBST(SWITCH_VERSION_MICRO, [pre1]) +#AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here]) + +AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template]) -AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) AC_CONFIG_AUX_DIR(build/config) AM_INIT_AUTOMAKE(libfreeswitch,0.1) AC_CONFIG_SRCDIR([src/switch.c]) Added: freeswitch/trunk/src/include/switch_version.h.template ============================================================================== --- (empty file) +++ freeswitch/trunk/src/include/switch_version.h.template Sun Aug 19 01:01:08 2007 @@ -0,0 +1,50 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Michael Jerris <mike(a)jerris.com> + * + * switch_version.h -- Version Number Header + * + */ + +#ifndef SWITCH_VERSION_H +#define SWITCH_VERSION_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define SWITCH_VERSION_MAJOR "@SWITCH_VERSION_MAJOR@" +#define SWITCH_VERSION_MINOR "@SWITCH_VERSION_MINOR@" +#define SWITCH_VERSION_MICRO "@SWITCH_VERSION_MICRO@" +#define SWITCH_VERSION_REVISION "@SWITCH_VERSION_REVISION@" +#define SWITCH_VERSION_FULL SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO " (" SWITCH_VERSION_REVISION ")" + +#ifdef __cplusplus +} +#endif + +#endif Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Sun Aug 19 01:01:08 2007 @@ -576,7 +576,7 @@ Name="Generated Header Files" > <File - RelativePath="..\..\src\include\switch_am_config.h.in" + RelativePath="..\..\src\include\switch_am_config.h.template" > <FileConfiguration Name="Debug|Win32" @@ -596,7 +596,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\src\include\switch_version.h.in" + RelativePath="..\..\src\include\switch_version.h.template" > <FileConfiguration Name="Debug|Win32" @@ -604,7 +604,7 @@ <Tool Name="VCCustomBuildTool" Description="Generating switch_version.h" - CommandLine="cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.in" "$(ProjectDir)..\..\src\include\switch_version.h"
" + CommandLine="cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.template" "$(ProjectDir)..\..\src\include\switch_version.h"
" AdditionalDependencies="..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c" Outputs="..\..\src\include\switch_version.h;lastversion" /> @@ -615,7 +615,7 @@ <Tool Name="VCCustomBuildTool" Description="Generating switch_version.h" - CommandLine="cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.in" "$(ProjectDir)..\..\src\include\switch_version.h"
" + CommandLine="cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.template" "$(ProjectDir)..\..\src\include\switch_version.h"
" AdditionalDependencies="..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c" Outputs="..\..\src\include\switch_version.h;lastversion" />

1 0

[commit] r5609 - freeswitch/trunk/src/include
by Freeswitch SVN 19 Aug '07

19 Aug '07

Author: mikej Date: Sat Aug 18 21:00:34 2007 New Revision: 5609 Modified: freeswitch/trunk/src/include/switch_version.h.in Log: Make version string have major, minor, and micro version. Modified: freeswitch/trunk/src/include/switch_version.h.in ============================================================================== --- freeswitch/trunk/src/include/switch_version.h.in (original) +++ freeswitch/trunk/src/include/switch_version.h.in Sat Aug 18 21:00:34 2007 @@ -39,8 +39,9 @@ #define SWITCH_VERSION_MAJOR "1" #define SWITCH_VERSION_MINOR "0" +#define SWITCH_VERSION_MICRO "pre1" #define SWITCH_VERSION_REVISION "@SVN_VERSION@" -#define SWITCH_VERSION_FULL SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_REVISION +#define SWITCH_VERSION_FULL SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO " (" SWITCH_VERSION_REVISION ")" #ifdef __cplusplus }

1 0