- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2418 - freeswitch/trunk/src
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: anthm Date: Mon Aug 28 19:44:38 2006 New Revision: 2418 Modified: freeswitch/trunk/src/switch_ivr.c Log: tweaks Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Aug 28 19:44:38 2006 @@ -1069,15 +1069,6 @@ data->running = 0; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); - if (switch_channel_test_flag(chan_a, CF_ORIGINATOR)) { - if (!switch_channel_test_flag(chan_b, CF_TRANSFER)) { - switch_core_session_kill_channel(session_b, SWITCH_SIG_KILL); - switch_channel_hangup(chan_b, SWITCH_CAUSE_NORMAL_CLEARING); - } - switch_channel_clear_flag(chan_a, CF_ORIGINATOR); - his_thread->running = 0; - } - switch_channel_clear_flag(chan_a, CF_BRIDGED); data->running = 0; return NULL; @@ -1645,7 +1636,7 @@ switch_channel_add_state_handler(peer_channel, &audio_bridge_peer_state_handlers); - if (switch_channel_test_flag(peer_channel, CF_ANSWERED)) { + if (switch_channel_test_flag(peer_channel, CF_ANSWERED) && !switch_channel_test_flag(caller_channel, CF_ANSWERED)) { switch_channel_answer(caller_channel); } @@ -1685,7 +1676,18 @@ this_audio_thread->objs[4] = NULL; this_audio_thread->objs[5] = NULL; this_audio_thread->running = 2; + + + if (!switch_channel_test_flag(peer_channel, CF_TRANSFER)) { + switch_core_session_kill_channel(peer_session, SWITCH_SIG_KILL); + switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING); + } + + switch_channel_clear_flag(caller_channel, CF_ORIGINATOR); + other_audio_thread->running = 0; + switch_core_session_rwunlock(peer_session); + } else { status = SWITCH_STATUS_FALSE; }

1 0

[commit] r2417 - in freeswitch/trunk/src: . include mod/endpoints/mod_dingaling mod/endpoints/mod_exosip mod/endpoints/mod_sofia
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: anthm Date: Mon Aug 28 19:05:26 2006 New Revision: 2417 Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_rtp.c Log: tweaks Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Mon Aug 28 19:05:26 2006 @@ -140,6 +140,13 @@ SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session); /*! + \brief Test if an RTP session is ready + \param rtp_session an RTP session to test + \return a true value if it's ready +*/ +SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session); + +/*! \brief Destroy an RTP session \param rtp_session an RTP session to destroy */ Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Aug 28 19:05:26 2006 @@ -286,7 +286,7 @@ int ms = 20; switch_rtp_flag_t flags; - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { return 1; } @@ -695,7 +695,7 @@ ldl_session_destroy(&tech_pvt->dlsession); } - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_rtp_destroy(&tech_pvt->rtp_session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NUKE RTP\n"); tech_pvt->rtp_session = NULL; @@ -734,7 +734,7 @@ } - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_rtp_kill_socket(tech_pvt->rtp_session); } @@ -1629,7 +1629,7 @@ if (*msg == '+') { switch_channel_queue_dtmf(channel, msg + 1); switch_set_flag_locked(tech_pvt, TFLAG_DTMF); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_BREAK); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Mon Aug 28 19:05:26 2006 @@ -490,7 +490,7 @@ { int loops = 0;//, sock = -1; - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { while (loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) { switch_yield(10000); loops++; @@ -587,7 +587,7 @@ key, &err, switch_core_session_get_pool(tech_pvt->session)); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { uint8_t vad_in = switch_test_flag(tech_pvt, TFLAG_VAD_IN) ? 1 : 0; uint8_t vad_out = switch_test_flag(tech_pvt, TFLAG_VAD_OUT) ? 1 : 0; uint8_t inb = switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? 0 : 1; @@ -840,7 +840,7 @@ switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_set_flag_locked(tech_pvt, TFLAG_BYE); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_rtp_kill_socket(tech_pvt->rtp_session); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 28 19:05:26 2006 @@ -579,7 +579,7 @@ { int loops = 0;//, sock = -1; - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { while (loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) { switch_yield(10000); loops++; @@ -606,7 +606,7 @@ assert(tech_pvt->codecs[tech_pvt->codec_index] != NULL); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { return SWITCH_STATUS_SUCCESS; } @@ -680,7 +680,7 @@ &err, switch_core_session_get_pool(tech_pvt->session)); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { uint8_t vad_in = switch_test_flag(tech_pvt, TFLAG_VAD_IN) ? 1 : 0; uint8_t vad_out = switch_test_flag(tech_pvt, TFLAG_VAD_OUT) ? 1 : 0; uint8_t inb = switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? 0 : 1; @@ -906,7 +906,7 @@ switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_set_flag_locked(tech_pvt, TFLAG_HUP); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_rtp_kill_socket(tech_pvt->rtp_session); } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Aug 28 19:05:26 2006 @@ -1242,7 +1242,8 @@ *frame = NULL; while (switch_channel_test_flag(session->channel, CF_HOLD)) { - return SWITCH_STATUS_BREAK; + status = SWITCH_STATUS_BREAK; + goto done; } if (session->endpoint_interface->io_routines->read_frame) { @@ -1261,15 +1262,20 @@ } } - if (status != SWITCH_STATUS_SUCCESS || !(*frame)) { - return status; + if (status != SWITCH_STATUS_SUCCESS) { + goto done; } + if (!(*frame)) { + goto done; + } + assert(session != NULL); assert(*frame != NULL); if (switch_test_flag(*frame, SFF_CNG)) { - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto done; } if ((session->read_codec && (*frame)->codec && session->read_codec->implementation != (*frame)->codec->implementation)) { @@ -1318,7 +1324,7 @@ default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s decoder error!\n", session->read_codec->codec_interface->interface_name); - return status; + goto done; } } if (session->read_resampler) { @@ -1346,7 +1352,8 @@ switch_buffer_create(session->pool, &session->raw_read_buffer, bytes); } if (!switch_buffer_write(session->raw_read_buffer, read_frame->data, read_frame->datalen)) { - return SWITCH_STATUS_MEMERR; + status = SWITCH_STATUS_MEMERR; + goto done; } } @@ -1401,6 +1408,11 @@ goto top; } } + } + + done: + if (!(*frame)) { + status = SWITCH_STATUS_FALSE; } return status; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Aug 28 19:05:26 2006 @@ -170,6 +170,7 @@ struct switch_rtp_rfc2833_data dtmf_data; uint8_t mini; switch_payload_t te; + switch_mutex_t *flag_mutex; }; static int global_init = 0; @@ -332,9 +333,9 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { switch_socket_opt_set(rtp_session->sock, APR_SO_NONBLOCK, TRUE); - switch_set_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); } - switch_set_flag(rtp_session, SWITCH_RTP_FLAG_IO); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_IO); return SWITCH_STATUS_SUCCESS; } @@ -378,9 +379,13 @@ return SWITCH_STATUS_MEMERR; } + + rtp_session->pool = pool; rtp_session->flags = flags; rtp_session->te = 101; + + switch_mutex_init(&rtp_session->flag_mutex, SWITCH_MUTEX_NESTED, rtp_session->pool); switch_mutex_init(&rtp_session->dtmf_data.dtmf_mutex, SWITCH_MUTEX_NESTED, rtp_session->pool); switch_buffer_create(rtp_session->pool, &rtp_session->dtmf_data.dtmf_buffer, 128); /* for from address on recvfrom calls */ @@ -390,7 +395,7 @@ if (crypto_key) { int len; - switch_set_flag(rtp_session, SWITCH_RTP_FLAG_SECURE); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_SECURE); crypto_policy_set_rtp_default(&policy.rtp); crypto_policy_set_rtcp_default(&policy.rtcp); policy.ssrc.type = ssrc_any_inbound; @@ -502,7 +507,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { switch_rtp_miniframe_probe(rtp_session); - switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_MINI); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_MINI); } return rtp_session; @@ -537,24 +542,33 @@ SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session) { apr_socket_shutdown(rtp_session->sock, APR_SHUTDOWN_READWRITE); - switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_IO); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_IO); } +SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session) +{ + return switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) ? 1 : 0; +} SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session) { + + if (!switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_IO)) { + return; + } + switch_rtp_kill_socket(*rtp_session); switch_socket_close((*rtp_session)->sock); if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_VAD)) { switch_rtp_disable_vad(*rtp_session); } + if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE)) { srtp_dealloc((*rtp_session)->recv_ctx); srtp_dealloc((*rtp_session)->send_ctx); } - *rtp_session = NULL; return; } @@ -591,7 +605,7 @@ SWITCH_DECLARE(void) switch_rtp_set_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) { - switch_set_flag(rtp_session, flags); + switch_set_flag_locked(rtp_session, flags); } @@ -605,7 +619,7 @@ SWITCH_DECLARE(void) switch_rtp_clear_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) { - switch_clear_flag(rtp_session, flags); + switch_clear_flag_locked(rtp_session, flags); } @@ -698,7 +712,7 @@ status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *)&rtp_session->recv_msg, &bytes); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { - switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_BREAK); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); return 0; } @@ -727,7 +741,7 @@ uint32_t effective_size = (uint32_t)(bytes - sizeof(srtp_mini_hdr_t)); if (rtp_session->recv_msg.header.pt == RTP_MAGIC_NUMBER) { if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { - switch_set_flag(rtp_session, SWITCH_RTP_FLAG_MINI); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_MINI); rtp_session->rpacket_size = ntohl(rtp_session->recv_msg.header.ts); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "YAY MINI-RTP! %d\n", rtp_session->rpacket_size); switch_rtp_miniframe_probe(rtp_session); @@ -802,7 +816,7 @@ switch_rtp_set_remote_address(rtp_session, tx_host, rtp_session->from_addr->port, &err); } } - switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); } } @@ -1231,7 +1245,7 @@ return SWITCH_STATUS_GENERR; } switch_core_codec_destroy(&rtp_session->vad_data.vad_codec); - switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_VAD); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_VAD); return SWITCH_STATUS_SUCCESS; } @@ -1268,7 +1282,7 @@ rtp_session->vad_data.start = 0; rtp_session->vad_data.next_scan = time(NULL); rtp_session->vad_data.scan_freq = 0; - switch_set_flag(rtp_session, SWITCH_RTP_FLAG_VAD); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_VAD); switch_set_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_CNG); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r2416 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: anthm Date: Mon Aug 28 12:40:05 2006 New Revision: 2416 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: WIP Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 28 12:40:05 2006 @@ -52,6 +52,7 @@ #include <sofia-sip/nua.h> #include <sofia-sip/sip_status.h> #include <sofia-sip/sdp.h> +#include <sofia-sip/sip_protos.h> #define DBFILE "sofia" static const char modname[] = "mod_sofia"; @@ -167,6 +168,8 @@ switch_mutex_t *flag_mutex; switch_payload_t te; nua_handle_t *nh; + su_home_t *home; + sip_contact_t *contact; }; /* Function Prototypes */ @@ -351,6 +354,10 @@ tech_pvt->profile = profile; tech_pvt->te = profile->te; tech_pvt->session = session; + + tech_pvt->home = su_home_new(sizeof(*tech_pvt->home)); + su_home_init(tech_pvt->home); + switch_core_session_set_private(session, tech_pvt); tech_set_codecs(tech_pvt); @@ -535,6 +542,10 @@ deactivate_rtp(tech_pvt); + su_home_deinit(tech_pvt->home); + + + if (tech_pvt->nh) { if (!switch_test_flag(tech_pvt, TFLAG_BYE)) { nua_bye(tech_pvt->nh, TAG_END()); @@ -712,7 +723,8 @@ set_local_sdp(tech_pvt); activate_rtp(tech_pvt); if (tech_pvt->nh) { - nua_respond(tech_pvt->nh, SIP_200_OK, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); + tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE("sip:1000@208.64.200.40"), NULL); + nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local SDP:\n%s\n", tech_pvt->local_sdp_str); } } @@ -987,7 +999,7 @@ tech_choose_port(tech_pvt); set_local_sdp(tech_pvt); activate_rtp(tech_pvt); - nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); + nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); //nua_respond(tech_pvt->nh, SIP_200_OK, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); } } @@ -1203,8 +1215,7 @@ break; case nua_callstate_proceeding: if (session && r_sdp) { - su_home_t home[1] = { SU_HOME_INIT(home) }; - sdp_parser_t *parser = sdp_parse(home, r_sdp, (int)strlen(r_sdp), 0); + sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_session_t *sdp; uint8_t match = 0; @@ -1218,9 +1229,6 @@ sdp_parser_free(parser); } - if (home) { - su_home_deinit(home); - } if (match) { tech_choose_port(tech_pvt); @@ -1231,17 +1239,17 @@ } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); break; case nua_callstate_completing: nua_ack(nh, TAG_END()); break; case nua_callstate_received: if (session && r_sdp) { - su_home_t home[1] = { SU_HOME_INIT(home) }; - sdp_parser_t *parser = sdp_parse(home, r_sdp, (int)strlen(r_sdp), 0); + sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_session_t *sdp; uint8_t match = 0; + if (tech_pvt->num_codecs) { if ((sdp = sdp_session(parser))) { @@ -1253,12 +1261,9 @@ sdp_parser_free(parser); } - if (home) { - su_home_deinit(home); - } if (match) { - switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); + switch_channel_set_variable(channel, "endpoint_disposition", "RECEIVED"); switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_core_session_thread_launch(session); @@ -1267,7 +1272,7 @@ } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); break; case nua_callstate_early: break; @@ -1276,8 +1281,7 @@ case nua_callstate_ready: if (session) { if (r_sdp) { - su_home_t home[1] = { SU_HOME_INIT(home) }; - sdp_parser_t *parser = sdp_parse(home, r_sdp, (int)strlen(r_sdp), 0); + sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_session_t *sdp; uint8_t match = 0; @@ -1291,11 +1295,9 @@ sdp_parser_free(parser); } - if (home) { - su_home_deinit(home); - } if (match) { + switch_set_flag_locked(tech_pvt, TFLAG_ANS); switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); tech_choose_port(tech_pvt); activate_rtp(tech_pvt); @@ -1309,7 +1311,7 @@ } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); break; case nua_callstate_terminating: break;

1 0

[commit] r2415 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: brian Date: Sun Aug 27 23:14:21 2006 New Revision: 2415 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: adding note Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sun Aug 27 23:14:21 2006 @@ -1736,6 +1736,10 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) { + /* Adding Note so we can destroy these properly. Will remind tony. + * nua_destroy (nua); + * su_root_destroy (root); + */ su_deinit(); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r2414 - freeswitch/trunk/libs/win32
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: mikej Date: Sun Aug 27 22:01:41 2006 New Revision: 2414 Modified: freeswitch/trunk/libs/win32/util.vbs Log: use different bat file names so multi proc systems can download more than one lib at a time without failing. Modified: freeswitch/trunk/libs/win32/util.vbs ============================================================================== --- freeswitch/trunk/libs/win32/util.vbs (original) +++ freeswitch/trunk/libs/win32/util.vbs Sun Aug 27 22:01:41 2006 @@ -25,7 +25,7 @@ Else UseWgetEXE=false End If - +Randomize Set objArgs = WScript.Arguments quote=Chr(34) ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName)) @@ -91,19 +91,20 @@ End Sub Sub UnCompress(Archive, DestFolder) + batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat" wscript.echo("Extracting: " & Archive) - Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True) + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Archive & quote & " -y -o" & quote & DestFolder & quote ) MyFile.Close - Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat") + Set oExec = WshShell.Exec(UtilsDir & batname) Do WScript.Echo OExec.StdOut.ReadLine() Loop While Not OExec.StdOut.atEndOfStream If FSO.FileExists(Left(Archive, Len(Archive)-3))Then - Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True) + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Left(Archive, Len(Archive)-3) & quote & " -y -o" & quote & DestFolder & quote ) MyFile.Close - Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat") + Set oExec = WshShell.Exec(UtilsDir & batname) Do WScript.Echo OExec.StdOut.ReadLine() Loop While Not OExec.StdOut.atEndOfStream @@ -111,10 +112,10 @@ FSO.DeleteFile Left(Archive, Len(Archive)-3) ,true End If If FSO.FileExists(Left(Archive, Len(Archive)-3) & "tar")Then - Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True) + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Left(Archive, Len(Archive)-3) & "tar" & quote & " -y -o" & quote & DestFolder & quote ) MyFile.Close - Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat") + Set oExec = WshShell.Exec(UtilsDir & batname) Do WScript.Echo OExec.StdOut.ReadLine() Loop While Not OExec.StdOut.atEndOfStream @@ -123,6 +124,9 @@ End If WScript.Sleep(500) + If FSO.FileExists(UtilsDir & batname)Then + FSO.DeleteFile UtilsDir & batname, True + End If End Sub Sub Wget(URL, DestFolder) @@ -134,11 +138,12 @@ Wscript.echo("Downloading: " & URL) If UseWgetEXE Then - Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True) + batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat" + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) MyFile.WriteLine("@cd " & quote & DestFolder & quote) MyFile.WriteLine("@" & quote & UtilsDir & "wget.exe" & quote & " " & URL) MyFile.Close - Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat") + Set oExec = WshShell.Exec(UtilsDir & batname) Do WScript.Echo OExec.StdOut.ReadLine() Loop While Not OExec.StdOut.atEndOfStream

1 0

[commit] r2413 - in freeswitch/trunk/libs/win32: js pcre sqlite
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: mikej Date: Sun Aug 27 21:35:49 2006 New Revision: 2413 Modified: freeswitch/trunk/libs/win32/js/fdlibm.vcproj freeswitch/trunk/libs/win32/js/js.vcproj freeswitch/trunk/libs/win32/pcre/libpcre.vcproj freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj Log: cleanup msvc build targets and remove incremental build settings from libs. Modified: freeswitch/trunk/libs/win32/js/fdlibm.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/js/fdlibm.vcproj (original) +++ freeswitch/trunk/libs/win32/js/fdlibm.vcproj Sun Aug 27 21:35:49 2006 @@ -43,10 +43,10 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;WIN32;_X86_=1;_WINDOWS;_IEEE_LIBM" RuntimeLibrary="3" - PrecompiledHeaderFile=".\..\Debug/fdlibm.pch" - AssemblerListingLocation=".\..\Debug/" - ObjectFile=".\..\Debug/" - ProgramDataBaseFileName=".\..\Debug/" + PrecompiledHeaderFile="$(IntDir)\fdlibm.pch" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="1" @@ -116,10 +116,10 @@ StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" - PrecompiledHeaderFile=".\..\Release/fdlibm.pch" - AssemblerListingLocation=".\..\Release/" - ObjectFile=".\..\Release/" - ProgramDataBaseFileName=".\..\Release/" + PrecompiledHeaderFile="$(IntDir)\fdlibm.pch" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="3" SuppressStartupBanner="true" /> Modified: freeswitch/trunk/libs/win32/js/js.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/js/js.vcproj (original) +++ freeswitch/trunk/libs/win32/js/js.vcproj Sun Aug 27 21:35:49 2006 @@ -53,10 +53,10 @@ StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" - PrecompiledHeaderFile=".\Release/js.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PrecompiledHeaderFile="$(IntDir)\js.pch" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="3" SuppressStartupBanner="true" /> @@ -150,10 +150,10 @@ PreprocessorDefinitions="_DEBUG;DEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE" MinimalRebuild="true" RuntimeLibrary="3" - PrecompiledHeaderFile=".\Debug/js.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="$(IntDir)\js.pch" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="3" Modified: freeswitch/trunk/libs/win32/pcre/libpcre.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/pcre/libpcre.vcproj (original) +++ freeswitch/trunk/libs/win32/pcre/libpcre.vcproj Sun Aug 27 21:35:49 2006 @@ -252,7 +252,7 @@ Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib" OutputFile="$(OutDir)\$(ProjectName).dll" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" ModuleDefinitionFile="$(InputDir)..\..\pcre-6.4\pcre.def" GenerateDebugInformation="true" Modified: freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj (original) +++ freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj Sun Aug 27 21:35:49 2006 @@ -49,7 +49,7 @@ UsePrecompiledHeader="0" WarningLevel="0" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -177,7 +177,7 @@ UsePrecompiledHeader="0" WarningLevel="0" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -190,6 +190,7 @@ /> <Tool Name="VCLinkerTool" + LinkIncremental="1" ModuleDefinitionFile="../../sqlite-source-3_3_6/sqlite3.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" @@ -267,6 +268,7 @@ /> <Tool Name="VCLinkerTool" + LinkIncremental="1" ModuleDefinitionFile="../../sqlite-source-3_3_6/sqlite3.def" ImportLibrary="$(IntDir)/$(TargetName).lib" />

1 0

[commit] r2411 - in freeswitch/trunk: . w32/Console w32/Library w32/vsnet
by Freeswitch SVN 27 Aug '06

27 Aug '06

Author: mikej Date: Sun Aug 27 17:00:28 2006 New Revision: 2411 Added: freeswitch/trunk/w32/Console/ freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj.user freeswitch/trunk/w32/Library/ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Removed: freeswitch/trunk/w32/vsnet/ Modified: freeswitch/trunk/Freeswitch.sln Log: windows build cleanup. Remove unused files. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sun Aug 27 17:00:28 2006 @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\vsnet\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} @@ -9,7 +9,7 @@ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\vsnet\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" ProjectSection(ProjectDependencies) = postProject {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} Added: freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj Sun Aug 27 17:00:28 2006 @@ -0,0 +1,258 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="FreeSwitchConsole" + ProjectGUID="{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}" + RootNamespace="FreeSwitchConsole" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(InputDir)include";"$(InputDir)..\libs\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe" + LinkIncremental="1" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/FreeSwitchConsole.pdb" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)include";"$(InputDir)..\libs\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe" + LinkIncremental="1" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/FreeSwitchConsole.pdb" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\src\switch.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\src\include\switch.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_buffer.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_caller.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_channel.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_config.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_console.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_core.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_frame.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_loadable_module.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_module_interfaces.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_types.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_utils.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj.user ============================================================================== --- (empty file) +++ freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj.user Sun Aug 27 17:00:28 2006 @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioUserFile + ProjectType="Visual C++" + Version="8.00" + ShowAllFiles="false" + > + <Configurations> + <Configuration + Name="Debug|Win32" + > + <DebugSettings + Command="$(TargetPath)" + WorkingDirectory="$(OutDir)" + CommandArguments="" + Attach="false" + DebuggerType="3" + Remote="1" + RemoteMachine="MIL-MJERRIS" + RemoteCommand="" + HttpUrl="" + PDBPath="" + SQLDebugging="" + Environment="" + EnvironmentMerge="true" + DebuggerFlavor="0" + MPIRunCommand="" + MPIRunArguments="" + MPIRunWorkingDirectory="" + ApplicationCommand="" + ApplicationArguments="" + ShimCommand="" + MPIAcceptMode="" + MPIAcceptFilter="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + > + <DebugSettings + Command="$(TargetPath)" + WorkingDirectory="$(OutDir)" + CommandArguments="" + Attach="false" + DebuggerType="3" + Remote="1" + RemoteMachine="MIL-MJERRIS" + RemoteCommand="" + HttpUrl="" + PDBPath="" + SQLDebugging="" + Environment="" + EnvironmentMerge="true" + DebuggerFlavor="0" + MPIRunCommand="" + MPIRunArguments="" + MPIRunWorkingDirectory="" + ApplicationCommand="" + ApplicationArguments="" + ShimCommand="" + MPIAcceptMode="" + MPIAcceptFilter="" + /> + </Configuration> + </Configurations> +</VisualStudioUserFile> Added: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Sun Aug 27 17:00:28 2006 @@ -0,0 +1,420 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="FreeSwitchCoreLib" + ProjectGUID="{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" + RootNamespace="FreeSwitchCoreLib" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;"..\..\libs\libresample-0.1.3\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="switch.h" + PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch" + BrowseInformation="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkLibraryDependencies="true" + AdditionalDependencies="Ws2_32.lib Mswsock.lib Rpcrt4.lib" + OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)"" + AddModuleNamesToAssembly="" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb" + SubSystem="2" + OptimizeReferences="0" + EnableCOMDATFolding="0" + ImportLibrary="$(OutDir)/FreeSwitchCore.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y
if not exist $(SolutionDir)$(OutDir)\db md $(SolutionDir)$(OutDir)\db
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\log
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\htdocs

" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;"..\..\libs\libresample-0.1.3\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT" + RuntimeLibrary="2" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="switch.h" + PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch" + BrowseInformation="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkLibraryDependencies="true" + AdditionalDependencies="Ws2_32.lib Mswsock.lib Rpcrt4.lib" + OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)/FreeSwitchCore.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y
if not exist $(SolutionDir)$(OutDir)\db md $(SolutionDir)$(OutDir)\db
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\log
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\htdocs

" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\src\switch_buffer.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\switch_caller.c" + > + </File> + <File + RelativePath="..\..\src\switch_channel.c" + > + </File> + <File + RelativePath="..\..\src\switch_config.c" + > + </File> + <File + RelativePath="..\..\src\switch_console.c" + > + </File> + <File + RelativePath="..\..\src\switch_core.c" + > + </File> + <File + RelativePath="..\..\src\switch_event.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr.c" + > + </File> + <File + RelativePath="..\..\src\switch_loadable_module.c" + > + </File> + <File + RelativePath="..\..\src\switch_log.c" + > + </File> + <File + RelativePath="..\..\src\switch_resample.c" + > + </File> + <File + RelativePath="..\..\src\switch_rtp.c" + > + </File> + <File + RelativePath="..\..\src\switch_stun.c" + > + </File> + <File + RelativePath="..\..\src\switch_utils.c" + > + </File> + <File + RelativePath="..\..\src\switch_xml.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\src\include\switch.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_apr.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_buffer.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_caller.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_channel.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_config.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_console.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_core.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_event.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_frame.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_ivr.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_loadable_module.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_log.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_module_interfaces.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_platform.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_resample.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_rtp.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_sqlite.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_stun.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_types.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_utils.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_xml.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + <Filter + Name="Generated Header Files" + > + <File + RelativePath="..\..\src\include\switch_version.h.in" + > + <FileConfiguration + Name="Debug|Win32" + > + <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"
" + 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" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <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"
" + 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" + /> + </FileConfiguration> + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject>

1 0

[commit] r2410 - in freeswitch/trunk: . libs/win32 w32/vsnet
by Freeswitch SVN 27 Aug '06

27 Aug '06

Author: mikej Date: Sun Aug 27 16:37:01 2006 New Revision: 2410 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/libs/win32/util.vbs freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj Log: move creation of the version header file to use util.vbs Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sun Aug 27 16:37:01 2006 @@ -11,7 +11,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\vsnet\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" ProjectSection(ProjectDependencies) = postProject - {FE191916-DEDD-43B3-B28C-D09C9088C586} = {FE191916-DEDD-43B3-B28C-D09C9088C586} {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} @@ -154,8 +153,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "docs", "docs\docs.vcproj", "{1A1FF289-4FD6-4285-A422-D31DD67A4723}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchVersion", "w32\vsnet\FreeSwitchVersion.vcproj", "{FE191916-DEDD-43B3-B28C-D09C9088C586}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}" ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} @@ -592,10 +589,6 @@ {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|Win32.ActiveCfg = Debug|Win32 {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Release|Win32.ActiveCfg = Release|Win32 - {FE191916-DEDD-43B3-B28C-D09C9088C586}.Debug|Win32.ActiveCfg = Debug|Win32 - {FE191916-DEDD-43B3-B28C-D09C9088C586}.Debug|Win32.Build.0 = Debug|Win32 - {FE191916-DEDD-43B3-B28C-D09C9088C586}.Release|Win32.ActiveCfg = Release|Win32 - {FE191916-DEDD-43B3-B28C-D09C9088C586}.Release|Win32.Build.0 = Release|Win32 {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|Win32.ActiveCfg = Debug|Win32 {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|Win32.Build.0 = Debug|Win32 {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|Win32.ActiveCfg = Release|Win32 Modified: freeswitch/trunk/libs/win32/util.vbs ============================================================================== --- freeswitch/trunk/libs/win32/util.vbs (original) +++ freeswitch/trunk/libs/win32/util.vbs Sun Aug 27 16:37:01 2006 @@ -45,6 +45,9 @@ Wget objArgs(1), Showpath(objArgs(2)) Case "GetUnzip" WgetUnCompress objArgs(1), Showpath(objArgs(2)) + Case "Version" + 'CreateVersion(tmpFolder, VersionDir, includebase, includedest) + CreateVersion Showpath(objArgs(1)), Showpath(objArgs(2)), objArgs(3), objArgs(4) End Select End If @@ -180,3 +183,62 @@ Set f = FSO.GetFolder(folderspec) showpath = f.path & "\" 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) + Const OpenAsDefault = -2 ' Opens the file using the system default + + Const OverwriteIfExist = -1 + Const FailIfNotExist = 0 + Const ForReading = 1 + + Set fOrgFile = FSO.OpenTextFile(FileName, ForReading, FailIfNotExist, OpenAsASCII) + sText = fOrgFile.ReadAll + fOrgFile.Close + sText = Replace(sText, sFind, sReplace) + Set fNewFile = FSO.CreateTextFile(FileName, OverwriteIfExist, OpenAsASCII) + fNewFile.WriteLine sText + fNewFile.Close +End Sub + +Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest) + Dim oExec + 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(tmpFolder & "tmpVersion.Bat") + 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 + + If VERSION = "" Then + VERSION = "UNKNOWN" + End If + + If VERSION <> sLastVersion Then + Set MyFile = fso.CreateTextFile(tmpFolder & "lastversion", True) + MyFile.WriteLine(VERSION) + MyFile.Close + + FSO.CopyFile includebase, includedest, true + FindReplaceInFile includedest, "@SVN_VERSION@", VERSION + End If + +End Sub Modified: freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj Sun Aug 27 16:37:01 2006 @@ -384,6 +384,36 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > </Filter> + <Filter + Name="Generated Header Files" + > + <File + RelativePath="..\..\src\include\switch_version.h.in" + > + <FileConfiguration + Name="Debug|Win32" + > + <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"
" + 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" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <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"
" + 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" + /> + </FileConfiguration> + </File> + </Filter> </Files> <Globals> </Globals>

1 0

[commit] r2409 - freeswitch/trunk/libs/win32
by Freeswitch SVN 27 Aug '06

27 Aug '06

Author: mikej Date: Sun Aug 27 16:08:04 2006 New Revision: 2409 Modified: freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj freeswitch/trunk/libs/win32/Download APR-Util.vcproj freeswitch/trunk/libs/win32/Download APR.vcproj freeswitch/trunk/libs/win32/Download CURL.vcproj freeswitch/trunk/libs/win32/Download EXOSIP.vcproj freeswitch/trunk/libs/win32/Download HOWL.vcproj freeswitch/trunk/libs/win32/Download IKSEMEL.vcproj freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj freeswitch/trunk/libs/win32/Download LIBSNDFILE.vcproj freeswitch/trunk/libs/win32/Download PCRE.vcproj freeswitch/trunk/libs/win32/Download PORTAUDIO.vcproj freeswitch/trunk/libs/win32/Download SPEEX.vcproj freeswitch/trunk/libs/win32/Download SPIDERMONKEY.vcproj freeswitch/trunk/libs/win32/Download SQLITE.vcproj freeswitch/trunk/libs/win32/Download XMLRPC.vcproj Log: quote directory names for directories with spaces in their names. Modified: freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj (original) +++ freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj Sun Aug 27 16:08:04 2006 @@ -25,6 +25,9 @@ BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool + Name="VCPreBuildEventTool" + /> + <Tool Name="VCCustomBuildTool" /> <Tool @@ -44,6 +47,9 @@ BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool + Name="VCPreBuildEventTool" + /> + <Tool Name="VCCustomBuildTool" /> <Tool @@ -66,7 +72,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading APR-Iconv." - CommandLine="if not exist $(ProjectDir)..\apr-iconv-1.1.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz $(ProjectDir).." + CommandLine="if not exist "$(ProjectDir)..\apr-iconv-1.1.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\apr-iconv-1.1.1" /> </FileConfiguration> @@ -76,7 +82,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading APR-Iconv." - CommandLine="if not exist $(ProjectDir)..\apr-iconv-1.1.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz $(ProjectDir).." + CommandLine="if not exist "$(ProjectDir)..\apr-iconv-1.1.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\apr-iconv-1.1.1" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download APR-Util.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download APR-Util.vcproj (original) +++ freeswitch/trunk/libs/win32/Download APR-Util.vcproj Sun Aug 27 16:08:04 2006 @@ -72,7 +72,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading APR-Util." - CommandLine="if not exist $(ProjectDir)..\apr-util-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\apr-util-1.2.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\apr-util-1.2.7" /> </FileConfiguration> @@ -82,7 +82,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading APR-Util." - CommandLine="if not exist $(ProjectDir)..\apr-util-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\apr-util-1.2.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\apr-util-1.2.7" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download APR.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download APR.vcproj (original) +++ freeswitch/trunk/libs/win32/Download APR.vcproj Sun Aug 27 16:08:04 2006 @@ -26,7 +26,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="" CommandLine="" /> <Tool @@ -52,7 +51,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="" CommandLine="" /> <Tool @@ -78,7 +76,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading APR." - CommandLine="if not exist $(ProjectDir)..\apr-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz $(ProjectDir).." + CommandLine="if not exist "$(ProjectDir)..\apr-1.2.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\apr-1.2.7" /> </FileConfiguration> @@ -88,7 +86,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading APR." - CommandLine="if not exist $(ProjectDir)..\apr-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz $(ProjectDir).." + CommandLine="if not exist "$(ProjectDir)..\apr-1.2.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\apr-1.2.7" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download CURL.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download CURL.vcproj (original) +++ freeswitch/trunk/libs/win32/Download CURL.vcproj Sun Aug 27 16:08:04 2006 @@ -76,7 +76,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading CURL." - CommandLine="if not exist $(ProjectDir)..\curl-7.15.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/curl-7.15.2.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\curl-7.15.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/curl-7.15.2.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\curl-7.15.2" /> </FileConfiguration> @@ -86,7 +86,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading CURL." - CommandLine="if not exist $(ProjectDir)..\curl-7.15.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/curl-7.15.2.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\curl-7.15.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/curl-7.15.2.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\curl-7.15.2" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download EXOSIP.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download EXOSIP.vcproj (original) +++ freeswitch/trunk/libs/win32/Download EXOSIP.vcproj Sun Aug 27 16:08:04 2006 @@ -76,7 +76,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading EXOSIP." - CommandLine="if not exist $(ProjectDir)..\libosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libosip2-2.2.2.tar.gz $(ProjectDir)..
if not exist $(ProjectDir)..\libeXosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libeXosip2-2.2.2.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\libosip2-2.2.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libosip2-2.2.2.tar.gz "$(ProjectDir).."
if not exist "$(ProjectDir)..\libeXosip2-2.2.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libeXosip2-2.2.2.tar.gz "$(ProjectDir).".
" Outputs="$(ProjectDir)..\libosip2-2.2.2;$(ProjectDir)..\libeXosip2-2.2.2" /> </FileConfiguration> @@ -86,7 +86,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading EXOSIP." - CommandLine="if not exist $(ProjectDir)..\libosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libosip2-2.2.2.tar.gz $(ProjectDir)..
if not exist $(ProjectDir)..\libeXosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libeXosip2-2.2.2.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\libosip2-2.2.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libosip2-2.2.2.tar.gz "$(ProjectDir).."
if not exist "$(ProjectDir)..\libeXosip2-2.2.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libeXosip2-2.2.2.tar.gz "$(ProjectDir).".
" Outputs="$(ProjectDir)..\libosip2-2.2.2;$(ProjectDir)..\libeXosip2-2.2.2" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download HOWL.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download HOWL.vcproj (original) +++ freeswitch/trunk/libs/win32/Download HOWL.vcproj Sun Aug 27 16:08:04 2006 @@ -76,7 +76,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading HOWL." - CommandLine="if not exist $(ProjectDir)..\howl-1.0.0 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/howl-1.0.0.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\howl-1.0.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/howl-1.0.0.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\howl-1.0.0" /> </FileConfiguration> @@ -86,7 +86,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading HOWL." - CommandLine="if not exist $(ProjectDir)..\howl-1.0.0 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/howl-1.0.0.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\howl-1.0.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/howl-1.0.0.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\howl-1.0.0" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download IKSEMEL.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download IKSEMEL.vcproj (original) +++ freeswitch/trunk/libs/win32/Download IKSEMEL.vcproj Sun Aug 27 16:08:04 2006 @@ -76,7 +76,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading IKSEMEL." - CommandLine="if not exist $(ProjectDir)..\iksemel-1.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/iksemel-1.2.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\iksemel-1.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/iksemel-1.2.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\iksemel-1.2" /> </FileConfiguration> @@ -86,7 +86,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading IKSEMEL." - CommandLine="if not exist $(ProjectDir)..\iksemel-1.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/iksemel-1.2.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\iksemel-1.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/iksemel-1.2.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\iksemel-1.2" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj Sun Aug 27 16:08:04 2006 @@ -72,7 +72,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading LIBRESAMPLE." - CommandLine="if not exist $(ProjectDir)..\libresample-0.1.3 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\libresample-0.1.3" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip "$(ProjectDir).."
" Outputs="$(ProjectDir)..\libresample-0.1.3" /> </FileConfiguration> @@ -82,7 +82,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading LIBRESAMPLE." - CommandLine="if not exist $(ProjectDir)..\libresample-0.1.3 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\libresample-0.1.3" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip "$(ProjectDir).."
" Outputs="$(ProjectDir)..\libresample-0.1.3" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download LIBSNDFILE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download LIBSNDFILE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download LIBSNDFILE.vcproj Sun Aug 27 16:08:04 2006 @@ -76,7 +76,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading LIBSNDFILE." - CommandLine="if not exist $(ProjectDir)..\libsndfile-1.0.16 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libsndfile-1.0.16.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\libsndfile-1.0.16" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libsndfile-1.0.16.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\libsndfile-1.0.16" /> </FileConfiguration> @@ -86,7 +86,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading LIBSNDFILE." - CommandLine="if not exist $(ProjectDir)..\libsndfile-1.0.16 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libsndfile-1.0.16.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\libsndfile-1.0.16" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libsndfile-1.0.16.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\libsndfile-1.0.16" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download PCRE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download PCRE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download PCRE.vcproj Sun Aug 27 16:08:04 2006 @@ -72,7 +72,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading PCRE." - CommandLine="if not exist $(ProjectDir)..\pcre-6.4 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\pcre-6.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\pcre-6.4" /> </FileConfiguration> @@ -82,7 +82,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading PCRE." - CommandLine="if not exist $(ProjectDir)..\pcre-6.4 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\pcre-6.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\pcre-6.4" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download PORTAUDIO.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download PORTAUDIO.vcproj (original) +++ freeswitch/trunk/libs/win32/Download PORTAUDIO.vcproj Sun Aug 27 16:08:04 2006 @@ -76,7 +76,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading PORTAUDIO." - CommandLine="if not exist $(ProjectDir)..\portaudio_v18_1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/portaudio_v18_1.zip $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\portaudio_v18_1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/portaudio_v18_1.zip "$(ProjectDir).."
" Outputs="$(ProjectDir)..\portaudio_v18_1" /> </FileConfiguration> @@ -86,7 +86,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading PORTAUDIO." - CommandLine="if not exist $(ProjectDir)..\portaudio_v18_1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/portaudio_v18_1.zip $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\portaudio_v18_1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/portaudio_v18_1.zip "$(ProjectDir).."
" Outputs="$(ProjectDir)..\portaudio_v18_1" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download SPEEX.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download SPEEX.vcproj (original) +++ freeswitch/trunk/libs/win32/Download SPEEX.vcproj Sun Aug 27 16:08:04 2006 @@ -76,7 +76,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading SPEEX." - CommandLine="if not exist $(ProjectDir)..\speex-1.1.11.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/speex-1.1.11.1.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\speex-1.1.11.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/speex-1.1.11.1.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\speex-1.1.11.1" /> </FileConfiguration> @@ -86,7 +86,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading SPEEX." - CommandLine="if not exist $(ProjectDir)..\speex-1.1.11.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/speex-1.1.11.1.tar.gz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\speex-1.1.11.1" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/speex-1.1.11.1.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\speex-1.1.11.1" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download SPIDERMONKEY.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download SPIDERMONKEY.vcproj (original) +++ freeswitch/trunk/libs/win32/Download SPIDERMONKEY.vcproj Sun Aug 27 16:08:04 2006 @@ -76,7 +76,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading SPIDERMONKEY." - CommandLine="if not exist $(ProjectDir)..\js20051231 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/js20051231.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.debug cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.debug.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.release cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.release.zip $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\js20051231" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/js20051231.zip "$(ProjectDir).."
if not exist "$(ProjectDir)..\nspr-4.6.1.winnt5.debug" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.debug.zip "$(ProjectDir).."
if not exist "$(ProjectDir)..\nspr-4.6.1.winnt5.release" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.release.zip "$(ProjectDir).."
" Outputs="$(ProjectDir)..\js20051231" /> </FileConfiguration> @@ -86,7 +86,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading SPIDERMONKEY." - CommandLine="if not exist $(ProjectDir)..\js20051231 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/js20051231.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.debug cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.debug.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.release cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.release.zip $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\js20051231" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/js20051231.zip "$(ProjectDir).."
if not exist "$(ProjectDir)..\nspr-4.6.1.winnt5.debug" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.debug.zip "$(ProjectDir).."
if not exist "$(ProjectDir)..\nspr-4.6.1.winnt5.release" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.release.zip "$(ProjectDir).."
" Outputs="$(ProjectDir)..\js20051231" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download SQLITE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download SQLITE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download SQLITE.vcproj Sun Aug 27 16:08:04 2006 @@ -72,7 +72,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading SQLITE." - CommandLine="if not exist $(ProjectDir)..\sqlite-source-3_3_6 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\sqlite-source-3_3_6" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip "$(ProjectDir).."
" Outputs="$(ProjectDir)..\sqlite-source-3_3_6" /> </FileConfiguration> @@ -82,7 +82,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading SQLITE." - CommandLine="if not exist $(ProjectDir)..\sqlite-source-3_3_6 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\sqlite-source-3_3_6" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip "$(ProjectDir).."
" Outputs="$(ProjectDir)..\sqlite-source-3_3_6" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download XMLRPC.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download XMLRPC.vcproj (original) +++ freeswitch/trunk/libs/win32/Download XMLRPC.vcproj Sun Aug 27 16:08:04 2006 @@ -76,7 +76,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading XMLRPC." - CommandLine="if not exist $(ProjectDir)..\xmlrpc-c-1.03.14 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/xmlrpc-c-1.03.14.tgz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\xmlrpc-c-1.03.14" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/xmlrpc-c-1.03.14.tgz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\xmlrpc-c-1.03.14" /> </FileConfiguration> @@ -86,7 +86,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading XMLRPC." - CommandLine="if not exist $(ProjectDir)..\xmlrpc-c-1.03.14 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/xmlrpc-c-1.03.14.tgz $(ProjectDir)..
" + CommandLine="if not exist "$(ProjectDir)..\xmlrpc-c-1.03.14" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/xmlrpc-c-1.03.14.tgz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\xmlrpc-c-1.03.14" /> </FileConfiguration>

1 0

[commit] r2408 - freeswitch/trunk/w32/vsnet
by Freeswitch SVN 27 Aug '06

27 Aug '06

Author: mikej Date: Sun Aug 27 13:35:38 2006 New Revision: 2408 Modified: freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj Log: remove getlibs call as this is all done in the solution file now. Modified: freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj Sun Aug 27 13:35:38 2006 @@ -26,7 +26,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="cscript /nologo "$(InputDir)getlibs.vbs" Core Debug" + CommandLine="" /> <Tool Name="VCCustomBuildTool" @@ -120,7 +120,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="cscript /nologo "$(InputDir)getlibs.vbs" Core Release" + CommandLine="" /> <Tool Name="VCCustomBuildTool"

1 0