From antoine at cs.cmu.edu Wed Aug 1 00:44:41 2007 From: antoine at cs.cmu.edu (Antoine Raux) Date: Wed, 01 Aug 2007 13:44:41 +0900 Subject: [RavenclawDev 290] VoID@Olympus udpate? Message-ID: <46B00FB9.8090101@cs.cmu.edu> Hi everyone, I hope you're all doing fine. As far as I'm concerned my internship in Japan is getting close to the end and I'll be back to Pittsburgh after Interspeech/SIGDIAL... Are there any news regarding Olympus? In particular, any progress on the VoIP front and on the subversion transition? Cheers, antoine From tkharris at cs.cmu.edu Wed Aug 1 10:19:24 2007 From: tkharris at cs.cmu.edu (Thomas K Harris) Date: Wed, 01 Aug 2007 10:19:24 -0400 Subject: [RavenclawDev 291] Re: VoID@Olympus udpate? In-Reply-To: <46B00FB9.8090101@cs.cmu.edu> References: <46B00FB9.8090101@cs.cmu.edu> Message-ID: <46B0966C.2040407@cs.cmu.edu> Hi Antoine, Everyone, On the VOIP front I'm sorry to say that the server stopped working. It was working, then not working. I hadn't made any changes, so I was confused about what the problem was. It seemed like a driver error. I reloaded everything from the os down, but we're getting the same error. Given that, I'm reluctantly concluding that the card has failed. Should we transition the rest of Olympus to subversion now? I think so. Are there any remaining concerns? On another note, I was approached by a visiting professor who was inclined to use Olympus/Ravenclaw for an HCII project here. The lack of documentation was a bit of an issue though, even though I assured him that he would be able to count on some personal support. Thanks, -Thomas Antoine Raux wrote: > Hi everyone, > > I hope you're all doing fine. As far as I'm concerned my internship in > Japan is getting close to the end and I'll be back to Pittsburgh after > Interspeech/SIGDIAL... > > Are there any news regarding Olympus? In particular, any progress on > the VoIP front and on the subversion transition? > > Cheers, > antoine > From tkharris at cs.cmu.edu Thu Aug 2 18:03:29 2007 From: tkharris at cs.cmu.edu (Thomas K Harris) Date: Thu, 02 Aug 2007 18:03:29 -0400 Subject: [RavenclawDev 292] reference app for olympus/ravenclaw Message-ID: <46B254B1.9030106@cs.cmu.edu> I recall that there was some notion of a reference app for olympus/ravenclaw. Was this going to be meeting-line or another app? Are these available for download? Thanks, -Thomas From tk at edam.speech.cs.cmu.edu Fri Aug 3 10:58:44 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 3 Aug 2007 10:58:44 -0400 Subject: [RavenclawDev 293] [931] CommonAgents/Apollo/: Created folder remotely Message-ID: <200708031458.l73Ewisw011849@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070803/ac13c66d/attachment.html -------------- next part -------------- From tk at edam.speech.cs.cmu.edu Wed Aug 8 17:27:03 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Wed, 8 Aug 2007 17:27:03 -0400 Subject: [RavenclawDev 294] [1880] Agents: Updated Helios3, Kalliope, NlgServer2, and Phoenix2 to compile under MSVS 2005. Message-ID: <200708082127.l78LR3Jj008645@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070808/151851e5/attachment-0001.html -------------- next part -------------- Property changes on: Agents/Helios3 ___________________________________________________________________ Name: svn:ignore + Debug Release Modified: Agents/Helios3/Helios3.vcproj =================================================================== --- Agents/Helios3/Helios3.vcproj 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Helios3/Helios3.vcproj 2007-08-08 21:27:02 UTC (rev 1880) @@ -1,126 +1,187 @@ + RootNamespace="Helios3" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\Bin\x86-nt\$(TargetName)_debug.exe" + /> + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\Bin\x86-nt\$(TargetName).exe" + /> @@ -128,120 +189,156 @@ + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + RelativePath="FBigram.cpp" + > + RelativePath="FConfidence.cpp" + > + RelativePath="FDialog.cpp" + > + RelativePath="FGarble.cpp" + > + RelativePath="FLexicalAnalysis.cpp" + > + RelativePath="FMarkers.cpp" + > + RelativePath="FParse.cpp" + > + RelativePath="FRecognition.cpp" + > + RelativePath="Helios.cpp" + > + RelativePath="InputSelector.cpp" + > + RelativePath="MetaInput.cpp" + > + RelativePath="PhoenixInput.cpp" + > + RelativePath="Utils.cpp" + > + Filter="h;hpp;hxx;hm;inl;inc" + > + RelativePath="FBigram.h" + > + RelativePath="FConfidence.h" + > + RelativePath="FDialog.h" + > + RelativePath="FeatureComputation.h" + > + RelativePath="FGarble.h" + > + RelativePath="FLexicalAnalysis.h" + > + RelativePath="FMarkers.h" + > + RelativePath="FParse.h" + > + RelativePath="FRecognition.h" + > + RelativePath="Helios.h" + > + RelativePath="HeliosInterfaceFunctions.h" + > + RelativePath="InputSelector.h" + > + RelativePath="MetaInput.h" + > + RelativePath="PhoenixInput.h" + > + RelativePath="Utils.h" + > + > + RelativePath="ToDo.txt" + > + > + RelativePath="confidence.model" + > + RelativePath="garble.model" + > + RelativePath="helios.cfg" + > + RelativePath="lexical_markers.def" + > + RelativePath="target_prompts.def" + > Modified: Agents/Helios3/PhoenixInput.cpp =================================================================== --- Agents/Helios3/PhoenixInput.cpp 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Helios3/PhoenixInput.cpp 2007-08-08 21:27:02 UTC (rev 1880) @@ -159,7 +159,7 @@ while (true) { // compare the level names - if (strcmpi( sub_slot.c_str(), sub_patt.c_str()) == 0) { + if (_strcmpi( sub_slot.c_str(), sub_patt.c_str()) == 0) { // the final subslot of both the pattern and the slot matched: // we won! Modified: Agents/Helios3/Utils.cpp =================================================================== --- Agents/Helios3/Utils.cpp 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Helios3/Utils.cpp 2007-08-08 21:27:02 UTC (rev 1880) @@ -47,14 +47,14 @@ // D: make a string uppercase string ToUpperCase(string sString) { strcpy(szBuffer, sString.c_str()); - strupr(szBuffer); + _strupr(szBuffer); return (string)szBuffer; } // D: makes a string lowercase string ToLowerCase(string sString) { strcpy(szBuffer, sString.c_str()); - strlwr(szBuffer); + _strlwr(szBuffer); return (string)szBuffer; } Property changes on: Agents/Kalliope ___________________________________________________________________ Name: svn:ignore + SwiftDebug SwiftRelease Modified: Agents/Kalliope/Kalliope.cpp =================================================================== --- Agents/Kalliope/Kalliope.cpp 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Kalliope/Kalliope.cpp 2007-08-08 21:27:02 UTC (rev 1880) @@ -305,6 +305,43 @@ } //----------------------------------------------------------------------------- +// [2006-07-22] (tk): this function can be called by the Galaxy architecture +// to add voices. useful for dynamic multi-dm architectures. +// frame includes the dm name and the voice name for that +// dm. for now at least it only works with swift. +//----------------------------------------------------------------------------- +Gal_Frame add_voice(Gal_Frame gfFrame, void *server_data) { +#ifdef USE_SWIFT + // update hub communication structures + pLastGalSS_Environment = (GalSS_Environment *)server_data; + pHubCommStruct = GalSS_EnvComm(pLastGalSS_Environment); + + DisplayMessage("GXI", "add_voice called."); + + string sName; + if(Gal_GetObject(gfFrame, ":name")) { + sName = Gal_GetString(gfFrame, ":name"); + } else { + DisplayMessage("GXI", "Error: Could not find 'name' in incoming frame."); + Gal_SetProp(gfFrame, ":error", Gal_IntObject(1)); + return gfFrame; + } + + string sVoice; + if(Gal_GetObject(gfFrame, ":voice")) { + sVoice = Gal_GetString(gfFrame, ":voice"); + } else { + DisplayMessage("GXI", "Error: Could not find 'voice' in incoming frame."); + Gal_SetProp(gfFrame, ":error", Gal_IntObject(1)); + return gfFrame; + } + + mssVoiceOf[sName] = sVoice; +#endif + return gfFrame; +} + +//----------------------------------------------------------------------------- // D: this function is called by the Galaxy architecture each time a "reset" // request comes in... //----------------------------------------------------------------------------- Modified: Agents/Kalliope/Kalliope.vcproj =================================================================== --- Agents/Kalliope/Kalliope.vcproj 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Kalliope/Kalliope.vcproj 2007-08-08 21:27:02 UTC (rev 1880) @@ -1,333 +1,514 @@ + RootNamespace="Kalliope" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\Bin\x86-nt\$(TargetName)_debug.exe" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\Bin\x86-nt\$(TargetName).exe" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\Bin\x86-nt\$(TargetName)_debug.exe" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\Bin\x86-nt\$(TargetName).exe" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\Bin\x86-nt\$(TargetName)_debug.exe" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\Bin\x86-nt\$(TargetName).exe" + /> @@ -335,80 +516,105 @@ + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + RelativePath="FestivalSynthesisManager.cpp" + > + RelativePath="Kalliope.cpp" + > + RelativePath="PlaybackManager.cpp" + > + RelativePath="RequestManager.cpp" + > + RelativePath="sock.c" + > + RelativePath="sock.h" + > + RelativePath=".\SwiftSynthesisManager.cpp" + > + RelativePath="ThetaSynthesisManager.cpp" + > + RelativePath="Utils.cpp" + > + Filter="h;hpp;hxx;hm;inl;inc" + > + RelativePath="FestivalSynthesisManager.h" + > + RelativePath="Kalliope.h" + > + RelativePath="KalliopeInterfaceFunctions.h" + > + RelativePath="PlaybackManager.h" + > + RelativePath="prim_type.h" + > + RelativePath="RequestManager.h" + > + RelativePath=".\SwiftSynthesisManager.h" + > + RelativePath="ThetaSynthesisManager.h" + > + RelativePath="Utils.h" + > + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + RelativePath="festival.cfg" + > + RelativePath=".\swift.cfg" + > + RelativePath="theta.cfg" + > + RelativePath="ToDo.txt" + > Modified: Agents/Kalliope/KalliopeInterfaceFunctions.h =================================================================== --- Agents/Kalliope/KalliopeInterfaceFunctions.h 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Kalliope/KalliopeInterfaceFunctions.h 2007-08-08 21:27:02 UTC (rev 1880) @@ -26,4 +26,5 @@ GAL_SERVER_OP(speak) GAL_SERVER_OP(reset) GAL_SERVER_OP(begin_session) -GAL_SERVER_OP(end_session) \ No newline at end of file +GAL_SERVER_OP(end_session) +GAL_SERVER_OP(add_voice) \ No newline at end of file Modified: Agents/Kalliope/Utils.cpp =================================================================== --- Agents/Kalliope/Utils.cpp 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Kalliope/Utils.cpp 2007-08-08 21:27:02 UTC (rev 1880) @@ -47,14 +47,14 @@ // D: make a string uppercase string ToUpperCase(string sString) { strcpy(szBuffer, sString.c_str()); - strupr(szBuffer); + _strupr(szBuffer); return (string)szBuffer; } // D: makes a string lowercase string ToLowerCase(string sString) { strcpy(szBuffer, sString.c_str()); - strlwr(szBuffer); + _strlwr(szBuffer); return (string)szBuffer; } Property changes on: Agents/NlgServer2 ___________________________________________________________________ Name: svn:ignore + Debug Release Modified: Agents/NlgServer2/NlgServer2.vcproj =================================================================== --- Agents/NlgServer2/NlgServer2.vcproj 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/NlgServer2/NlgServer2.vcproj 2007-08-08 21:27:02 UTC (rev 1880) @@ -1,144 +1,205 @@ + ProjectGUID="{20678B74-4291-4384-B05A-A5EC04DC2BCF}" + RootNamespace="NlgServer2" + Keyword="MFCProj" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + Description="Copy binary to destination" + CommandLine="copy "$(TARGETPATH)" ..\..\Bin\x86-nt\"$(TARGETNAME)"-DEBUG.exe" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + Description="Copy binary to its destination" + CommandLine="copy "$(TARGETPATH)" ..\..\bin\x86-nt\"$(TARGETNAME)".exe" + /> @@ -146,65 +207,77 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="nlg.c" + > + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + RelativePath="sockcli.c" + > + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Filter="h;hpp;hxx;hm;inl" + > + RelativePath=".\nlg_server.h" + > + RelativePath=".\sockcli.h" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > - - Modified: Agents/NlgServer2/sockcli.c =================================================================== --- Agents/NlgServer2/sockcli.c 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/NlgServer2/sockcli.c 2007-08-08 21:27:02 UTC (rev 1880) @@ -290,7 +290,7 @@ memcpy (&addr.sin_addr, hp->h_addr, hp->h_length); addr.sin_port = htons((u_short) port); - if (connect (conn_sd, &addr, sizeof(addr)) == 0) + if (connect (conn_sd, (SOCKADDR *)&addr, sizeof(addr)) == 0) break; print_errno ("connect"); cli_close (conn_sd); Property changes on: Agents/Phoenix2 ___________________________________________________________________ Name: svn:ignore + Debug Release Modified: Agents/Phoenix2/dict.c =================================================================== --- Agents/Phoenix2/dict.c 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Phoenix2/dict.c 2007-08-08 21:27:02 UTC (rev 1880) @@ -1,4 +1,5 @@ -#include +#include +#include #include #include #include "parse.h" @@ -57,7 +58,6 @@ { unsigned short key; char *c; - double ratio; int idx; Modified: Agents/Phoenix2/functions.h =================================================================== --- Agents/Phoenix2/functions.h 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Phoenix2/functions.h 2007-08-08 21:27:02 UTC (rev 1880) @@ -1,3 +1,8 @@ +#ifndef FUNCTIONS_H +#define FUNCTIONS_H + +#include "parse.h" + /* function declarations */ extern int match_net (); extern void reset (); @@ -12,3 +17,5 @@ extern int read_dict (); extern void read_forms (); + +#endif \ No newline at end of file Modified: Agents/Phoenix2/gal_phoenix.c =================================================================== --- Agents/Phoenix2/gal_phoenix.c 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Phoenix2/gal_phoenix.c 2007-08-08 21:27:02 UTC (rev 1880) @@ -48,11 +48,6 @@ NULL }; -static Gram *gram; -static int num_nets; -static int num_forms; -static int max_pri; - extern int ALL_PARSES; Gal_Frame ExtractParseStruct(int lPNum, Gram *pGram); @@ -175,18 +170,8 @@ strcpy(priority_file, xxx); } - /* read grammar */ - gram= read_grammar(dir, dict_file, grammar_file, forms_file, priority_file); - - /* if several grammar used, use max values, this mallocs space */ - num_nets= gram->num_nets; - num_forms= gram->num_forms; - max_pri=gram->max_pri; - ALL_PARSES = 1; - /* initialize parser, malloc space, etc */ - /* init_parse(num_nets, num_forms, max_pri); old style */ init_parse(dir, dict_file, grammar_file, forms_file, priority_file); GalUtil_Print(-1, "phoenix initialized\n"); @@ -198,6 +183,13 @@ static char p_out[100000]; +// [2006-07-14] (tk) +Gal_Frame restart_decoder(Gal_Frame f, void *server_data) +{ + GalUtil_Print(-1, "restart_decoder\n"); + reinit_parse(dir, dict_file, grammar_file, forms_file, priority_file); + return f; +} Gal_Frame phoenixparse(Gal_Frame f, void *server_data) { Modified: Agents/Phoenix2/grammar.c =================================================================== --- Agents/Phoenix2/grammar.c 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Phoenix2/grammar.c 2007-08-08 21:27:02 UTC (rev 1880) @@ -3,74 +3,10 @@ #include #include -#include "parse.h" #include "globals_gram.h" #include "functions.h" +#include "pconf.h" - - -Gram *read_grammar(dir, dict_file, grammar_file, forms_file, priority_file) - char *dir, *dict_file, *grammar_file, *forms_file, *priority_file; -{ - Gram *gram; - char name[LABEL_LEN]; - char *sym_ptr, *sym_buf_end; - int i, - num; - FILE *fp; - - /* malloc structure to hold grammar configuration */ - if( !(gram= (Gram *) calloc(1, sizeof(Gram))) ) { - fprintf(stderr, "ERROR: malloc for grammar failed\n"); - exit(-1); - } - - /* malloc space for symbol buffer */ - if( !(gram->sym_buf=(char *)malloc(SymBufSize * sizeof(char)))){ - fprintf(stderr, "ERROR: can't allocate space for script buffer\n"); - exit(-1); - } - sym_ptr= gram->sym_buf; - sym_buf_end= gram->sym_buf + SymBufSize; - - - /* read dictionary word strings */ - gram->num_words= read_dict(dir, dict_file, gram, &sym_ptr, sym_buf_end); - - /* read RTNs */ - sprintf(name, "%s/%s", dir, grammar_file); - read_nets(name, gram, &sym_ptr, sym_buf_end); - - /* read forms and create active set of nets */ - read_forms(dir, forms_file, gram, &sym_ptr, sym_buf_end); - - gram->priorities= (unsigned char *)0; - gram->max_pri= 0; - - sprintf(name, "%s/%s", dir, priority_file); - if( (fp= fopen(name, "r")) ) { - if( !(gram->priorities= (unsigned char *) malloc(gram->num_nets)) ) { - fprintf(stderr, "ERROR: malloc priority failed\n"); - exit(-1); - } - for(i=0; i < gram->num_nets; i++) gram->priorities[i]= (unsigned char)0; - name[0]='['; - while( fscanf(fp, "%s %d", name+1, &num) == 2 ) { - strcat(name,"]"); - i= find_net(name, gram); - if( i < 0 ) { - fprintf(stderr, "WARNING: Can't find net %s for priority\n", - name); - continue; - } - gram->priorities[i]= (unsigned char) num; - if( num > gram->max_pri) gram->max_pri= num; - } - fclose(fp); - } - return(gram); -} - read_nets(net_file, gram, sb_start, sym_buf_end) char *net_file, **sb_start, *sym_buf_end; Gram *gram; @@ -79,9 +15,7 @@ Gnode *net, *gnode; Gsucc *succ; - char name[LABEL_LEN], - *sym_ptr, - *s, *t; + char name[LABEL_LEN], *sym_ptr; int num_nodes, net_num, num_nets, @@ -192,10 +126,82 @@ *sb_start= sym_ptr; } +find_net(char *name, Gram *gram) +{ + int i; + if( !*name ) return(-1); + for( i=1; i < gram->num_nets; i++ ) { + if(!strcmp(gram->labels[i], name) ) break; + } + if( i < gram->num_nets ) return(i); + return(-1); +} +Gram *read_grammar(dir, dict_file, grammar_file, forms_file, priority_file) + char *dir, *dict_file, *grammar_file, *forms_file, *priority_file; +{ + Gram *gram; + char name[LABEL_LEN]; + char *sym_ptr, *sym_buf_end; + int i, + num; + FILE *fp; + + /* malloc structure to hold grammar configuration */ + if( !(gram= (Gram *) calloc(1, sizeof(Gram))) ) { + fprintf(stderr, "ERROR: malloc for grammar failed\n"); + exit(-1); + } + + /* malloc space for symbol buffer */ + if( !(gram->sym_buf=(char *)malloc(SymBufSize * sizeof(char)))){ + fprintf(stderr, "ERROR: can't allocate space for script buffer\n"); + exit(-1); + } + sym_ptr= gram->sym_buf; + sym_buf_end= gram->sym_buf + SymBufSize; + + + /* read dictionary word strings */ + gram->num_words= read_dict(dir, dict_file, gram, &sym_ptr, sym_buf_end); + + /* read RTNs */ + sprintf(name, "%s/%s", dir, grammar_file); + read_nets(name, gram, &sym_ptr, sym_buf_end); + + /* read forms and create active set of nets */ + read_forms(dir, forms_file, gram, &sym_ptr, sym_buf_end); + + gram->priorities= (unsigned char *)0; + gram->max_pri= 0; + + sprintf(name, "%s/%s", dir, priority_file); + if( (fp= fopen(name, "r")) ) { + if( !(gram->priorities= (unsigned char *) malloc(gram->num_nets)) ) { + fprintf(stderr, "ERROR: malloc priority failed\n"); + exit(-1); + } + for(i=0; i < gram->num_nets; i++) gram->priorities[i]= (unsigned char)0; + name[0]='['; + while( fscanf(fp, "%s %d", name+1, &num) == 2 ) { + strcat(name,"]"); + i= find_net(name, gram); + if( i < 0 ) { + fprintf(stderr, "WARNING: Can't find net %s for priority\n", + name); + continue; + } + gram->priorities[i]= (unsigned char) num; + if( num > gram->max_pri) gram->max_pri= num; + } + fclose(fp); + } + return(gram); +} + void read_forms(dir, forms_file, gram, sb_start, sym_buf_end) char *dir, *forms_file, **sb_start, *sym_buf_end; Gram *gram; @@ -316,17 +322,4 @@ } -find_net(char *name, Gram *gram) -{ - int i; - if( !*name ) return(-1); - for( i=1; i < gram->num_nets; i++ ) { - if(!strcmp(gram->labels[i], name) ) break; - } - - if( i < gram->num_nets ) return(i); - return(-1); - -} - Modified: Agents/Phoenix2/grammar.h =================================================================== --- Agents/Phoenix2/grammar.h 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Phoenix2/grammar.h 2007-08-08 21:27:02 UTC (rev 1880) @@ -1,3 +1,6 @@ +#ifndef GRAMMAR_H +#define GRAMMAR_H + #define MAX_WRDS 0xFFFF /* max words in lexicon */ #define LABEL_LEN 200 /* max length of labels */ #define LINE_LEN 10000 /* max length line buffer */ @@ -38,3 +41,4 @@ char rw; /* has been rewritten flag */ } non_term; +#endif \ No newline at end of file Modified: Agents/Phoenix2/match.c =================================================================== --- Agents/Phoenix2/match.c 2007-08-08 14:48:53 UTC (rev 1879) +++ Agents/Phoenix2/match.c 2007-08-08 21:27:02 UTC (rev 1880) @@ -9,69 +9,123 @@ static int cur_paths; /* number of paths explored for net, debug */ -/* produce all parse trees for given net starting at word position - add trees found to chart - Creates an initial path nodes and recursively calls expand_path() -*/ -int match_net(int net, int word_pos, Gram *gram) +void clear_chart(int num_nets) { + int i; + + /* clear chart */ + for(i=0; i < num_nets; i++) chart[i]= 0; +} + +/* return 0 if net not tried, 1 if matched, -1 if not matched */ +/* set ptr to edge matched, 0 if not */ +int check_chart(net, word_pos, edge) + int net, word_pos; + Edge **edge; { - EdgeLink *prev, *next; - Path path; - int expand_path_ret; + EdgeLink *next; - cur_paths= 0; /* clear path counter used for debugging */ + for( next= chart[net]; next; next= next->link) { + if(word_pos <= next->sw) break; + } + *edge= 0; + if( !next ) return(0); + if( word_pos != next->sw ) return(0); + if(!next->edge) return(-1); + *edge= next->edge; + return(1); +} - /* create initial path node, with start state of net */ - path.state= gram->Nets[net]; - path.net= net; - path.sw= word_pos; - path.ew= 0; - path.score= 0; - path.nchld= 0; - path.word_pos= word_pos; +/* add matched token to chart */ +static int add_to_chart(path) + Path *path; +{ + Edge *prev, *next, *e; + EdgeLink *eln; + int i; - if( debug > 5 ) { - printf("match_net: %s %d\n", gram->labels[net], word_pos); + if( edge_ptr == edge_buf_end ) { + printf("ERROR: edge buffer overflow, EdgeBufSize= %d\n", EdgeBufSize); + return(-1); } - /* add to chart with edge= 0 in case no parse */ - if( edge_link_ptr == edge_link_end ) { - printf("ERROR: edge link buffer overflow, ChartBufSize= %d\n", - ChartBufSize); + /* find pointer entry in chart for net, start word */ + for(eln= chart[path->net]; eln; eln= eln->link) { + if( eln->sw == path->sw ) break; + } + if( !eln ) { + printf("ERROR: no entry in chart for net %d sw %d\n", + path->net, path->sw); return(-1); } - edge_link_ptr->sw= word_pos; - edge_link_ptr->edge= 0; - /* find position in chart list for net */ + /* find position in list to insert */ prev= 0; - for( next= chart[net]; next; next= next->link) { - if(word_pos <= next->sw) break; - prev= next; + if( !eln->edge ) { } - if( next && (word_pos == next->sw) ) { - /* net already matched */ + else { + for(next= eln->edge; next; prev= next, next= next->link) { + if(path->sw > next->sw) continue; + if( (path->sw == next->sw) && + (path->ew > next->ew) ) continue; + break; + } + + /* if repeat of existing edge, don't add */ + for( e=next; e; e= e->link) { + if( path->sw != e->sw) break; + if( path->ew != e->ew) break; + if( path->nchld != e->nchld ) break; + for( i=1; i < path->nchld; i++) { + if( path->chld[i] != e->chld[i] ) break; + } + if( i >= path->nchld ) return(0); + } } - else if( !prev ) { - /* insert at head of list */ - edge_link_ptr->link= chart[net]; - chart[net]= edge_link_ptr; - edge_link_ptr++; + + /* copy path to edge */ + edge_ptr->net= path->net; + edge_ptr->sw= path->sw; + edge_ptr->ew= path->ew; + edge_ptr->score= path->score; + edge_ptr->nchld= path->nchld; + + if( (pe_buf_ptr + path->nchld +1) > pe_buf_end ) { + printf("ERROR: overflow, PeBufSize= %d\n", PeBufSize); + return(-1); } + edge_ptr->nchld= path->nchld; + edge_ptr->chld= pe_buf_ptr; + for(i=0; i < path->nchld; i++) *(pe_buf_ptr++)= path->chld[i]; + + /* insert edge in list for net, sw */ + if( !prev ) { + /* insert at head */ + edge_ptr->link= eln->edge; + eln->edge= edge_ptr; + } else { - /* insert in list */ - edge_link_ptr->link= prev->link; - prev->link= edge_link_ptr; - edge_link_ptr++; + edge_ptr->link= next; + prev->link= edge_ptr; } - /* explore all paths leaving state */ - if( (expand_path_ret=expand_path(&path, gram)) < 0) return(expand_path_ret); + edge_ptr++; return(0); } +/* see if path is in final state or can trace through nulls to one */ +static int check_final( path ) + Path *path; +{ + if( !path->state->final ) return(0); + /* update end word of phrase */ + if ( path->word_pos <= 0 ) { + printf ( "\nWARNING: null path encountered in net %d.\n", path->net ); + return (-1); + } + path->ew= path->word_pos-1; + return( add_to_chart( path ) ); +} - static int expand_path( path, gram ) Path *path; Gram *gram; @@ -160,102 +214,70 @@ } -/* add matched token to chart */ -static int add_to_chart(path) - Path *path; +/* produce all parse trees for given net starting at word position + add trees found to chart + Creates an initial path nodes and recursively calls expand_path() +*/ +int match_net(int net, int word_pos, Gram *gram) { - Edge *prev, *next, *e; - EdgeLink *eln; - int i; + EdgeLink *prev, *next; + Path path; + int expand_path_ret; - if( edge_ptr == edge_buf_end ) { - printf("ERROR: edge buffer overflow, EdgeBufSize= %d\n", EdgeBufSize); - return(-1); - } + cur_paths= 0; /* clear path counter used for debugging */ - /* find pointer entry in chart for net, start word */ - for(eln= chart[path->net]; eln; eln= eln->link) { - if( eln->sw == path->sw ) break; + /* create initial path node, with start state of net */ + path.state= gram->Nets[net]; + path.net= net; + path.sw= word_pos; + path.ew= 0; + path.score= 0; + path.nchld= 0; + path.word_pos= word_pos; + + if( debug > 5 ) { + printf("match_net: %s %d\n", gram->labels[net], word_pos); } - if( !eln ) { - printf("ERROR: no entry in chart for net %d sw %d\n", - path->net, path->sw); + + /* add to chart with edge= 0 in case no parse */ + if( edge_link_ptr == edge_link_end ) { + printf("ERROR: edge link buffer overflow, ChartBufSize= %d\n", + ChartBufSize); return(-1); } + edge_link_ptr->sw= word_pos; + edge_link_ptr->edge= 0; - /* find position in list to insert */ + /* find position in chart list for net */ prev= 0; - if( !eln->edge ) { + for( next= chart[net]; next; next= next->link) { + if(word_pos <= next->sw) break; + prev= next; } - else { - for(next= eln->edge; next; prev= next, next= next->link) { - if(path->sw > next->sw) continue; - if( (path->sw == next->sw) && - (path->ew > next->ew) ) continue; - break; - } - - /* if repeat of existing edge, don't add */ - for( e=next; e; e= e->link) { - if( path->sw != e->sw) break; - if( path->ew != e->ew) break; - if( path->nchld != e->nchld ) break; - for( i=1; i < path->nchld; i++) { - if( path->chld[i] != e->chld[i] ) break; - } - if( i >= path->nchld ) return(0); - } + if( next && (word_pos == next->sw) ) { + /* net already matched */ } - - /* copy path to edge */ - edge_ptr->net= path->net; - edge_ptr->sw= path->sw; - edge_ptr->ew= path->ew; - edge_ptr->score= path->score; - edge_ptr->nchld= path->nchld; - - if( (pe_buf_ptr + path->nchld +1) > pe_buf_end ) { - printf("ERROR: overflow, PeBufSize= %d\n", PeBufSize); - return(-1); + else if( !prev ) { + /* insert at head of list */ + edge_link_ptr->link= chart[net]; + chart[net]= edge_link_ptr; + edge_link_ptr++; } - edge_ptr->nchld= path->nchld; - edge_ptr->chld= pe_buf_ptr; - for(i=0; i < path->nchld; i++) *(pe_buf_ptr++)= path->chld[i]; - - /* insert edge in list for net, sw */ - if( !prev ) { - /* insert at head */ - edge_ptr->link= eln->edge; - eln->edge= edge_ptr; - } else { - edge_ptr->link= next; - prev->link= edge_ptr; + /* insert in list */ + edge_link_ptr->link= prev->link; + prev->link= edge_link_ptr; + edge_link_ptr++; } @@ Diff output truncated at 60000 characters. @@ From tk at edam.speech.cs.cmu.edu Wed Aug 8 17:30:27 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Wed, 8 Aug 2007 17:30:27 -0400 Subject: [RavenclawDev 295] [1881] Agents/MultiDecoder/Audio_Server: Modified Audio_Server to compile under MSVS 2005. Message-ID: <200708082130.l78LURFe008660@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070808/929b4241/attachment.html -------------- next part -------------- Property changes on: Agents/MultiDecoder/Audio_Server ___________________________________________________________________ Name: svn:ignore + Debug Release Modified: Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj =================================================================== --- Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj 2007-08-08 21:27:02 UTC (rev 1880) +++ Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj 2007-08-08 21:30:25 UTC (rev 1881) @@ -1,123 +1,184 @@ + RootNamespace="Audio_Server" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\..\bin\x86-nt\$(TargetName)-DEBUG.exe" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\..\Bin\x86-nt" + /> @@ -125,33 +186,42 @@ + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + RelativePath=".\main.cpp" + > + RelativePath="sock.c" + > + RelativePath=".\Utils.cpp" + > + Filter="h;hpp;hxx;hm;inl;inc" + > + RelativePath="sock.h" + > + RelativePath="sphinx-server.h" + > + RelativePath=".\Utils.h" + > + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > Modified: Agents/MultiDecoder/Audio_Server/Utils.cpp =================================================================== --- Agents/MultiDecoder/Audio_Server/Utils.cpp 2007-08-08 21:27:02 UTC (rev 1880) +++ Agents/MultiDecoder/Audio_Server/Utils.cpp 2007-08-08 21:30:25 UTC (rev 1881) @@ -102,14 +102,14 @@ // D: make a string uppercase string ToUpperCase(string sString) { strcpy(szBuffer, sString.c_str()); - strupr(szBuffer); + _strupr(szBuffer); return (string)szBuffer; } // D: makes a string lowercase string ToLowerCase(string sString) { strcpy(szBuffer, sString.c_str()); - strlwr(szBuffer); + _strlwr(szBuffer); return (string)szBuffer; } Modified: Agents/MultiDecoder/Audio_Server/main.cpp =================================================================== --- Agents/MultiDecoder/Audio_Server/main.cpp 2007-08-08 21:27:02 UTC (rev 1880) +++ Agents/MultiDecoder/Audio_Server/main.cpp 2007-08-08 21:30:25 UTC (rev 1881) @@ -619,13 +619,13 @@ hub_log_prefix = NULL; } if (Gal_GetObject(f, ":hub_logdir")) { - hub_log_dir = strdup(Gal_GetString(f, ":hub_logdir")); + hub_log_dir = _strdup(Gal_GetString(f, ":hub_logdir")); } else fprintf( stderr, "Can't find :hub_logdir\n"); if (Gal_GetObject(f, ":hub_log_prefix")) { - hub_log_prefix = strdup(Gal_GetString(f, ":hub_log_prefix")); + hub_log_prefix = _strdup(Gal_GetString(f, ":hub_log_prefix")); } else fprintf( stderr, "Can't find :hub_log_prefix\n"); Modified: Agents/MultiDecoder/Audio_Server/sock.c =================================================================== --- Agents/MultiDecoder/Audio_Server/sock.c 2007-08-08 21:27:02 UTC (rev 1880) +++ Agents/MultiDecoder/Audio_Server/sock.c 2007-08-08 21:30:25 UTC (rev 1881) @@ -265,7 +265,7 @@ } /* Connect to server */ - memset ((char *) &addr, sizeof(addr), 0); + memset ((char *) &addr, 0, sizeof(addr)); addr.sin_family = AF_INET; memcpy (&addr.sin_addr, hp->h_addr, hp->h_length); addr.sin_port = htons((u_short) port); From tk at edam.speech.cs.cmu.edu Wed Aug 8 17:33:21 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Wed, 8 Aug 2007 17:33:21 -0400 Subject: [RavenclawDev 296] [1883] Libraries/RavenClaw: Modified RavenClaw to compile under MSVS 2005. Message-ID: <200708082133.l78LXLxg008684@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070808/bbe26cac/attachment.html -------------- next part -------------- Property changes on: Libraries/RavenClaw ___________________________________________________________________ Name: svn:ignore + Lib Modified: Libraries/RavenClaw/RavenClaw.vcproj =================================================================== --- Libraries/RavenClaw/RavenClaw.vcproj 2007-08-08 21:31:07 UTC (rev 1882) +++ Libraries/RavenClaw/RavenClaw.vcproj 2007-08-08 21:33:20 UTC (rev 1883) @@ -4,9 +4,7 @@ Version="8.00" Name="RavenClaw" ProjectGUID="{538B76FD-E289-4CF7-A7FF-1ACB429B4F63}" - SccProjectName=""$/Libraries/RavenClaw", SUJAAAAA" - SccLocalPath="." - SccProvider="MSSCCI:Microsoft Visual SourceSafe" + RootNamespace="RavenClaw" Keyword="MFCProj" > @@ -47,7 +45,7 @@ Name="VCCLCompilerTool" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\Galaxy\include;." - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GALAXY" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GALAXY;_CRT_SECURE_NO_DEPRECATE" StringPooling="true" MinimalRebuild="false" RuntimeLibrary="2" @@ -123,7 +121,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\Galaxy\include;." - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;GALAXY" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WIN32;GALAXY;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="0" RuntimeLibrary="3" From tk at edam.speech.cs.cmu.edu Wed Aug 8 17:31:07 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Wed, 8 Aug 2007 17:31:07 -0400 Subject: [RavenclawDev 297] [1882] Agents/MultiDecoder/Sphinx_Engine: Modified Sphinx_Engine to compile under MSVS 2005. Message-ID: <200708082131.l78LV75M008674@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070808/15d9f8ce/attachment-0001.html -------------- next part -------------- Property changes on: Agents/MultiDecoder/Sphinx_Engine ___________________________________________________________________ Name: svn:ignore + Debug Release Modified: Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj =================================================================== --- Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj 2007-08-08 21:30:25 UTC (rev 1881) +++ Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj 2007-08-08 21:31:07 UTC (rev 1882) @@ -1,127 +1,188 @@ + RootNamespace="Sphinx_Engine" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="0" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\..\bin\x86-nt\$(TargetName)-DEBUG.exe" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\..\Bin\x86-nt" + /> @@ -129,24 +190,30 @@ + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + RelativePath="main.c" + > + RelativePath="sock.c" + > + RelativePath="sock.h" + > + Filter="h;hpp;hxx;hm;inl;inc" + > + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > Modified: Agents/MultiDecoder/Sphinx_Engine/main.c =================================================================== --- Agents/MultiDecoder/Sphinx_Engine/main.c 2007-08-08 21:30:25 UTC (rev 1881) +++ Agents/MultiDecoder/Sphinx_Engine/main.c 2007-08-08 21:31:07 UTC (rev 1882) @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -14,6 +15,8 @@ #include "fbs.h" /* Fast beam search (FBS) defines */ #include "search.h" +#include "lm.h" +#include "kb.h" #ifdef __cplusplus } @@ -64,6 +67,9 @@ static int iNBest = 0; /* the number of n-best hypotheses to generate */ +// [2006-07-14] (tk): moved argfn to global space to support re_init +static char *argfn; + // [2005-10-19] (dbohus): define the THypStruct type which encodes // internally information about a hypothesis typedef struct { @@ -238,7 +244,7 @@ *p++ = *(*string)++; *p = '\0'; - return strlen(word); + return (int)strlen(word); } @@ -268,7 +274,7 @@ finishwid = kb_get_word_id (""); startwid = kb_get_word_id (""); if ((finishwid < 0) || (startwid < 0)) - return -1; + return NULL; w1 = finishwid; w2 = startwid; @@ -276,7 +282,7 @@ k = 1; for (h = hyp; h; h = h->next) { if (k > 4095) - return -1; + return NULL; lm_tg_score (w1, w2, h->wid); type[k++] = lm3g_access_type(); w1 = w2; @@ -304,13 +310,13 @@ // confidence to 0.7 search_hyp_t *h; int32 w1, w2, finishwid, startwid, type[4096]; - int32 i, k, t; + int32 i, k; float* conf; finishwid = kb_get_word_id (""); startwid = kb_get_word_id (""); if ((finishwid < 0) || (startwid < 0)) - return -1; + return NULL; w1 = finishwid; w2 = startwid; @@ -318,7 +324,7 @@ k = 1; for (h = hyp; h; h = h->next) { if (k > 4095) - return -1; + return NULL; // lm_tg_score (w1, w2, h->wid); // type[k++] = lm3g_access_type(); k++; @@ -337,7 +343,7 @@ for (i = 1, h = hyp; i < k-2; i++, h = h->next) { // t = type[i-1] + type[i] + ((type[i+1] + type[i+2])<<1); // h->conf = (float)((double)(t-6)/12.0); - conf[i-1] = 0.7; + conf[i-1] = 0.7F; } return conf; @@ -399,7 +405,6 @@ char tmp[16384]; search_hyp_t *h; float *lm_conf = NULL; - char *ptmp; // Fill in confidence values for words in result and build filtered hypothesis if (slm) @@ -434,6 +439,9 @@ has_oov = 0; + // [2006-05-28] (tk): hyp_conf_slm could return NULL, but don't know what to do + _ASSERT(lm_conf); + for (h = hypseg; h; h = h->next) { // (antoine) Update Sphinx word confidence statistics @@ -461,7 +469,7 @@ if ((ch_len + 1 + strlen(h->word) < HYPSTR_SIZE) && (h->word[0] != '+')) { strcpy (phs->confhypstr + ch_len, h->word); - ch_len += strlen(h->word); + ch_len += (int)strlen(h->word); phs->confhypstr[ch_len++] = ' '; } @@ -469,7 +477,7 @@ if ((h_len + 1 + strlen(h->word) < HYPSTR_SIZE) && (h->word[0] != '+')) { strcpy (phs->hypstr + h_len, h->word); - h_len += strlen(h->word); + h_len += (int)strlen(h->word); phs->hypstr[h_len++] = ' '; } @@ -487,7 +495,7 @@ strcpy (phs->confhypstr + ch_len, ".?"); ch_len += 2; strcpy (phs->confhypstr + ch_len, h->word); - ch_len += strlen(h->word); + ch_len += (int)strlen(h->word); strcpy (phs->confhypstr + ch_len, "?."); ch_len += 2; phs->confhypstr[ch_len++] = ' '; @@ -497,7 +505,7 @@ if ((h_len + 1 + strlen(h->word) < HYPSTR_SIZE) && (h->word[0] != '+')) { strcpy (phs->hypstr + h_len, h->word); - h_len += strlen(h->word); + h_len += (int)strlen(h->word); phs->hypstr[h_len++] = ' '; } } @@ -514,9 +522,9 @@ strcat(phs->startframes_list, " "); strcat(phs->endframes_list, " "); } - itoa(h->sf, tmp, 10); + _itoa(h->sf, tmp, 10); strcat(phs->startframes_list, tmp); - itoa(h->ef, tmp, 10); + _itoa(h->ef, tmp, 10); strcat(phs->endframes_list, tmp); } @@ -532,7 +540,7 @@ // for the hypstr if (h_len + 1 + strlen("++OOV++ ") < HYPSTR_SIZE) { strcpy (phs->hypstr + h_len, "++OOV++ "); - h_len += strlen("++OOV++ "); + h_len += (int)strlen("++OOV++ "); strcpy(phs->startframes_list, "N/A"); strcpy(phs->endframes_list, "N/A"); } @@ -540,7 +548,7 @@ // for the confhypstr if (ch_len + 1 + strlen("++OOV++ ") < HYPSTR_SIZE) { strcpy (phs->confhypstr + ch_len, "++OOV++ "); - ch_len += strlen("++OOV++ "); + ch_len += (int)strlen("++OOV++ "); } } @@ -619,8 +627,8 @@ void engine_proc_result() { - int n_frm, len; - search_hyp_t *hypseg, *h; + int n_frm; + search_hyp_t *hypseg; char confhypstr[HYPSTR_SIZE]; char *hypstr; char to_audio[SOCK_BUF_SIZE]; @@ -646,7 +654,7 @@ // [2005-10-19] (dbohus): added support for generating NBest Lists if(iNBest > 0) { - search_hyp_t *h, **alt; + search_hyp_t **alt; int32 startwid, ef; startwid = kb_get_word_id(""); @@ -689,7 +697,7 @@ strcat(to_audio, " ) }"); Log("Sending final hypotheses frame:\n%s\n", to_audio); - sock_send_block(Client, to_audio, strlen(to_audio)); + sock_send_block(Client, to_audio, (int32)strlen(to_audio)); } @@ -873,7 +881,7 @@ hyp_str, utt_id, client_name, iUttStartTimestamp, iEndTimestamp, n_frame); Log("Sending:\n %s", to_audio); - sock_send_noblock(Client, to_audio, strlen(to_audio)); + sock_send_noblock(Client, to_audio, (int32)strlen(to_audio)); Log("Sent\n"); pr_rpt_frame = n_frame; } @@ -892,6 +900,28 @@ } break; } + // [2006-07-14] (tk): handle an engine restart. this was required for changing dicts and lm's on the fly. + else if (!strcmp(word, "engine_restart")) { + Log("engine restart"); + + if (utt_state == UTT_STARTED) { + // there is a started utterance: abort it + uttproc_abort_utt(); + Log("Canceled utterance in UTT_STARTED state."); + } else if (utt_state == UTT_ENDED) { + // the utterance has already ended but we haven't + // got the result yet. get them and ignore them. + uttproc_result_seg(&n_frm, &hypseg, 1); + Log("Canceled utterance in UTT_ENDED state."); + } + utt_state = UTT_IDLE; + + if (decoder_init(argfn) < 0) { + Log("ERROR: decoder initialization failed"); + exit(1); + } + break; + } else continue; } @@ -977,7 +1007,6 @@ SOCKET listen_socket, max; fd_set fds; int i; - char *argfn; client_name = NULL; argfn = NULL; @@ -1041,7 +1070,7 @@ max = Client; } max++; - if (select(max, &fds, NULL, NULL, NULL) == SOCKET_ERROR) { + if (select((int)max, &fds, NULL, NULL, NULL) == SOCKET_ERROR) { Log("ERROR: select error"); } if (Client != INVALID_SOCKET){ Modified: Agents/MultiDecoder/Sphinx_Engine/sock.c =================================================================== --- Agents/MultiDecoder/Sphinx_Engine/sock.c 2007-08-08 21:30:25 UTC (rev 1881) +++ Agents/MultiDecoder/Sphinx_Engine/sock.c 2007-08-08 21:31:07 UTC (rev 1882) @@ -6,7 +6,7 @@ #include #endif #include - + /* * Initialize sock routines */ @@ -171,7 +171,7 @@ return listen_sd; } - + SOCKET sock_new_connection (SOCKET listen_sd) { fd_set l_fds; @@ -183,7 +183,7 @@ FD_ZERO(&l_fds); FD_SET(listen_sd, &l_fds); - if ((n_rdy = select(listen_sd+1, &l_fds, NULL, NULL, &poll)) < 0) { + if ((n_rdy = select((int)listen_sd+1, &l_fds, NULL, NULL, &poll)) < 0) { fprintf(stderr,"select error"); } if (n_rdy) { @@ -193,7 +193,7 @@ return INVALID_SOCKET; } } - + SOCKET sock_await_connection (SOCKET listen_sd) { int32 flag; @@ -233,7 +233,7 @@ return conn_sd; } - + SOCKET sock_connect (const char *hostname, int32 port) { struct sockaddr_in addr; @@ -265,7 +265,7 @@ } /* Connect to server */ - memset ((char *) &addr, sizeof(addr), 0); + memset ((char *) &addr, 0, sizeof(addr)); addr.sin_family = AF_INET; memcpy (&addr.sin_addr, hp->h_addr, hp->h_length); addr.sin_port = htons((u_short) port); @@ -339,7 +339,7 @@ FD_ZERO (&readfds); FD_SET (sd, &readfds); - if (select (sd+1, &readfds, NULL, NULL, NULL) == SOCKET_ERROR) { + if (select ((int)sd+1, &readfds, NULL, NULL, NULL) == SOCKET_ERROR) { print_errno ("sock_recv_select"); return -2; /* Error */ } From tk at edam.speech.cs.cmu.edu Wed Aug 8 17:36:13 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Wed, 8 Aug 2007 17:36:13 -0400 Subject: [RavenclawDev 298] [1884] Libraries/sphinx2/win32/msdev/libsphinx2: Modified Sphinx2 to compile under MSVS 2005. Message-ID: <200708082136.l78LaDDM008694@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070808/9452e61b/attachment-0001.html -------------- next part -------------- Modified: Libraries/sphinx2/win32/msdev/libsphinx2/libsphinx2.vcproj =================================================================== --- Libraries/sphinx2/win32/msdev/libsphinx2/libsphinx2.vcproj 2007-08-08 21:33:20 UTC (rev 1883) +++ Libraries/sphinx2/win32/msdev/libsphinx2/libsphinx2.vcproj 2007-08-08 21:36:12 UTC (rev 1884) @@ -1,120 +1,168 @@ + ProjectGUID="{BB2093E6-97B7-47B1-9F6D-5F7417E69267}" + RootNamespace="libsphinx2" + Keyword="MFCProj" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> - - - - + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> - - - - + Name="VCPostBuildEventTool" + /> @@ -122,1571 +170,1963 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="..\..\..\src\libsphinx2\add-table.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\agc_emax.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\allphone.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\areadchar.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\areaddouble.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\areadfloat.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\areadint.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\areadshort.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\awritechar.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\awritedouble.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\awritefloat.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\awriteint.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\awriteshort.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\bio.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\bisearch.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\bitvec.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\blk_cdcn_norm.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\blkarray_list.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\cache_lm.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\case.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\cdcn_init.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\cdcn_norm.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\cdcn_update.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\cep_rw.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\ckd_alloc.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\CM_funcs.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\cont_mgau.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\dict.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\eht_quit.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\err.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\f2read.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\f2write.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\fbs_main.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\fsg_history.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\fsg_lextree.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\fsg_psubtree.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\fsg_search.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\get_a_word.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\glist.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\hash.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\hmm_tied_r.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\kb_main.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\lab.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\linklist.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\list.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\live_norm.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\lm.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\lm_3g.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\lmclass.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\logmsg.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\logs3.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\longio.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\mdef.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\norm.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\nxtarg.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\pconf.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\peek_length.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\phone.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\prime.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\r_agc_noise.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\resfft.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\s3hash.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\s3mdef_s2map.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\salloc.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\sc_cbook_r.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\sc_vq.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\search.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\searchlat.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\senscr.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\skipto.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\str2words.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\strcasecmp.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\time_align.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\unlimit.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + RelativePath="..\..\..\src\libsphinx2\util.c" + > + Name="Release|Win32" + > An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070809/24a48f03/attachment.html -------------- next part -------------- Added: Libraries/sphinx2/trunkSphinx2msdev/sphinx2.sln =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/sphinx2.sln (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/sphinx2.sln 2007-08-09 22:52:58 UTC (rev 1979) @@ -0,0 +1,164 @@ +? +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adpow", "..\sphinx2\win32\msdev\SphinxExamples\adpow\adpow.vcproj", "{36E8EAC7-3805-4AD7-AD20-D78A4693A78A}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adrec", "..\sphinx2\win32\msdev\SphinxExamples\adrec\adrec.vcproj, "{3E35CF24-4D95-4361-BF6D-BF0EFFAEBAC6}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cont_adseg", "..\sphinx2\win32\msdev\SphinxExamples\cont_adseg\cont_adseg.vcproj", "{1FA05DBB-DE80-4CA2-93F1-9A740DA06FE7}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cont_fileseg", "..\sphinx2\win32\msdev\SphinxExamples\cont_fileseg\cont_fileseg.vcproj", "{2F64EA35-0D45-4A8E-940E-4242CA290BFB}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2", "..\sphinx2\win32\msdev\libsphinx2\libsphinx2.vcproj", "{B0C46B20-F278-4B69-9B7B-59A0AE386637}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2ad", "..\sphinx2\win32\msdev\libsphinx2ad\libsphinx2ad.vcproj", "{6BE3BF2A-9EB3-4D35-922C-2B46312A2B03}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2fe", "..\sphinx2\win32\msdev\libsphinx2fe\libsphinx2fe.vcproj", "{9E350D92-0B8C-48F0-A031-61F4BAD1D091}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lm3g2dmp", "..\sphinx2\win32\msdev\SphinxExamples\lm3g2dmp\lm3g2dmp.vcproj", "{047EA89F-181D-45F5-A22C-F402768E17D7}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw2cep", "..\sphinx2\win32\msdev\SphinxExamples\raw2cep\raw2cep.vcproj", "{80D1B2DB-A347-465B-8C4C-5281CCD6B8A0}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sphinx2_allphone", "..\sphinx2\win32\msdev\SphinxExamples\sphinx2_allphone\sphinx2_allphone.vcproj", "{5C516DBD-D0A4-4CF3-8954-3089DE444E30}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sphinx2_batch", "..\sphinx2\win32\msdev\SphinxExamples\sphinx2_batch\sphinx2_batch.vcproj", "{86B71F7A-7504-4CD9-9822-BC3D43556804}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sphinx2_client", "..\sphinx2\win32\msdev\SphinxExamples\sphinx2_client\sphinx2_client.vcproj", "{7D72B085-F13F-4592-9A3E-C981A8BD7C08}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sphinx2_continuous", "..\sphinx2\win32\msdev\SphinxExamples\sphinx2_continuous\sphinx2_continuous.vcproj", "{43D1F4D8-8EBD-4535-B78A-CEEF24380BE4}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sphinx2_ptt", "..\sphinx2\win32\msdev\SphinxExamples\sphinx2_ptt\sphinx2_ptt.vcproj", "{AF86F99C-09C7-419F-A708-657D527D4E73}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sphinx2_server", "..\sphinx2\win32\msdev\SphinxExamples\sphinx2_server\sphinx2_server.vcproj", "{84B229A5-333C-4D2F-9B91-F71248AFFCC4}" + ProjectSection(ProjectDependencies) = postProject + {B0C46B20-F278-4B69-9B7B-59A0AE386637} = {B0C46B20-F278-4B69-9B7B-59A0AE386637} + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} = {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03} + {9E350D92-0B8C-48F0-A031-61F4BAD1D091} = {9E350D92-0B8C-48F0-A031-61F4BAD1D091} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {36E8EAC7-3805-4AD7-AD20-D78A4693A78A}.Debug|Win32.ActiveCfg = Debug|Win32 + {36E8EAC7-3805-4AD7-AD20-D78A4693A78A}.Debug|Win32.Build.0 = Debug|Win32 + {36E8EAC7-3805-4AD7-AD20-D78A4693A78A}.Release|Win32.ActiveCfg = Release|Win32 + {36E8EAC7-3805-4AD7-AD20-D78A4693A78A}.Release|Win32.Build.0 = Release|Win32 + {3E35CF24-4D95-4361-BF6D-BF0EFFAEBAC6}.Debug|Win32.ActiveCfg = Debug|Win32 + {3E35CF24-4D95-4361-BF6D-BF0EFFAEBAC6}.Debug|Win32.Build.0 = Debug|Win32 + {3E35CF24-4D95-4361-BF6D-BF0EFFAEBAC6}.Release|Win32.ActiveCfg = Release|Win32 + {3E35CF24-4D95-4361-BF6D-BF0EFFAEBAC6}.Release|Win32.Build.0 = Release|Win32 + {1FA05DBB-DE80-4CA2-93F1-9A740DA06FE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {1FA05DBB-DE80-4CA2-93F1-9A740DA06FE7}.Debug|Win32.Build.0 = Debug|Win32 + {1FA05DBB-DE80-4CA2-93F1-9A740DA06FE7}.Release|Win32.ActiveCfg = Release|Win32 + {1FA05DBB-DE80-4CA2-93F1-9A740DA06FE7}.Release|Win32.Build.0 = Release|Win32 + {2F64EA35-0D45-4A8E-940E-4242CA290BFB}.Debug|Win32.ActiveCfg = Debug|Win32 + {2F64EA35-0D45-4A8E-940E-4242CA290BFB}.Debug|Win32.Build.0 = Debug|Win32 + {2F64EA35-0D45-4A8E-940E-4242CA290BFB}.Release|Win32.ActiveCfg = Release|Win32 + {2F64EA35-0D45-4A8E-940E-4242CA290BFB}.Release|Win32.Build.0 = Release|Win32 + {B0C46B20-F278-4B69-9B7B-59A0AE386637}.Debug|Win32.ActiveCfg = Debug|Win32 + {B0C46B20-F278-4B69-9B7B-59A0AE386637}.Debug|Win32.Build.0 = Debug|Win32 + {B0C46B20-F278-4B69-9B7B-59A0AE386637}.Release|Win32.ActiveCfg = Release|Win32 + {B0C46B20-F278-4B69-9B7B-59A0AE386637}.Release|Win32.Build.0 = Release|Win32 + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03}.Debug|Win32.ActiveCfg = Debug|Win32 + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03}.Debug|Win32.Build.0 = Debug|Win32 + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03}.Release|Win32.ActiveCfg = Release|Win32 + {6BE3BF2A-9EB3-4D35-922C-2B46312A2B03}.Release|Win32.Build.0 = Release|Win32 + {9E350D92-0B8C-48F0-A031-61F4BAD1D091}.Debug|Win32.ActiveCfg = Debug|Win32 + {9E350D92-0B8C-48F0-A031-61F4BAD1D091}.Debug|Win32.Build.0 = Debug|Win32 + {9E350D92-0B8C-48F0-A031-61F4BAD1D091}.Release|Win32.ActiveCfg = Release|Win32 + {9E350D92-0B8C-48F0-A031-61F4BAD1D091}.Release|Win32.Build.0 = Release|Win32 + {047EA89F-181D-45F5-A22C-F402768E17D7}.Debug|Win32.ActiveCfg = Debug|Win32 + {047EA89F-181D-45F5-A22C-F402768E17D7}.Debug|Win32.Build.0 = Debug|Win32 + {047EA89F-181D-45F5-A22C-F402768E17D7}.Release|Win32.ActiveCfg = Release|Win32 + {047EA89F-181D-45F5-A22C-F402768E17D7}.Release|Win32.Build.0 = Release|Win32 + {80D1B2DB-A347-465B-8C4C-5281CCD6B8A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {80D1B2DB-A347-465B-8C4C-5281CCD6B8A0}.Debug|Win32.Build.0 = Debug|Win32 + {80D1B2DB-A347-465B-8C4C-5281CCD6B8A0}.Release|Win32.ActiveCfg = Release|Win32 + {80D1B2DB-A347-465B-8C4C-5281CCD6B8A0}.Release|Win32.Build.0 = Release|Win32 + {5C516DBD-D0A4-4CF3-8954-3089DE444E30}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C516DBD-D0A4-4CF3-8954-3089DE444E30}.Debug|Win32.Build.0 = Debug|Win32 + {5C516DBD-D0A4-4CF3-8954-3089DE444E30}.Release|Win32.ActiveCfg = Release|Win32 + {5C516DBD-D0A4-4CF3-8954-3089DE444E30}.Release|Win32.Build.0 = Release|Win32 + {86B71F7A-7504-4CD9-9822-BC3D43556804}.Debug|Win32.ActiveCfg = Debug|Win32 + {86B71F7A-7504-4CD9-9822-BC3D43556804}.Debug|Win32.Build.0 = Debug|Win32 + {86B71F7A-7504-4CD9-9822-BC3D43556804}.Release|Win32.ActiveCfg = Release|Win32 + {86B71F7A-7504-4CD9-9822-BC3D43556804}.Release|Win32.Build.0 = Release|Win32 + {7D72B085-F13F-4592-9A3E-C981A8BD7C08}.Debug|Win32.ActiveCfg = Debug|Win32 + {7D72B085-F13F-4592-9A3E-C981A8BD7C08}.Debug|Win32.Build.0 = Debug|Win32 + {7D72B085-F13F-4592-9A3E-C981A8BD7C08}.Release|Win32.ActiveCfg = Release|Win32 + {7D72B085-F13F-4592-9A3E-C981A8BD7C08}.Release|Win32.Build.0 = Release|Win32 + {43D1F4D8-8EBD-4535-B78A-CEEF24380BE4}.Debug|Win32.ActiveCfg = Debug|Win32 + {43D1F4D8-8EBD-4535-B78A-CEEF24380BE4}.Debug|Win32.Build.0 = Debug|Win32 + {43D1F4D8-8EBD-4535-B78A-CEEF24380BE4}.Release|Win32.ActiveCfg = Release|Win32 + {43D1F4D8-8EBD-4535-B78A-CEEF24380BE4}.Release|Win32.Build.0 = Release|Win32 + {AF86F99C-09C7-419F-A708-657D527D4E73}.Debug|Win32.ActiveCfg = Debug|Win32 + {AF86F99C-09C7-419F-A708-657D527D4E73}.Debug|Win32.Build.0 = Debug|Win32 + {AF86F99C-09C7-419F-A708-657D527D4E73}.Release|Win32.ActiveCfg = Release|Win32 + {AF86F99C-09C7-419F-A708-657D527D4E73}.Release|Win32.Build.0 = Release|Win32 + {84B229A5-333C-4D2F-9B91-F71248AFFCC4}.Debug|Win32.ActiveCfg = Debug|Win32 + {84B229A5-333C-4D2F-9B91-F71248AFFCC4}.Debug|Win32.Build.0 = Debug|Win32 + {84B229A5-333C-4D2F-9B91-F71248AFFCC4}.Release|Win32.ActiveCfg = Release|Win32 + {84B229A5-333C-4D2F-9B91-F71248AFFCC4}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal From bfrisch at edam.speech.cs.cmu.edu Thu Aug 9 19:13:10 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Thu, 9 Aug 2007 19:13:10 -0400 Subject: [RavenclawDev 300] [1980] Libraries/sphinx2/trunkSphinx2msdev: 1) Now contains a number of converted projects. Message-ID: <200708092313.l79NDA8d011551@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070809/4c4d2160/attachment-0001.html -------------- next part -------------- Added: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adpow/adpow.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adpow/adpow.vcproj (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adpow/adpow.vcproj 2007-08-09 23:13:09 UTC (rev 1980) @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adrec/adrec.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adrec/adrec.vcproj (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adrec/adrec.vcproj 2007-08-09 23:13:09 UTC (rev 1980) @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_adseg/cont_adseg.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_adseg/cont_adseg.vcproj (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_adseg/cont_adseg.vcproj 2007-08-09 23:13:09 UTC (rev 1980) @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_fileseg/cont_fileseg.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_fileseg/cont_fileseg.vcproj (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_fileseg/cont_fileseg.vcproj 2007-08-09 23:13:09 UTC (rev 1980) @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/lm3g2dmp/lm3g2dmp.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/lm3g2dmp/lm3g2dmp.vcproj (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/lm3g2dmp/lm3g2dmp.vcproj 2007-08-09 23:13:09 UTC (rev 1980) @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/raw2cep/raw2cep.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/raw2cep/raw2cep.vcproj (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/raw2cep/raw2cep.vcproj 2007-08-09 23:13:09 UTC (rev 1980) @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_allphone/sphinx2_allphone.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_allphone/sphinx2_allphone.vcproj (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_allphone/sphinx2_allphone.vcproj 2007-08-09 23:13:09 UTC (rev 1980) @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_batch/sphinx2_batch.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_batch/sphinx2_batch.vcproj (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_batch/sphinx2_batch.vcproj 2007-08-09 23:13:09 UTC (rev 1980) @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_client/sphinx2_client.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_client/sphinx2_client.vcproj (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_client/sphinx2_client.vcproj 2007-08-09 23:13:09 UTC (rev 1980) @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_continuous/sphinx2_continuous.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_continuous/sphinx2_continuous.vcproj (rev 0) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/sphinx2_continuous/sphinx2_continuous.vcproj 2007-08-09 23:13:09 UTC (rev 1980) @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070810/7e833060/attachment-0001.html -------------- next part -------------- Modified: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adpow/adpow.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adpow/adpow.vcproj 2007-08-09 23:13:09 UTC (rev 1980) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adpow/adpow.vcproj 2007-08-10 08:08:49 UTC (rev 1981) @@ -1,255 +1,513 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +\xFF\xFE< + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Modified: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adrec/adrec.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adrec/adrec.vcproj 2007-08-09 23:13:09 UTC (rev 1980) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/adrec/adrec.vcproj 2007-08-10 08:08:49 UTC (rev 1981) @@ -1,255 +1,513 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +\xFF\xFE< + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Modified: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_adseg/cont_adseg.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_adseg/cont_adseg.vcproj 2007-08-09 23:13:09 UTC (rev 1980) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_adseg/cont_adseg.vcproj 2007-08-10 08:08:49 UTC (rev 1981) @@ -4,6 +4,7 @@ Version="8.00" Name="cont_adseg" ProjectGUID="{1FA05DBB-DE80-4CA2-93F1-9A740DA06FE7}" + RootNamespace="cont_adseg" > @@ -241,15 +242,15 @@ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > Modified: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_fileseg/cont_fileseg.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_fileseg/cont_fileseg.vcproj 2007-08-09 23:13:09 UTC (rev 1980) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/cont_fileseg/cont_fileseg.vcproj 2007-08-10 08:08:49 UTC (rev 1981) @@ -1,259 +1,521 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +\xFF\xFE< + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Modified: Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/lm3g2dmp/lm3g2dmp.vcproj =================================================================== --- Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/lm3g2dmp/lm3g2dmp.vcproj 2007-08-09 23:13:09 UTC (rev 1980) +++ Libraries/sphinx2/trunkSphinx2msdev/SphinxExamples/lm3g2dmp/lm3g2dmp.vcproj 2007-08-10 08:08:49 UTC (rev 1981) @@ -1,275 +1,553 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070810/7f1f5dda/attachment.html -------------- next part -------------- Copied: Libraries/trunkSphinx2msdev (from rev 1981, Libraries/sphinx2/trunkSphinx2msdev) From tk at edam.speech.cs.cmu.edu Fri Aug 10 12:26:28 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 10 Aug 2007 12:26:28 -0400 Subject: [RavenclawDev 303] [1983] Agents/MultiDecoder/Audio_Server/main.cpp: This modification supports the current sourceforge sphinx2, whose feature extractor now returns the number of frames. Message-ID: <200708101626.l7AGQSlZ013311@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070810/f1af8ca7/attachment.html -------------- next part -------------- Modified: Agents/MultiDecoder/Audio_Server/main.cpp =================================================================== --- Agents/MultiDecoder/Audio_Server/main.cpp 2007-08-10 08:11:57 UTC (rev 1982) +++ Agents/MultiDecoder/Audio_Server/main.cpp 2007-08-10 16:26:27 UTC (rev 1983) @@ -1275,9 +1275,8 @@ /* ignore the truncation part */ int k; - //if ((k = fe_raw2cep (srvcb->buf, srvcb->n_rd / sizeof(short), mfcbuf + n_rawfr)) < 0) - // fprintf(stderr, "Couldn't calculate MFCs\n"); - if ((k = fe_process_utt (fe, srvcb->buf, srvcb->n_rd / sizeof(short), mfcbuf + n_rawfr)) < 0) + int32 nframes; + if ((k = fe_process_utt (fe, srvcb->buf, srvcb->n_rd / sizeof(short), mfcbuf + n_rawfr, &nframes)) < 0) Log(STD_STREAM, "Couldn't calculate MFCs"); if (mfcfp && (k > 0)) @@ -1354,7 +1353,8 @@ /* ignore the truncation part */ int k; - if ((k = fe_process_utt (fe, srvcb->buf, srvcb->n_rd / sizeof(short), mfcbuf + n_rawfr)) < 0) + int32 nframes; + if ((k = fe_process_utt (fe, srvcb->buf, srvcb->n_rd / sizeof(short), mfcbuf + n_rawfr, &nframes)) < 0) Log( ERR_STREAM, "Couldn't calculate MFCs"); if (mfcfp && (k > 0)) From bfrisch at edam.speech.cs.cmu.edu Sat Aug 11 02:01:49 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Sat, 11 Aug 2007 02:01:49 -0400 Subject: [RavenclawDev 304] [1984] Libraries/Galaxy: 1) Adding bin/x86-nt/HUB.exe Message-ID: <200708110601.l7B61nik015242@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070811/99e1c686/attachment.html -------------- next part -------------- Added: Libraries/Galaxy/bin/x86-nt/HUB.exe =================================================================== (Binary files differ) Property changes on: Libraries/Galaxy/bin/x86-nt/HUB.exe ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From bfrisch at edam.speech.cs.cmu.edu Sat Aug 11 02:03:02 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Sat, 11 Aug 2007 02:03:02 -0400 Subject: [RavenclawDev 305] [1985] Libraries/trunkSphinx2msdev: 1) Sphinx2 solutions now compile without warnings Message-ID: <200708110603.l7B632sR015253@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070811/99126d4c/attachment-0001.html -------------- next part -------------- Modified: Libraries/trunkSphinx2msdev/SphinxExamples/adpow/adpow.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/adpow/adpow.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/adpow/adpow.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -108,7 +108,7 @@ - @@ -276,7 +276,7 @@ - @@ -294,7 +294,7 @@ - @@ -414,7 +414,7 @@ - Modified: Libraries/trunkSphinx2msdev/SphinxExamples/adrec/adrec.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/adrec/adrec.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/adrec/adrec.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -92,7 +92,7 @@ - @@ -110,7 +110,7 @@ - @@ -290,7 +290,7 @@ - Modified: Libraries/trunkSphinx2msdev/SphinxExamples/cont_adseg/cont_adseg.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/cont_adseg/cont_adseg.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/cont_adseg/cont_adseg.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\src\libsphinx2\include,..\..\..\..\include" + AdditionalIncludeDirectories="..\..\..\sphinx2\include;..\..\..\sphinx2\src\libsphinx2\include" PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;AD_BACKEND_WIN32" StringPooling="true" RuntimeLibrary="2" @@ -54,7 +54,7 @@ AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" - WarningLevel="3" + WarningLevel="0" SuppressStartupBanner="true" /> Modified: Libraries/trunkSphinx2msdev/SphinxExamples/cont_fileseg/cont_fileseg.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/cont_fileseg/cont_fileseg.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/cont_fileseg/cont_fileseg.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -108,7 +108,7 @@ - @@ -276,7 +276,7 @@ - @@ -294,7 +294,7 @@ - Modified: Libraries/trunkSphinx2msdev/SphinxExamples/lm3g2dmp/lm3g2dmp.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/lm3g2dmp/lm3g2dmp.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/lm3g2dmp/lm3g2dmp.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -92,7 +92,7 @@ - @@ -110,7 +110,7 @@ - @@ -290,7 +290,7 @@ - Modified: Libraries/trunkSphinx2msdev/SphinxExamples/raw2cep/raw2cep.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/raw2cep/raw2cep.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/raw2cep/raw2cep.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\src\libsphinx2\include,..\..\..\..\include" + AdditionalIncludeDirectories="..\..\..\sphinx2\include;..\..\..\sphinx2\src\libsphinx2\include" PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;AD_BACKEND_WIN32" StringPooling="true" RuntimeLibrary="2" @@ -54,7 +54,7 @@ AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" - WarningLevel="3" + WarningLevel="0" SuppressStartupBanner="true" /> Modified: Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_allphone/sphinx2_allphone.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_allphone/sphinx2_allphone.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_allphone/sphinx2_allphone.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -92,7 +92,7 @@ - @@ -110,7 +110,7 @@ - @@ -290,7 +290,7 @@ - Modified: Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_batch/sphinx2_batch.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_batch/sphinx2_batch.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_batch/sphinx2_batch.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -92,7 +92,7 @@ - @@ -110,7 +110,7 @@ - @@ -290,7 +290,7 @@ - Modified: Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_client/sphinx2_client.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_client/sphinx2_client.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_client/sphinx2_client.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -108,7 +108,7 @@ - @@ -276,7 +276,7 @@ - @@ -294,7 +294,7 @@ - Modified: Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_continuous/sphinx2_continuous.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_continuous/sphinx2_continuous.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_continuous/sphinx2_continuous.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\src\libsphinx2\include,..\..\..\..\include" + AdditionalIncludeDirectories="..\..\..\sphinx2\include;..\..\..\sphinx2\src\libsphinx2\include" PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;AD_BACKEND_WIN32" StringPooling="true" RuntimeLibrary="2" @@ -54,7 +54,7 @@ AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" - WarningLevel="3" + WarningLevel="0" SuppressStartupBanner="true" /> Modified: Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_ptt/sphinx2_ptt.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_ptt/sphinx2_ptt.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_ptt/sphinx2_ptt.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -92,7 +92,7 @@ - @@ -110,7 +110,7 @@ - @@ -290,7 +290,7 @@ - Modified: Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_server/sphinx2_server.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_server/sphinx2_server.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/SphinxExamples/sphinx2_server/sphinx2_server.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -108,7 +108,7 @@ - @@ -276,7 +276,7 @@ - @@ -294,7 +294,7 @@ - Modified: Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="libsphinx2" - ProjectGUID="{B0C46B20-F278-4B69-9B7B-59A0AE386637}" + ProjectGUID="{BB2093E6-97B7-47B1-9F6D-5F7417E69267}" RootNamespace="libsphinx2" Keyword="MFCProj" > @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\include,..\..\..\src\libsphinx2\include,..\..\..\include" + AdditionalIncludeDirectories="..\..\sphinx2\include;..\..\sphinx2\src\libsphinx2\include" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;FAST8B;LM_CACHE_PROFLE;FBSVQ_V8=1;UNPADDED_CEP=1" StringPooling="true" RuntimeLibrary="2" @@ -53,7 +53,7 @@ AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" - WarningLevel="3" + WarningLevel="0" SuppressStartupBanner="true" /> Modified: Libraries/trunkSphinx2msdev/libsphinx2ad/libsphinx2ad.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/libsphinx2ad/libsphinx2ad.vcproj 2007-08-11 06:01:48 UTC (rev 1984) +++ Libraries/trunkSphinx2msdev/libsphinx2ad/libsphinx2ad.vcproj 2007-08-11 06:03:02 UTC (rev 1985) @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="libsphinx2ad" - ProjectGUID="{6BE3BF2A-9EB3-4D35-922C-2B46312A2B03}" + ProjectGUID="{B1A99CB7-705E-41D0-A461-6CE24CB83C50}" RootNamespace="libsphinx2ad" > @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\include ..\..\..\src\libsphinx2\include,..\..\..\src\libsphinx2\include,..\..\..\include" - PreprocessorDefinitions="_DEBUG;WIN32;_LIB;AD_BACKEND_WIN32" + PreprocessorDefinitions="_DEBUG;WIN32;_LIB;AD_BACKEND_WIN32;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -51,7 +51,7 @@ AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" - WarningLevel="3" + WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="4" /> @@ -118,7 +118,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\include ..\..\..\src\libsphinx2\include,..\..\..\src\libsphinx2\include,..\..\..\include" + AdditionalIncludeDirectories="..\..\sphinx2\include;..\..\sphinx2\src\libsphinx2\include" PreprocessorDefinitions="NDEBUG;WIN32;_LIB;AD_BACKEND_WIN32" StringPooling="true" RuntimeLibrary="2" @@ -127,7 +127,7 @@ AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" - WarningLevel="3" + WarningLevel="0" SuppressStartupBanner="true" /> @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\include ..\..\..\src\libsphinx2\include,..\..\..\src\libsphinx2\include,..\..\..\include" + AdditionalIncludeDirectories="..\..\sphinx2\include;..\..\sphinx2\src\libsphinx2\include" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" StringPooling="true" RuntimeLibrary="2" @@ -52,7 +52,7 @@ AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" - WarningLevel="3" + WarningLevel="0" SuppressStartupBanner="true" /> From bfrisch at edam.speech.cs.cmu.edu Sat Aug 11 02:44:54 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Sat, 11 Aug 2007 02:44:54 -0400 Subject: [RavenclawDev 306] [1986] Libraries/RavenClaw/RavenClaw.sln: 1) Updated RavenClaw. sln to VS 2005 Message-ID: <200708110644.l7B6is95015294@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070811/dc045ea7/attachment.html -------------- next part -------------- Modified: Libraries/RavenClaw/RavenClaw.sln =================================================================== --- Libraries/RavenClaw/RavenClaw.sln 2007-08-11 06:03:02 UTC (rev 1985) +++ Libraries/RavenClaw/RavenClaw.sln 2007-08-11 06:44:53 UTC (rev 1986) @@ -1,38 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RavenClaw", "RavenClaw.vcproj", "{924E0F51-560D-42C1-9A34-C3A9ED5AEABE}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global - GlobalSection(SourceCodeControl) = preSolution - SccNumberOfProjects = 2 - SccProjectName0 = \u0022$/Libraries/RavenClaw\u0022,\u0020SUJAAAAA - SccLocalPath0 = . - SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe - CanCheckoutShared = false - SolutionUniqueID = {CFFED492-5159-4FBB-8FA1-FC7179656C6A} - SccProjectUniqueName1 = RavenClaw.vcproj - SccLocalPath1 = . - CanCheckoutShared = false + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug Galaxy|Win32 = Debug Galaxy|Win32 + Debug OAA|Win32 = Debug OAA|Win32 + DebugGalaxy|Win32 = DebugGalaxy|Win32 + DebugOAA|Win32 = DebugOAA|Win32 + Release Galaxy|Win32 = Release Galaxy|Win32 + Release OAA|Win32 = Release OAA|Win32 + ReleaseGalaxy|Win32 = ReleaseGalaxy|Win32 + ReleaseOAA|Win32 = ReleaseOAA|Win32 EndGlobalSection - GlobalSection(SolutionConfiguration) = preSolution - Debug Galaxy = Debug Galaxy - Debug OAA = Debug OAA - Release Galaxy = Release Galaxy - Release OAA = Release OAA + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Debug Galaxy|Win32.ActiveCfg = DebugOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Debug Galaxy|Win32.Build.0 = DebugOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Debug OAA|Win32.ActiveCfg = DebugOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Debug OAA|Win32.Build.0 = DebugOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.DebugGalaxy|Win32.ActiveCfg = DebugGalaxy|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.DebugGalaxy|Win32.Build.0 = DebugGalaxy|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.DebugOAA|Win32.ActiveCfg = DebugOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.DebugOAA|Win32.Build.0 = DebugOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Release Galaxy|Win32.ActiveCfg = ReleaseOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Release Galaxy|Win32.Build.0 = ReleaseOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Release OAA|Win32.ActiveCfg = ReleaseOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Release OAA|Win32.Build.0 = ReleaseOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.ReleaseGalaxy|Win32.ActiveCfg = ReleaseGalaxy|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.ReleaseGalaxy|Win32.Build.0 = ReleaseGalaxy|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.ReleaseOAA|Win32.ActiveCfg = ReleaseOAA|Win32 + {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.ReleaseOAA|Win32.Build.0 = ReleaseOAA|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Debug Galaxy.ActiveCfg = DebugOAA|Win32 - {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Debug Galaxy.Build.0 = DebugOAA|Win32 - {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Debug OAA.ActiveCfg = DebugOAA|Win32 - {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Debug OAA.Build.0 = DebugOAA|Win32 - {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Release Galaxy.ActiveCfg = ReleaseOAA|Win32 - {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Release Galaxy.Build.0 = ReleaseOAA|Win32 - {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Release OAA.ActiveCfg = ReleaseOAA|Win32 - {924E0F51-560D-42C1-9A34-C3A9ED5AEABE}.Release OAA.Build.0 = ReleaseOAA|Win32 + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection EndGlobal From bfrisch at edam.speech.cs.cmu.edu Sat Aug 11 03:44:16 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Sat, 11 Aug 2007 03:44:16 -0400 Subject: [RavenclawDev 307] [1987] Libraries/Galaxy/contrib/MITRE: 1) Removing Binaries from Galaxy server Message-ID: <200708110744.l7B7iGPN015357@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070811/aefb5ebf/attachment-0001.html -------------- next part -------------- Added: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Audio.vcproj =================================================================== --- Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Audio.vcproj (rev 0) +++ Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Audio.vcproj 2007-08-11 07:44:16 UTC (rev 1987) @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Backend.vcproj =================================================================== --- Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Backend.vcproj (rev 0) +++ Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Backend.vcproj 2007-08-11 07:44:16 UTC (rev 1987) @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Debug/Audio.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Debug/Backend.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Debug/Recognizer.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Debug/Synthesizer.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Debug/UI.pch =================================================================== (Binary files differ) Added: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Dialogue.vcproj =================================================================== --- Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Dialogue.vcproj (rev 0) +++ Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Dialogue.vcproj 2007-08-11 07:44:16 UTC (rev 1987) @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Generator.vcproj =================================================================== --- Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Generator.vcproj (rev 0) +++ Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Generator.vcproj 2007-08-11 07:44:16 UTC (rev 1987) @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/IOMonitor.vcproj =================================================================== --- Libraries/Galaxy/contrib/MITRE/demos/toy-travel/IOMonitor.vcproj (rev 0) +++ Libraries/Galaxy/contrib/MITRE/demos/toy-travel/IOMonitor.vcproj 2007-08-11 07:44:16 UTC (rev 1987) @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Parser.vcproj =================================================================== --- Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Parser.vcproj (rev 0) +++ Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Parser.vcproj 2007-08-11 07:44:16 UTC (rev 1987) @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Recognizer.vcproj =================================================================== --- Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Recognizer.vcproj (rev 0) +++ Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Recognizer.vcproj 2007-08-11 07:44:16 UTC (rev 1987) @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Audio.pch =================================================================== (Binary files differ) Modified: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Backend.obj =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Backend.pch =================================================================== (Binary files differ) Modified: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Dialogue.obj =================================================================== (Binary files differ) Modified: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Generator.obj =================================================================== (Binary files differ) Modified: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/IOMonitor.obj =================================================================== (Binary files differ) Modified: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Parser.obj =================================================================== (Binary files differ) Modified: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Recognizer.obj =================================================================== (Binary files differ) Modified: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Synthesizer.obj =================================================================== (Binary files differ) Added: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Synthesizer.vcproj =================================================================== --- Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Synthesizer.vcproj (rev 0) +++ Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Synthesizer.vcproj 2007-08-11 07:44:16 UTC (rev 1987) @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/UI.vcproj =================================================================== --- Libraries/Galaxy/contrib/MITRE/demos/toy-travel/UI.vcproj (rev 0) +++ Libraries/Galaxy/contrib/MITRE/demos/toy-travel/UI.vcproj 2007-08-11 07:44:16 UTC (rev 1987) @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070811/7b38880c/attachment.html -------------- next part -------------- Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Debug/Dialogue.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Debug/Generator.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Debug/IOMonitor.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Debug/Parser.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Dialogue.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Generator.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/IOMonitor.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Parser.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Recognizer.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/Synthesizer.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/UI.obj =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/UI.pch =================================================================== (Binary files differ) Deleted: Libraries/Galaxy/contrib/MITRE/demos/toy-travel/Release/component_engine.obj =================================================================== (Binary files differ) From bfrisch at edam.speech.cs.cmu.edu Sat Aug 11 03:47:24 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Sat, 11 Aug 2007 03:47:24 -0400 Subject: [RavenclawDev 309] [1989] Libraries/Galaxy/contrib/MITRE/demos/toy-travel: 1) Removing more files Message-ID: <200708110747.l7B7lO9i015377@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070811/46df9fa8/attachment.html -------------- next part -------------- From bfrisch at edam.speech.cs.cmu.edu Sat Aug 11 03:54:23 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Sat, 11 Aug 2007 03:54:23 -0400 Subject: [RavenclawDev 310] [1990] Tools: 1) Adding dummy Tools.sln Message-ID: <200708110754.l7B7sNBQ015404@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070811/42a5a7c5/attachment.html -------------- next part -------------- Added: Tools/Tools.sln =================================================================== --- Tools/Tools.sln (rev 0) +++ Tools/Tools.sln 2007-08-11 07:54:23 UTC (rev 1990) @@ -0,0 +1,8 @@ +? +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Global + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: Tools/reg/reg.exe =================================================================== (Binary files differ) Property changes on: Tools/reg/reg.exe ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From bfrisch at edam.speech.cs.cmu.edu Sat Aug 11 22:21:16 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Sat, 11 Aug 2007 22:21:16 -0400 Subject: [RavenclawDev 311] [1991] Tools/reg/: 1) Removing TeamTalk use only files Message-ID: <200708120221.l7C2LGOa019832@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070811/4ccf42f1/attachment.html -------------- next part -------------- From bfrisch at edam.speech.cs.cmu.edu Wed Aug 15 16:47:33 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Wed, 15 Aug 2007 16:47:33 -0400 Subject: [RavenclawDev 312] [1993] Agents/NlgServer2/NlgServer2.vcproj: 1) Fixing final location in release build Message-ID: <200708152047.l7FKlXh8001130@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070815/e799e34e/attachment.html -------------- next part -------------- Modified: Agents/NlgServer2/NlgServer2.vcproj =================================================================== --- Agents/NlgServer2/NlgServer2.vcproj 2007-08-15 20:47:17 UTC (rev 1992) +++ Agents/NlgServer2/NlgServer2.vcproj 2007-08-15 20:47:32 UTC (rev 1993) @@ -110,8 +110,8 @@ From bfrisch at edam.speech.cs.cmu.edu Wed Aug 15 16:47:17 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Wed, 15 Aug 2007 16:47:17 -0400 Subject: [RavenclawDev 313] [1992] Agents/Phoenix2/phoenix2.vcproj: 1) Fixing final location in release build Message-ID: <200708152047.l7FKlHJe001120@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070815/5befb4c2/attachment.html -------------- next part -------------- Modified: Agents/Phoenix2/phoenix2.vcproj =================================================================== --- Agents/Phoenix2/phoenix2.vcproj 2007-08-12 02:21:14 UTC (rev 1991) +++ Agents/Phoenix2/phoenix2.vcproj 2007-08-15 20:47:17 UTC (rev 1992) @@ -109,8 +109,8 @@ From bfrisch at edam.speech.cs.cmu.edu Wed Aug 15 16:47:41 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Wed, 15 Aug 2007 16:47:41 -0400 Subject: [RavenclawDev 314] [1994] Agents/Kalliope/Kalliope.vcproj: 1) Fixing final location in release build Message-ID: <200708152047.l7FKlfe2001140@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070815/0bbad6d6/attachment.html -------------- next part -------------- Modified: Agents/Kalliope/Kalliope.vcproj =================================================================== --- Agents/Kalliope/Kalliope.vcproj 2007-08-15 20:47:32 UTC (rev 1993) +++ Agents/Kalliope/Kalliope.vcproj 2007-08-15 20:47:41 UTC (rev 1994) @@ -436,6 +436,8 @@ > From bfrisch at edam.speech.cs.cmu.edu Wed Aug 15 16:47:53 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Wed, 15 Aug 2007 16:47:53 -0400 Subject: [RavenclawDev 315] [1995] Agents/Helios3/Helios3.vcproj: 1) Fixing final location in release build Message-ID: <200708152047.l7FKlrWJ001150@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070815/bb750119/attachment.html -------------- next part -------------- Modified: Agents/Helios3/Helios3.vcproj =================================================================== --- Agents/Helios3/Helios3.vcproj 2007-08-15 20:47:41 UTC (rev 1994) +++ Agents/Helios3/Helios3.vcproj 2007-08-15 20:47:53 UTC (rev 1995) @@ -109,6 +109,8 @@ > From bfrisch at edam.speech.cs.cmu.edu Wed Aug 15 16:48:12 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Wed, 15 Aug 2007 16:48:12 -0400 Subject: [RavenclawDev 316] [1996] Libraries/trunkSphinx2msdev/libsphinx2: Updating project properties Message-ID: <200708152048.l7FKmC0M001160@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070815/e96fc278/attachment-0001.html -------------- next part -------------- Modified: Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj 2007-08-15 20:47:53 UTC (rev 1995) +++ Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj 2007-08-15 20:48:12 UTC (rev 1996) @@ -17,8 +17,8 @@ An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070815/7680bb66/attachment.html -------------- next part -------------- Modified: Libraries/RavenClaw/RavenClaw.vcproj =================================================================== --- Libraries/RavenClaw/RavenClaw.vcproj 2007-08-15 20:48:12 UTC (rev 1996) +++ Libraries/RavenClaw/RavenClaw.vcproj 2007-08-15 20:48:23 UTC (rev 1997) @@ -27,6 +27,8 @@ > An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070815/47143a22/attachment.html -------------- next part -------------- Modified: Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj 2007-08-15 20:48:23 UTC (rev 1997) +++ Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj 2007-08-15 21:17:19 UTC (rev 1998) @@ -69,7 +69,7 @@ /> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070815/856a0545/attachment.html -------------- next part -------------- Modified: Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj =================================================================== --- Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj 2007-08-15 21:17:19 UTC (rev 1998) +++ Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj 2007-08-15 21:18:08 UTC (rev 1999) @@ -181,7 +181,8 @@ /> From bfrisch at edam.speech.cs.cmu.edu Wed Aug 15 17:18:16 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Wed, 15 Aug 2007 17:18:16 -0400 Subject: [RavenclawDev 320] [2000] Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj: Fix build location Message-ID: <200708152118.l7FLIG1g001237@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070815/efb40dcf/attachment.html -------------- next part -------------- Modified: Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj =================================================================== --- Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj 2007-08-15 21:18:08 UTC (rev 1999) +++ Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj 2007-08-15 21:18:15 UTC (rev 2000) @@ -177,7 +177,8 @@ /> From tk at edam.speech.cs.cmu.edu Thu Aug 16 14:35:23 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 16 Aug 2007 14:35:23 -0400 Subject: [RavenclawDev 321] [16] MeetingLine: Moved remotely Message-ID: <200708161835.l7GIZN4j003129@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070816/24fedce8/attachment.html -------------- next part -------------- Copied: Agents (from rev 15, MeetingLine/Agents) From tk at edam.speech.cs.cmu.edu Thu Aug 16 14:35:37 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 16 Aug 2007 14:35:37 -0400 Subject: [RavenclawDev 322] [17] MeetingLine: Moved remotely Message-ID: <200708161835.l7GIZbXq003140@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070816/cc7c05de/attachment.html -------------- next part -------------- Copied: Configurations (from rev 16, MeetingLine/Configurations) From tk at edam.speech.cs.cmu.edu Thu Aug 16 14:35:44 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 16 Aug 2007 14:35:44 -0400 Subject: [RavenclawDev 323] [18] MeetingLine: Moved remotely Message-ID: <200708161835.l7GIZiYF003150@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070816/474fe78c/attachment.html -------------- next part -------------- Copied: Documents (from rev 17, MeetingLine/Documents) From tk at edam.speech.cs.cmu.edu Thu Aug 16 14:36:17 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 16 Aug 2007 14:36:17 -0400 Subject: [RavenclawDev 324] [19] MeetingLine: Moved remotely Message-ID: <200708161836.l7GIaHFW003161@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070816/2b9a80cd/attachment.html -------------- next part -------------- Copied: Resources (from rev 18, MeetingLine/Resources) From tk at edam.speech.cs.cmu.edu Thu Aug 16 14:39:35 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 16 Aug 2007 14:39:35 -0400 Subject: [RavenclawDev 325] [20] MeetingLine/: Removed file/folder Message-ID: <200708161839.l7GIdZkD003173@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070816/7b92a9a0/attachment.html -------------- next part -------------- From tk at edam.speech.cs.cmu.edu Thu Aug 16 15:26:17 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 16 Aug 2007 15:26:17 -0400 Subject: [RavenclawDev 326] [21] Linked in olympus and sphinx libraries and agents. Message-ID: <200708161926.l7GJQHLK003339@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070816/0a31b6cb/attachment-0001.html -------------- next part -------------- Property changes on: Agents ___________________________________________________________________ Name: svn:externals + BackendServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/BackendServer2 DateTime4 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/DateTime4 Helios3 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Helios3 Kalliope http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Kalliope MultiDecoder/AudioServer http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/AudioServer MultiDecoder/DTMF_Engine http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/DTMF_Engine MultiDecoder/Sphinx_Engine http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/Sphinx_Engine NlgServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/NlgServer2 Phoenix2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Phoenix2 ProcessMonitor http://edam.speech.cs.cmu.edu/repos/olympus/Agents/ProcessMonitor TTYRecognitionServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/TTYRecognitionServer2 Property changes on: Libraries ___________________________________________________________________ Name: svn:externals + DTMFDecoder http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/DTMFDecoder Galaxy http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/Galaxy RavenClaw http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/RavenClaw Rosetta http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/Rosetta sphinx2 https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk/sphinx2 From tk at edam.speech.cs.cmu.edu Thu Aug 16 17:57:57 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 16 Aug 2007 17:57:57 -0400 Subject: [RavenclawDev 327] [22] Fixed Audio_Server extern. Message-ID: <200708162157.l7GLvvYu003507@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070816/8d22340d/attachment.html -------------- next part -------------- Property changes on: Agents ___________________________________________________________________ Name: svn:externals - BackendServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/BackendServer2 DateTime4 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/DateTime4 Helios3 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Helios3 Kalliope http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Kalliope MultiDecoder/AudioServer http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/AudioServer MultiDecoder/DTMF_Engine http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/DTMF_Engine MultiDecoder/Sphinx_Engine http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/Sphinx_Engine NlgServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/NlgServer2 Phoenix2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Phoenix2 ProcessMonitor http://edam.speech.cs.cmu.edu/repos/olympus/Agents/ProcessMonitor TTYRecognitionServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/TTYRecognitionServer2 + BackendServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/BackendServer2 DateTime4 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/DateTime4 Helios3 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Helios3 Kalliope http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Kalliope MultiDecoder/Audio_Server http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/Audio_Server MultiDecoder/DTMF_Engine http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/DTMF_Engine MultiDecoder/Sphinx_Engine http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/Sphinx_Engine NlgServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/NlgServer2 Phoenix2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Phoenix2 ProcessMonitor http://edam.speech.cs.cmu.edu/repos/olympus/Agents/ProcessMonitor TTYRecognitionServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/TTYRecognitionServer2 Modified: Agents/MeetingLineDM/MeetingLineDM.vcproj =================================================================== --- Agents/MeetingLineDM/MeetingLineDM.vcproj 2007-08-16 19:26:17 UTC (rev 21) +++ Agents/MeetingLineDM/MeetingLineDM.vcproj 2007-08-16 21:57:55 UTC (rev 22) @@ -1,130 +1,191 @@ + RootNamespace="MeetingLineDM" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\bin\x86-nt\$(TargetName).exe" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="0" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\bin\x86-nt\$(TargetName)-DEBUG.exe" + /> @@ -132,47 +193,59 @@ + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + RelativePath="BindingFilters.cpp" + > + RelativePath="BindingFilters.h" + > + RelativePath="MeetingLineDialogTask.cpp" + > + > + RelativePath="expl.pol" + > + RelativePath="expl_impl.pol" + > + RelativePath="grounding.policies" + > + RelativePath="MeetingLineDM.cfg" + > + RelativePath="request_default.pol" + > + RelativePath=".\request_lr.pol" + > + > + RelativePath="DialogTaskStructure.txt" + > + RelativePath="ToDo.txt" + > Property changes on: Libraries ___________________________________________________________________ Name: svn:externals - DTMFDecoder http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/DTMFDecoder Galaxy http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/Galaxy RavenClaw http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/RavenClaw Rosetta http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/Rosetta sphinx2 https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk/sphinx2 + DTMFDecoder http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/DTMFDecoder Galaxy http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/Galaxy RavenClaw http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/RavenClaw Rosetta http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/Rosetta sphinx2 https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk/sphinx2 trunkSphinx2msdev http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/trunkSphinx2msdev From tk at edam.speech.cs.cmu.edu Fri Aug 17 10:22:34 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 17 Aug 2007 10:22:34 -0400 Subject: [RavenclawDev 328] [2001] Agents/BackendServer2/BackendServer2.vcproj: conversion to ms visual studio 2005 Message-ID: <200708171422.l7HEMY7W004875@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070817/c9291b5f/attachment-0001.html -------------- next part -------------- Modified: Agents/BackendServer2/BackendServer2.vcproj =================================================================== --- Agents/BackendServer2/BackendServer2.vcproj 2007-08-15 21:18:15 UTC (rev 2000) +++ Agents/BackendServer2/BackendServer2.vcproj 2007-08-17 14:22:32 UTC (rev 2001) @@ -1,148 +1,206 @@ + Version="8.00" + Name="BackendServer2" + ProjectGUID="{93915E97-DC2B-4986-8E39-7740E486722A}" + RootNamespace="BackendServer2" + Keyword="MFCProj" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + Description="Copying Executable to Distribution Directory" + CommandLine="echo copy "$(TARGETPATH)" ..\..\bin\x86-nt\"$(TARGETNAME)".exe copy "$(TARGETPATH)" ..\..\bin\x86-nt\"$(TARGETNAME)".exe " + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + Description="Copying Executable to Distribution Directory" + CommandLine="echo copy "$(TARGETPATH)" ..\..\bin\x86-nt\"$(TARGETNAME)"-DEBUG.exe copy "$(TARGETPATH)" ..\..\bin\x86-nt\"$(TARGETNAME)"-DEBUG.exe " + /> @@ -150,63 +208,78 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="gal_be.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BrowseInformation="1" + /> + RelativePath="sockcli.c" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Filter="h;hpp;hxx;hm;inl" + > + RelativePath="backend_server.h" + > + RelativePath="sockcli.h" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > From tk at edam.speech.cs.cmu.edu Fri Aug 17 18:59:56 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 17 Aug 2007 18:59:56 -0400 Subject: [RavenclawDev 329] [23] bin/x86-nt: 1) Ignore Ankh files, and user and session solution files. Message-ID: <200708172259.l7HMxuCI006123@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070817/9335920e/attachment-0001.html -------------- next part -------------- Property changes on: ___________________________________________________________________ Name: svn:ignore + Ankh.Load Ankh.Unload Meetingline.ncb Meetingline.suo Property changes on: Agents/MeetingLineDM ___________________________________________________________________ Name: svn:ignore + Release Debug *.user Added: Meetingline.sln =================================================================== --- Meetingline.sln (rev 0) +++ Meetingline.sln 2007-08-17 22:59:56 UTC (rev 23) @@ -0,0 +1,387 @@ +? +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BackendServer2", "Agents\BackendServer2\BackendServer2.vcproj", "{93915E97-DC2B-4986-8E39-7740E486722A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DateTime4", "Agents\DateTime4\DateTime4.vcproj", "{C496CC03-49A2-4B53-A405-942C0664239E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Helios3", "Agents\Helios3\Helios3.vcproj", "{93C8F5F8-6C43-4179-9B9F-A31AA6438513}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Kalliope", "Agents\Kalliope\Kalliope.vcproj", "{9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MeetingLineDM", "Agents\MeetingLineDM\MeetingLineDM.vcproj", "{8AD2EDB1-F154-40E3-8317-6799592E8B34}" + ProjectSection(ProjectDependencies) = postProject + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63} = {538B76FD-E289-4CF7-A7FF-1ACB429B4F63} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Audio_Server", "Agents\MultiDecoder\Audio_Server\Audio_Server.vcproj", "{C31484B0-179B-432D-AE1E-75FB90591F23}" + ProjectSection(ProjectDependencies) = postProject + {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} + {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} + {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DTMF_Engine", "Agents\MultiDecoder\DTMF_Engine\DTMF_Engine.vcproj", "{6A7673C4-08F4-4490-93A5-5F7211B406CF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sphinx_Engine", "Agents\MultiDecoder\Sphinx_Engine\Sphinx_Engine.vcproj", "{FEB0A2B8-AF38-4237-A124-81EAD008CDDC}" + ProjectSection(ProjectDependencies) = postProject + {B1A99CB7-705E-41D0-A461-6CE24CB83C50} = {B1A99CB7-705E-41D0-A461-6CE24CB83C50} + {BB2093E6-97B7-47B1-9F6D-5F7417E69267} = {BB2093E6-97B7-47B1-9F6D-5F7417E69267} + {D1928EF1-ABBB-4130-98E4-8BB293F982F3} = {D1928EF1-ABBB-4130-98E4-8BB293F982F3} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NlgServer2", "Agents\NlgServer2\NlgServer2.vcproj", "{20678B74-4291-4384-B05A-A5EC04DC2BCF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "phoenix2", "Agents\Phoenix2\phoenix2.vcproj", "{B2C82072-32EB-4320-B2B1-C97B8D4C68E1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTYRecognitionServer2", "Agents\TTYRecognitionServer2\TTYRecognitionServer2.vcproj", "{7C9D9029-044B-4F98-8B97-A31480BBCE56}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DTMFDecoder", "Libraries\DTMFDecoder\DTMFDecoder.vcproj", "{E1DCEEB3-8456-4442-85E2-AE1989A05F04}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RavenClaw", "Libraries\RavenClaw\RavenClaw.vcproj", "{538B76FD-E289-4CF7-A7FF-1ACB429B4F63}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2", "Libraries\trunkSphinx2msdev\libsphinx2\libsphinx2.vcproj", "{BB2093E6-97B7-47B1-9F6D-5F7417E69267}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2ad", "Libraries\trunkSphinx2msdev\libsphinx2ad\libsphinx2ad.vcproj", "{B1A99CB7-705E-41D0-A461-6CE24CB83C50}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsphinx2fe", "Libraries\trunkSphinx2msdev\libsphinx2fe\libsphinx2fe.vcproj", "{D1928EF1-ABBB-4130-98E4-8BB293F982F3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + DebugGalaxy|Win32 = DebugGalaxy|Win32 + DebugOAA|Win32 = DebugOAA|Win32 + FestivalDebug|Win32 = FestivalDebug|Win32 + FestivalRelease|Win32 = FestivalRelease|Win32 + Release|Win32 = Release|Win32 + ReleaseGalaxy|Win32 = ReleaseGalaxy|Win32 + ReleaseOAA|Win32 = ReleaseOAA|Win32 + SwiftDebug|Win32 = SwiftDebug|Win32 + SwiftRelease|Win32 = SwiftRelease|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {93915E97-DC2B-4986-8E39-7740E486722A}.Debug|Win32.ActiveCfg = Debug|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.Debug|Win32.Build.0 = Debug|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.DebugOAA|Win32.Build.0 = Debug|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.FestivalRelease|Win32.Build.0 = Release|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.Release|Win32.ActiveCfg = Release|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.Release|Win32.Build.0 = Release|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {93915E97-DC2B-4986-8E39-7740E486722A}.SwiftRelease|Win32.Build.0 = Release|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.Debug|Win32.ActiveCfg = Debug|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.Debug|Win32.Build.0 = Debug|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.DebugOAA|Win32.Build.0 = Debug|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.FestivalRelease|Win32.Build.0 = Release|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.Release|Win32.ActiveCfg = Release|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.Release|Win32.Build.0 = Release|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {C496CC03-49A2-4B53-A405-942C0664239E}.SwiftRelease|Win32.Build.0 = Release|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.Debug|Win32.ActiveCfg = Debug|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.Debug|Win32.Build.0 = Debug|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.DebugOAA|Win32.Build.0 = Debug|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.FestivalRelease|Win32.Build.0 = Release|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.Release|Win32.ActiveCfg = Release|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.Release|Win32.Build.0 = Release|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {93C8F5F8-6C43-4179-9B9F-A31AA6438513}.SwiftRelease|Win32.Build.0 = Release|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.Debug|Win32.ActiveCfg = Debug|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.Debug|Win32.Build.0 = Debug|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.DebugOAA|Win32.Build.0 = Debug|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.FestivalDebug|Win32.ActiveCfg = FestivalDebug|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.FestivalDebug|Win32.Build.0 = FestivalDebug|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.FestivalRelease|Win32.ActiveCfg = FestivalRelease|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.FestivalRelease|Win32.Build.0 = FestivalRelease|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.Release|Win32.ActiveCfg = Release|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.Release|Win32.Build.0 = Release|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.SwiftDebug|Win32.ActiveCfg = SwiftDebug|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.SwiftDebug|Win32.Build.0 = SwiftDebug|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.SwiftRelease|Win32.ActiveCfg = SwiftRelease|Win32 + {9CDBFBA5-F7EB-432F-A7CF-2E80322FE2ED}.SwiftRelease|Win32.Build.0 = SwiftRelease|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Debug|Win32.ActiveCfg = Debug|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Debug|Win32.Build.0 = Debug|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.DebugOAA|Win32.Build.0 = Debug|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.FestivalRelease|Win32.Build.0 = Release|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Release|Win32.ActiveCfg = Release|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.Release|Win32.Build.0 = Release|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {8AD2EDB1-F154-40E3-8317-6799592E8B34}.SwiftRelease|Win32.Build.0 = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.Debug|Win32.ActiveCfg = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.Debug|Win32.Build.0 = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.DebugOAA|Win32.Build.0 = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.FestivalRelease|Win32.Build.0 = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.Release|Win32.ActiveCfg = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.Release|Win32.Build.0 = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {C31484B0-179B-432D-AE1E-75FB90591F23}.SwiftRelease|Win32.Build.0 = Release|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.Debug|Win32.ActiveCfg = Debug|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.Debug|Win32.Build.0 = Debug|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.DebugOAA|Win32.Build.0 = Debug|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.FestivalRelease|Win32.Build.0 = Release|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.Release|Win32.ActiveCfg = Release|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.Release|Win32.Build.0 = Release|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {6A7673C4-08F4-4490-93A5-5F7211B406CF}.SwiftRelease|Win32.Build.0 = Release|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.Debug|Win32.ActiveCfg = Debug|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.Debug|Win32.Build.0 = Debug|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.DebugOAA|Win32.Build.0 = Debug|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.FestivalRelease|Win32.Build.0 = Release|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.Release|Win32.ActiveCfg = Release|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.Release|Win32.Build.0 = Release|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {FEB0A2B8-AF38-4237-A124-81EAD008CDDC}.SwiftRelease|Win32.Build.0 = Release|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.Debug|Win32.ActiveCfg = Debug|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.Debug|Win32.Build.0 = Debug|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.DebugOAA|Win32.Build.0 = Debug|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.FestivalRelease|Win32.Build.0 = Release|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.Release|Win32.ActiveCfg = Release|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.Release|Win32.Build.0 = Release|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {20678B74-4291-4384-B05A-A5EC04DC2BCF}.SwiftRelease|Win32.Build.0 = Release|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.Debug|Win32.ActiveCfg = Debug|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.Debug|Win32.Build.0 = Debug|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.DebugOAA|Win32.Build.0 = Debug|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.FestivalRelease|Win32.Build.0 = Release|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.Release|Win32.ActiveCfg = Release|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.Release|Win32.Build.0 = Release|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {B2C82072-32EB-4320-B2B1-C97B8D4C68E1}.SwiftRelease|Win32.Build.0 = Release|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.Debug|Win32.ActiveCfg = Debug|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.Debug|Win32.Build.0 = Debug|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.DebugOAA|Win32.Build.0 = Debug|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.FestivalRelease|Win32.Build.0 = Release|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.Release|Win32.ActiveCfg = Release|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.Release|Win32.Build.0 = Release|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {7C9D9029-044B-4F98-8B97-A31480BBCE56}.SwiftRelease|Win32.Build.0 = Release|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.Debug|Win32.ActiveCfg = Debug|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.Debug|Win32.Build.0 = Debug|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.DebugOAA|Win32.Build.0 = Debug|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.FestivalRelease|Win32.Build.0 = Release|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.Release|Win32.ActiveCfg = Release|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.Release|Win32.Build.0 = Release|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {E1DCEEB3-8456-4442-85E2-AE1989A05F04}.SwiftRelease|Win32.Build.0 = Release|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Debug|Win32.ActiveCfg = DebugOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Debug|Win32.Build.0 = DebugOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugGalaxy|Win32.ActiveCfg = DebugGalaxy|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugGalaxy|Win32.Build.0 = DebugGalaxy|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugOAA|Win32.ActiveCfg = DebugOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.DebugOAA|Win32.Build.0 = DebugOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.FestivalDebug|Win32.ActiveCfg = ReleaseOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.FestivalDebug|Win32.Build.0 = ReleaseOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.FestivalRelease|Win32.ActiveCfg = ReleaseOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.FestivalRelease|Win32.Build.0 = ReleaseOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Release|Win32.ActiveCfg = ReleaseOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.Release|Win32.Build.0 = ReleaseOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseGalaxy|Win32.ActiveCfg = ReleaseGalaxy|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseGalaxy|Win32.Build.0 = ReleaseGalaxy|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseOAA|Win32.ActiveCfg = ReleaseOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.ReleaseOAA|Win32.Build.0 = ReleaseOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.SwiftDebug|Win32.ActiveCfg = ReleaseOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.SwiftDebug|Win32.Build.0 = ReleaseOAA|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.SwiftRelease|Win32.ActiveCfg = ReleaseGalaxy|Win32 + {538B76FD-E289-4CF7-A7FF-1ACB429B4F63}.SwiftRelease|Win32.Build.0 = ReleaseGalaxy|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Debug|Win32.ActiveCfg = Debug|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Debug|Win32.Build.0 = Debug|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.DebugOAA|Win32.Build.0 = Debug|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.FestivalRelease|Win32.Build.0 = Release|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Release|Win32.ActiveCfg = Release|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.Release|Win32.Build.0 = Release|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {BB2093E6-97B7-47B1-9F6D-5F7417E69267}.SwiftRelease|Win32.Build.0 = Release|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Debug|Win32.ActiveCfg = Debug|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Debug|Win32.Build.0 = Debug|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.DebugOAA|Win32.Build.0 = Debug|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.FestivalRelease|Win32.Build.0 = Release|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Release|Win32.ActiveCfg = Release|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.Release|Win32.Build.0 = Release|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {B1A99CB7-705E-41D0-A461-6CE24CB83C50}.SwiftRelease|Win32.Build.0 = Release|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Debug|Win32.ActiveCfg = Debug|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Debug|Win32.Build.0 = Debug|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.DebugGalaxy|Win32.ActiveCfg = Debug|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.DebugGalaxy|Win32.Build.0 = Debug|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.DebugOAA|Win32.ActiveCfg = Debug|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.DebugOAA|Win32.Build.0 = Debug|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.FestivalDebug|Win32.ActiveCfg = Debug|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.FestivalDebug|Win32.Build.0 = Debug|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.FestivalRelease|Win32.ActiveCfg = Release|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.FestivalRelease|Win32.Build.0 = Release|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Release|Win32.ActiveCfg = Release|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.Release|Win32.Build.0 = Release|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.ReleaseGalaxy|Win32.ActiveCfg = Release|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.ReleaseGalaxy|Win32.Build.0 = Release|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.ReleaseOAA|Win32.ActiveCfg = Release|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.ReleaseOAA|Win32.Build.0 = Release|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.SwiftDebug|Win32.ActiveCfg = Debug|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.SwiftDebug|Win32.Build.0 = Debug|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.SwiftRelease|Win32.ActiveCfg = Release|Win32 + {D1928EF1-ABBB-4130-98E4-8BB293F982F3}.SwiftRelease|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Property changes on: bin/x86-nt ___________________________________________________________________ Name: svn:ignore + * From tk at edam.speech.cs.cmu.edu Fri Aug 17 19:03:41 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 17 Aug 2007 19:03:41 -0400 Subject: [RavenclawDev 330] [2002] Agents/DateTime4: 1) ignore build dirs Message-ID: <200708172303.l7HN3fNh006144@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070817/071e35a2/attachment.html -------------- next part -------------- Property changes on: Agents/DateTime4 ___________________________________________________________________ Name: svn:ignore + Release Debug *.user Modified: Agents/DateTime4/DateTime4.vcproj =================================================================== --- Agents/DateTime4/DateTime4.vcproj 2007-08-17 14:22:32 UTC (rev 2001) +++ Agents/DateTime4/DateTime4.vcproj 2007-08-17 23:03:41 UTC (rev 2002) @@ -1,138 +1,200 @@ + ProjectGUID="{C496CC03-49A2-4B53-A405-942C0664239E}" + RootNamespace="DateTime4" + Keyword="MFCProj" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + + SubSystem="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TARGETPATH) ..\..\bin\x86-nt\$(TARGETNAME).exe" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> + + + SubSystem="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TARGETPATH) ..\..\bin\x86-nt\$(TARGETNAME)-DEBUG.exe" + /> @@ -140,48 +202,62 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath=".\dates.c" + > + RelativePath=".\gal_dt.c" + > + RelativePath=".\numparse_l.c" + > + RelativePath=".\numparse_y.c" + > + RelativePath=".\parse_date_time.c" + > + RelativePath=".\parse_int.c" + > + RelativePath=".\parse_net.c" + > + RelativePath=".\parse_time_range.c" + > + Filter="h;hpp;hxx;hm;inl" + > + RelativePath=".\datetime_server.h" + > + RelativePath=".\numparse_y.h" + > + RelativePath=".\parse_date_time.h" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > Modified: Agents/DateTime4/gal_dt.c =================================================================== --- Agents/DateTime4/gal_dt.c 2007-08-17 14:22:32 UTC (rev 2001) +++ Agents/DateTime4/gal_dt.c 2007-08-17 23:03:41 UTC (rev 2002) @@ -40,7 +40,7 @@ if (!GalUtil_OACheckUsage(argc, argv, OAS, &i)) exit(1); - if (DEBUG) { debug = fopen("dttime.debug","w"); fprintf(debug,"logging dt\n"); fclose(debug); } + if (DEBUG) { fopen_s(&debug, "dttime.debug","w"); fprintf(debug,"logging dt\n"); fclose(debug); } return (void *) s; } @@ -48,7 +48,7 @@ Gal_Frame fr_ParseTimeRange (Gal_Frame f, void *server_data) { int s,e,tn,d,tp,ds; - char temp[1024]; + char temp[MAX_PARSE_DATE_TIME_STRING]; Gal_Frame subtreef; if ((subtreef = Gal_GetFrame(f, ":subtree"))) { @@ -58,7 +58,7 @@ Gal_PPFrame(f); - debug = fopen("dttime.debug","a"); + fopen_s(&debug, "dttime.debug","a"); Gal_PPFrameToFile(f, debug); fprintf(debug,"\n"); fclose(debug); @@ -99,7 +99,7 @@ Gal_PPFrame(f); - debug = fopen("dttime.debug","a"); + fopen_s(&debug, "dttime.debug","a"); Gal_PPFrameToFile(f, debug); fprintf(debug,"\n"); fclose(debug); @@ -110,15 +110,15 @@ Gal_Frame SetRefDate (Gal_Frame f, void *server_data) { int refdate; - char x[1024]; + char x[MAX_PARSE_DATE_TIME_STRING]; printf("\n\nSETTING REFERENCE DATE\n\n"); if (Gal_GetObject(f, ":refdate")) { refdate = Gal_GetInt(f,":refdate"); frame_set_ref_date(refdate); - sprintf(x,"Set ref date: %d\n",refdate); - GalUtil_Print(-1,x); + sprintf_s(x, MAX_PARSE_DATE_TIME_STRING, "Set ref date: %d\n",refdate); + GalUtil_Print(-1,x); } return f; @@ -167,7 +167,7 @@ int i; int numnets = Gal_GetInt(f, ":numnets"); /* pcc what does this return if key dne */ int s, e, tn, d, tp, ds; - char temp[1024]; + char temp[MAX_PARSE_DATE_TIME_STRING]; Gal_Frame netf; Gal_Object *list; @@ -265,14 +265,13 @@ Gal_Frame ParseInt(Gal_Frame f, void *server_data) { char buffer[4096]; - char *token; int intValue; - strcpy(buffer, Gal_GetString(f, ":number_string")); - strupr(buffer); + strcpy_s(buffer, 4096, Gal_GetString(f, ":number_string")); + _strupr_s(buffer, 4096); parse_number(buffer, &intValue); - sprintf(buffer, "%d", intValue); + sprintf_s(buffer, 4096, "%d", intValue); Gal_SetProp(f, ":number_int", Gal_StringObject(buffer)); return f; @@ -302,10 +301,10 @@ int month = Gal_GetInt(f, ":month"); int year = Gal_GetInt(f, ":year"); long int compacted; - char lpszcompacted[1024]; + char lpszcompacted[MAX_PARSE_DATE_TIME_STRING]; - { char x[1024]; - sprintf(x,"day: %d month: %d year: %d\n",day,month,year); + { char x[MAX_PARSE_DATE_TIME_STRING]; + sprintf_s(x, MAX_PARSE_DATE_TIME_STRING, "day: %d month: %d year: %d\n",day,month,year); GalUtil_Print(-1,x); } @@ -322,12 +321,12 @@ compacted += 19000000; } - sprintf(lpszcompacted, "%d", compacted); + sprintf_s(lpszcompacted, MAX_PARSE_DATE_TIME_STRING, "%d", compacted); Gal_SetProp(f, ":compacted", Gal_StringObject(lpszcompacted)); - { char x[1024]; - sprintf(x,"compacted: %ld\n",compacted); + { char x[MAX_PARSE_DATE_TIME_STRING]; + sprintf_s(x, MAX_PARSE_DATE_TIME_STRING, "compacted: %ld\n",compacted); GalUtil_Print(-1,x); } Modified: Agents/DateTime4/parse_date_time.c =================================================================== --- Agents/DateTime4/parse_date_time.c 2007-08-17 14:22:32 UTC (rev 2001) +++ Agents/DateTime4/parse_date_time.c 2007-08-17 23:03:41 UTC (rev 2002) @@ -86,10 +86,10 @@ ref_date_available = 0; } -static char dtbuf[1024]; +static char dtbuf[MAX_PARSE_DATE_TIME_STRING]; static char *format_date(DateTime *dt) { dtbuf[0]='\0'; - sprintf(dtbuf,"year:%d month:%d day:%d dow:%d\n", + sprintf_s(dtbuf, MAX_PARSE_DATE_TIME_STRING, "year:%d month:%d day:%d dow:%d\n", dt->year,dt->month,dt->day,dt->dow); return &dtbuf[0]; } @@ -279,7 +279,7 @@ static int today_relative; static int holiday; static int t_start, t_end, t_now, t_duration, dayskip; -static char t_timeperiod_spec[1024]; +static char t_timeperiod_spec[MAX_PARSE_DATE_TIME_STRING]; static int day_ordinal; static int month_explicit; static int year_explicit; @@ -463,8 +463,8 @@ int ddiff; time_t tNow; - struct tm *ptmNow; - char temp[1024]; + struct tm ptmNow; + char temp[MAX_PARSE_DATE_TIME_STRING]; next_week = 0; next_month = 0; @@ -477,14 +477,14 @@ this_week = 0; tNow = time(NULL); - ptmNow = localtime(&tNow); + localtime_s(&ptmNow, &tNow); - today.year = ptmNow->tm_year + 1900; - today.month = ptmNow->tm_mon + 1; - today.day = ptmNow->tm_mday; - today.dow = ptmNow->tm_wday; - today.start_time = ptmNow->tm_hour * 100 + ptmNow->tm_min; - today.end_time = ptmNow->tm_hour * 100 + ptmNow->tm_min; + today.year = ptmNow.tm_year + 1900; + today.month = ptmNow.tm_mon + 1; + today.day = ptmNow.tm_mday; + today.dow = ptmNow.tm_wday; + today.start_time = ptmNow.tm_hour * 100 + ptmNow.tm_min; + today.end_time = ptmNow.tm_hour * 100 + ptmNow.tm_min; if ( ! ref_date_available) { GalUtil_Print(-1, "Ref date not available; setting to today\n"); @@ -531,7 +531,7 @@ if(t_end != -1) dt.end_time = t_end; dt.dayskip = dayskip; - strcpy(dt.period_spec, t_timeperiod_spec); + strcpy_s(dt.period_spec, MAX_PARSE_DATE_TIME_STRING, t_timeperiod_spec); } @@ -595,7 +595,7 @@ (dt2.year != dt.year)) { // if there is a difference, declare this an ambiguous date dt.ambiguous = 1; - sprintf(dt.date_choice, "%d,%d", + sprintf_s(dt.date_choice, MAX_DATE_CHOICE_STRING, "%d,%d", compact_date(dt2.year, dt2.month, dt2.day), compact_date(dt.year, dt.month, dt.day)); } @@ -645,13 +645,13 @@ firstdate.year = ref_date.year; firstdate.month = ref_date.month; firstdate.day = ref_date.day; - sprintf(dt.date_choice, "%d,", + sprintf_s(dt.date_choice, MAX_DATE_CHOICE_STRING, "%d,", compact_date(firstdate.year, firstdate.month, firstdate.day)); if( dif < 0 ) dif += 7; if( (date_relative < 0) && ! day_after ) dif -= 7; else dif += day_after; date_inc(&firstdate, dif); - sprintf(dt.date_choice, "%s%d", dt.date_choice, + sprintf_s(dt.date_choice, MAX_DATE_CHOICE_STRING, "%s%d", dt.date_choice, compact_date(firstdate.year, firstdate.month, firstdate.day)); } } @@ -660,10 +660,10 @@ firstdate.year = ref_date.year; firstdate.month = ref_date.month; firstdate.day = ref_date.day; - sprintf(dt.date_choice, "%d,", + sprintf_s(dt.date_choice, MAX_DATE_CHOICE_STRING, "%d,", compact_date(firstdate.year, firstdate.month, firstdate.day)); date_inc(&firstdate, 7); - sprintf(dt.date_choice, "%s%d", dt.date_choice, + sprintf_s(dt.date_choice, MAX_DATE_CHOICE_STRING, "%s%d", dt.date_choice, compact_date(firstdate.year, firstdate.month, firstdate.day)); } else { @@ -688,10 +688,10 @@ if (compact_date(firstdate.year, firstdate.month, firstdate.day) > compact_date(today.year, today.month, today.day)) { dt.ambiguous = 1; - sprintf(dt.date_choice, "%d,", + sprintf_s(dt.date_choice, MAX_DATE_CHOICE_STRING, "%d,", compact_date(firstdate.year, firstdate.month, firstdate.day)); date_inc(&firstdate, 7); - sprintf(dt.date_choice, "%s%d", dt.date_choice, + sprintf_s(dt.date_choice, MAX_DATE_CHOICE_STRING, "%s%d", dt.date_choice, compact_date(firstdate.year, firstdate.month, firstdate.day)); } else { // no ambiguity because previous date falls before today @@ -871,18 +871,18 @@ dt.end_time -= 2400; } else dt.end_time = 2359; } - sprintf(temp, "%d", dt.start_time); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", dt.start_time); Gal_SetProp(datef, cSTART_TIME, Gal_StringObject(temp)); - sprintf(temp, "%d", dt.end_time); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", dt.end_time); Gal_SetProp(datef, cEND_TIME, Gal_StringObject(temp)); - sprintf(temp, "%d", dt.dayskip); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", dt.dayskip); Gal_SetProp(datef, cDAY_SKIP, Gal_StringObject(temp)); Gal_SetProp(datef, cTIMEPERIOD_SPEC, Gal_StringObject(dt.period_spec)); Gal_SetProp(datef, cVALID_TIME, Gal_StringObject(cTRUE)); } if((dt.duration != -1) && (dt.duration != 0)) { - sprintf(temp, "%d", dt.duration); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", dt.duration); Gal_SetProp(datef, cDURATION, Gal_StringObject(temp)); } @@ -895,13 +895,13 @@ } else { - sprintf(temp, "%d", dt.month); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", dt.month); Gal_SetProp(datef, cMONTH, Gal_StringObject(temp)); - sprintf(temp, "%d", dt.day); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", dt.day); Gal_SetProp(datef, cDAY, Gal_StringObject(temp)); - sprintf(temp, "%d", dt.year); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", dt.year); Gal_SetProp(datef, cYEAR, Gal_StringObject(temp)); - sprintf(temp, "%d", dt.dow); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", dt.dow); Gal_SetProp(datef, cWEEKDAY, Gal_StringObject(temp)); Gal_SetProp(datef, cVALID_DATE, Gal_StringObject(szTemp)); Modified: Agents/DateTime4/parse_date_time.h =================================================================== --- Agents/DateTime4/parse_date_time.h 2007-08-17 14:22:32 UTC (rev 2001) +++ Agents/DateTime4/parse_date_time.h 2007-08-17 23:03:41 UTC (rev 2002) @@ -3,6 +3,8 @@ #ifndef _PDT #define _PDT +#define MAX_PARSE_DATE_TIME_STRING 1024 +#define MAX_DATE_CHOICE_STRING 20 typedef struct date_time { int month; @@ -19,8 +21,8 @@ int need_date; /* user still needs to specify a date realtive to date */ int ambiguous; - char date_choice[20]; - char period_spec[1024]; + char date_choice[MAX_DATE_CHOICE_STRING]; + char period_spec[MAX_PARSE_DATE_TIME_STRING]; } DateTime; typedef struct holiday_list { @@ -121,6 +123,8 @@ void clear_ref_date(); +int frame_set_ref_date (int refdate); + #endif // _PDT Modified: Agents/DateTime4/parse_time_range.c =================================================================== --- Agents/DateTime4/parse_time_range.c 2007-08-17 14:22:32 UTC (rev 2001) +++ Agents/DateTime4/parse_time_range.c 2007-08-17 23:03:41 UTC (rev 2002) @@ -152,11 +152,11 @@ period[0]= 0; if( hm->period_mod[0] ) { - strcpy(period, hm->period_mod); - strcat(period, " "); + strcpy_s(period, 128, hm->period_mod); + strcat_s(period, 128, " "); } /* check for bare qualifiers... */ - strcat(period, (hm->period_base) ? hm->period_base : "day"); + strcat_s(period, 128, (hm->period_base) ? hm->period_base : "day"); i= find_period(period); if( i < 0 ) return(-1); /* missing from table... */ return (i); @@ -320,8 +320,8 @@ Gal_Frame netf; Gal_Frame timef; int numnets = Gal_GetInt(tree, ":numnets"); /* pcc what does this return if key dne */ - char temp[1024]; - char period_spec[1024] = ""; + char temp[MAX_PARSE_DATE_TIME_STRING]; + char period_spec[MAX_PARSE_DATE_TIME_STRING] = ""; relative_min= 0; before_after=0; @@ -379,7 +379,7 @@ // (user said sthg like "now") period_spec[0]= 0; if (*time_now) { - strcat(period_spec, "now "); + strcat_s(period_spec, MAX_PARSE_DATE_TIME_STRING, "now "); } // [2005-07-26] (dbohus): deleted this since it lead to multiplication of // the timeperiod_spec - i don't know how this happened, hopefully this fixes all @@ -404,8 +404,8 @@ // (dbohus): time is constructed from period, so construct the period_spec // specifier if( at_hm.period_mod[0] ) { - strcpy(period_spec, at_hm.period_mod); - strcat(period_spec, " "); + strcpy_s(period_spec, MAX_PARSE_DATE_TIME_STRING, at_hm.period_mod); + strcat_s(period_spec, MAX_PARSE_DATE_TIME_STRING, " "); } // [2006-08-21] (antoine): moved this outside of this if since the period_base // should appear in the output frame whenever it is pegged by the user @@ -426,7 +426,7 @@ } /* check for bare qualifiers... */ - strcat(period_spec, (at_hm.period_base) ? at_hm.period_base : "day"); + strcat_s(period_spec, MAX_PARSE_DATE_TIME_STRING, (at_hm.period_base) ? at_hm.period_base : "day"); } /* for at_ times, absorb dangling before/after nets ("after ten" "before five") */ @@ -540,20 +540,20 @@ if ( (*start == -1) && (*end == -1) ) { Gal_SetProp(timef, cVALID_TIME, Gal_StringObject(cFALSE)); } else { - sprintf(temp, "%d", *start); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", *start); Gal_SetProp(timef, cSTART_TIME, Gal_StringObject(temp)); - sprintf(temp, "%d", *end); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", *end); Gal_SetProp(timef, cEND_TIME, Gal_StringObject(temp)); - sprintf(temp, "%d", *dayskip); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", *dayskip); Gal_SetProp(timef, cDAY_SKIP, Gal_StringObject(temp)); Gal_SetProp(timef, cVALID_TIME, Gal_StringObject(cTRUE)); } if ( (*duration != -1) && (*duration != 0) ) { - sprintf(temp, "%d", *duration); + sprintf_s(temp, MAX_PARSE_DATE_TIME_STRING, "%d", *duration); Gal_SetProp(timef, cDURATION, Gal_StringObject(temp)); } Gal_SetProp(timef, cTIMEPERIOD_SPEC, Gal_StringObject(period_spec)); - strcpy(timeperiod_spec, period_spec); + strcpy_s(timeperiod_spec, MAX_PARSE_DATE_TIME_STRING, period_spec); Gal_SetProp(tree, ":value", Gal_FrameObject(timef)); return (1); /* a time was found, and was parsable */ From tk at edam.speech.cs.cmu.edu Fri Aug 17 20:21:03 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 17 Aug 2007 20:21:03 -0400 Subject: [RavenclawDev 331] [2003] Agents/MultiDecoder/Audio_Server/: Ignore user solution files. Message-ID: <200708180021.l7I0L3Cu006520@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070817/7afff8ac/attachment-0001.html -------------- next part -------------- Property changes on: Agents/MultiDecoder/Audio_Server ___________________________________________________________________ Name: svn:ignore - Debug Release + Debug Release *.user From tk at edam.speech.cs.cmu.edu Fri Aug 17 20:23:03 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 17 Aug 2007 20:23:03 -0400 Subject: [RavenclawDev 332] [2004] Agents/MultiDecoder/DTMF_Engine: 1) Ignore build directories and user solution files. Message-ID: <200708180023.l7I0N3hJ006571@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070817/d3316f4f/attachment.html -------------- next part -------------- Property changes on: Agents/MultiDecoder/DTMF_Engine ___________________________________________________________________ Name: svn:ignore + Release Debug *.user Modified: Agents/MultiDecoder/DTMF_Engine/DTMF_Engine.vcproj =================================================================== --- Agents/MultiDecoder/DTMF_Engine/DTMF_Engine.vcproj 2007-08-18 00:21:03 UTC (rev 2003) +++ Agents/MultiDecoder/DTMF_Engine/DTMF_Engine.vcproj 2007-08-18 00:23:03 UTC (rev 2004) @@ -1,127 +1,188 @@ + RootNamespace="DTMF_Engine" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="0" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\..\Bin\x86-nt\$(TargetName)-DEBUG.exe" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\..\Bin\x86-nt\$(TargetName).exe" + /> @@ -129,30 +190,38 @@ + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + RelativePath=".\main.cpp" + > + RelativePath="sock.c" + > + RelativePath=".\Utils.cpp" + > + Filter="h;hpp;hxx;hm;inl;inc" + > + RelativePath="sock.h" + > + RelativePath=".\Utils.h" + > + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > From tk at edam.speech.cs.cmu.edu Fri Aug 17 20:23:41 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 17 Aug 2007 20:23:41 -0400 Subject: [RavenclawDev 333] [2005] Agents/MultiDecoder/Sphinx_Engine: 1) Ignore user solution files. Message-ID: <200708180023.l7I0NfMQ006595@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070817/acf6096e/attachment.html -------------- next part -------------- Property changes on: Agents/MultiDecoder/Sphinx_Engine ___________________________________________________________________ Name: svn:ignore - Debug Release + Debug Release *.user Modified: Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj =================================================================== --- Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj 2007-08-18 00:23:03 UTC (rev 2004) +++ Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj 2007-08-18 00:23:41 UTC (rev 2005) @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="Sphinx_Engine" - ProjectGUID="{6A7673C4-08F4-4490-93A5-5F7211B406CF}" + ProjectGUID="{FEB0A2B8-AF38-4237-A124-81EAD008CDDC}" RootNamespace="Sphinx_Engine" Keyword="Win32Proj" > From tk at edam.speech.cs.cmu.edu Fri Aug 17 20:24:13 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 17 Aug 2007 20:24:13 -0400 Subject: [RavenclawDev 334] [2006] Agents/NlgServer2/: Ignore user solution files. Message-ID: <200708180024.l7I0OD0N006617@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070817/0d9a052b/attachment.html -------------- next part -------------- Property changes on: Agents/NlgServer2 ___________________________________________________________________ Name: svn:ignore - Debug Release + Debug Release *.user From tk at edam.speech.cs.cmu.edu Fri Aug 17 20:32:37 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 17 Aug 2007 20:32:37 -0400 Subject: [RavenclawDev 335] [2007] Agents/TTYRecognitionServer2: 1) Ignore build dirs and user solution files. Message-ID: <200708180032.l7I0WbMN006681@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070817/72b65d95/attachment-0001.html -------------- next part -------------- Property changes on: Agents/TTYRecognitionServer2 ___________________________________________________________________ Name: svn:ignore + Release Debug *.user Modified: Agents/TTYRecognitionServer2/TTYRecognitionServer2.vcproj =================================================================== --- Agents/TTYRecognitionServer2/TTYRecognitionServer2.vcproj 2007-08-18 00:24:13 UTC (rev 2006) +++ Agents/TTYRecognitionServer2/TTYRecognitionServer2.vcproj 2007-08-18 00:32:37 UTC (rev 2007) @@ -4,9 +4,7 @@ Version="8.00" Name="TTYRecognitionServer2" ProjectGUID="{7C9D9029-044B-4F98-8B97-A31480BBCE56}" - SccProjectName=""$/CommonAgents/TTYRecognitionServer2", NQCBAAAA" - SccLocalPath="." - SccProvider="MSSCCI:Microsoft Visual SourceSafe" + RootNamespace="TTYRecognitionServer2" Keyword="MFCProj" > @@ -107,7 +105,7 @@ tm_hour, - tmTime->tm_min, tmTime->tm_sec, time.millitm); + return FormatString("%02d:%02d:%02d.%03d", tmTime.tm_hour, + tmTime.tm_min, tmTime.tm_sec, time.millitm); } // D: returns the time as a long int. Used mainly for logging purposes Modified: Agents/TTYRecognitionServer2/main.cpp =================================================================== --- Agents/TTYRecognitionServer2/main.cpp 2007-08-18 00:24:13 UTC (rev 2006) +++ Agents/TTYRecognitionServer2/main.cpp 2007-08-18 00:32:37 UTC (rev 2007) @@ -131,13 +131,13 @@ GAL_OA_INT, &iDontUseSessionManager)) iDontUseSessionManager=1; if (!GalUtil_OAExtract(argc, argv, oas, "-hyp_slot", GAL_OA_STRING, &lpszTemp)) - strcpy(lpszHypSlotName, DEFAULT_HYP_SLOT_NAME); + strcpy_s(lpszHypSlotName, DEFAULT_HYP_SLOT_NAME); else - strcpy(lpszHypSlotName, lpszTemp); + strcpy_s(lpszHypSlotName, lpszTemp); if (!GalUtil_OAExtract(argc, argv, oas, "-conf_slot", GAL_OA_STRING, &lpszTemp)) - strcpy(lpszConfSlotName, DEFAULT_CONF_SLOT_NAME); + strcpy_s(lpszConfSlotName, DEFAULT_CONF_SLOT_NAME); else - strcpy(lpszConfSlotName, lpszTemp); + strcpy_s(lpszConfSlotName, lpszTemp); free(lpszTemp); InitializeHighResolutionTimer(); @@ -154,7 +154,7 @@ float fTTYConfidence = -1; char *lpszTTYConfidence; if((lpszTTYConfidence = strchr(buf, '|')) != NULL) { - sscanf(lpszTTYConfidence, "|%f", &fTTYConfidence); + sscanf_s(lpszTTYConfidence, "|%f", &fTTYConfidence); // chop the previous string there lpszTTYConfidence[0] = 0; } @@ -299,14 +299,14 @@ if ( Gal_GetObject(f, ":id") ) szID = Gal_GetString(f, ":id"); else - szID = strdup("DUMMY_ID"); + szID = _strdup("DUMMY_ID"); conceptposlist[0] = word[0] = '\0'; while ( len = get_word(&temputt, word) ) { if ( word[0] == '<' ) // beginning of concept realization { - strcat(conceptposlist, word+1); - strcat(conceptposlist, " "); + strcat_s(conceptposlist, word+1); + strcat_s(conceptposlist, " "); i--; // not a real word; counteract default increment } else if ( (sublen = firstOf(word, ">")) < len ) //end of concept realization @@ -314,27 +314,27 @@ char intbuf[7]; word[sublen] = '\0'; - sprintf(intbuf, "%d ", i); - strcat(conceptposlist, intbuf); + sprintf_s(intbuf, "%d ", i); + strcat_s(conceptposlist, intbuf); - strcat(prunedutt,word); + strcat_s(prunedutt, MAX_BUF_LENGTH, word); if ( firstOf(word+sublen+1, ",;:'\"?.!") < len - sublen -1 ) { // just add the punctuation after the > - strcat(prunedutt, word+sublen+1); - strcat(prunedutt, " "); + strcat_s(prunedutt, MAX_BUF_LENGTH, word+sublen+1); + strcat_s(prunedutt, MAX_BUF_LENGTH, " "); } else { - strcat(prunedutt, " "); + strcat_s(prunedutt, MAX_BUF_LENGTH, " "); temputt -= ( len-sublen-1); } } else { - strcat(prunedutt, word); - strcat(prunedutt, " "); + strcat_s(prunedutt, MAX_BUF_LENGTH, word); + strcat_s(prunedutt, MAX_BUF_LENGTH, " "); } i++; word[0] = '\0'; @@ -392,7 +392,7 @@ taggedutt[0] = totts[0] = '\0'; if (Gal_GetObject(f, ":tty-phrase")) - strcat(taggedutt, Gal_GetString(f, ":tty-phrase")); + strcat_s(taggedutt, Gal_GetString(f, ":tty-phrase")); else { printf("TTY-Warning: Can't find :tty-phrase in incoming \"speak\" frame.\n"); Gal_SetProp(f, ":error", Gal_IntObject(1)); @@ -410,7 +410,8 @@ i = strlen(totts); // write this to the file - FILE* flid = fopen(sLogFileName.c_str(), "a"); + FILE* flid; + fopen_s(&flid, sLogFileName.c_str(), "a"); if(flid) { fprintf(flid, "S: %s\n", totts); fclose(flid); @@ -462,7 +463,8 @@ } // write this to the file - FILE* flid = fopen(sLogFileName.c_str(), "a"); + FILE* flid; + fopen_s(&flid, sLogFileName.c_str(), "a"); if(flid) { fprintf(flid, "U: %s\n", utterance); fclose(flid); Modified: Agents/TTYRecognitionServer2/tty.cpp =================================================================== --- Agents/TTYRecognitionServer2/tty.cpp 2007-08-18 00:24:13 UTC (rev 2006) +++ Agents/TTYRecognitionServer2/tty.cpp 2007-08-18 00:32:37 UTC (rev 2007) @@ -7,7 +7,7 @@ UINT GetTTYInputThread(void) { char buf[1024]; while(1) { - gets(buf); + gets_s(buf); if(!strcmp(buf, "init_session")) init_sessions(); else if(!strcmp(buf, "close_session")) From tk at edam.speech.cs.cmu.edu Fri Aug 17 20:34:40 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 17 Aug 2007 20:34:40 -0400 Subject: [RavenclawDev 336] [2008] Libraries/DTMFDecoder: 1) Ignore build dir and user solution files. Message-ID: <200708180034.l7I0Ye1u006691@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070817/8c876211/attachment.html -------------- next part -------------- Property changes on: Libraries/DTMFDecoder ___________________________________________________________________ Name: svn:ignore + lib *.user Modified: Libraries/DTMFDecoder/DTMFDecoder.vcproj =================================================================== --- Libraries/DTMFDecoder/DTMFDecoder.vcproj 2007-08-18 00:32:37 UTC (rev 2007) +++ Libraries/DTMFDecoder/DTMFDecoder.vcproj 2007-08-18 00:34:40 UTC (rev 2008) @@ -1,108 +1,155 @@ + ProjectGUID="{E1DCEEB3-8456-4442-85E2-AE1989A05F04}" + RootNamespace="DTMFDecoder" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile="$(OutDir)/DTMFDecoder.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + IgnoreAllDefaultLibraries="false" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> - - - - + Name="VCPostBuildEventTool" + /> @@ -110,21 +157,26 @@ + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + RelativePath="src\DTMFDecoder.c" + > + Filter="h;hpp;hxx;hm;inl;inc" + > + RelativePath="include\DTMFDecoder.h" + > + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > Modified: Libraries/DTMFDecoder/lib/Release/DTMFDecoder.lib =================================================================== (Binary files differ) Modified: Libraries/DTMFDecoder/src/DTMFDecoder.c =================================================================== --- Libraries/DTMFDecoder/src/DTMFDecoder.c 2007-08-18 00:32:37 UTC (rev 2007) +++ Libraries/DTMFDecoder/src/DTMFDecoder.c 2007-08-18 00:34:40 UTC (rev 2008) @@ -182,7 +182,7 @@ // Store utterance ID if (id != NULL) - strcpy( uttid, id); + strcpy_s( uttid, 4096, id); if (log_fp) { fprintf( log_fp, "Begin utterance: %s\n", uttid); From tk at edam.speech.cs.cmu.edu Fri Aug 17 20:35:26 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Fri, 17 Aug 2007 20:35:26 -0400 Subject: [RavenclawDev 337] [2009] Libraries/trunkSphinx2msdev/libsphinx2: Ignore build dirs and user solution files. Message-ID: <200708180035.l7I0ZQSb006711@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070817/ece19037/attachment.html -------------- next part -------------- Property changes on: Libraries/trunkSphinx2msdev/libsphinx2 ___________________________________________________________________ Name: svn:ignore + Release Debug *.user Property changes on: Libraries/trunkSphinx2msdev/libsphinx2ad ___________________________________________________________________ Name: svn:ignore + Release Debug *.user Property changes on: Libraries/trunkSphinx2msdev/libsphinx2fe ___________________________________________________________________ Name: svn:ignore + Release Debug *.user From bfrisch at edam.speech.cs.cmu.edu Mon Aug 20 22:02:31 2007 From: bfrisch at edam.speech.cs.cmu.edu (bfrisch@edam.speech.cs.cmu.edu) Date: Mon, 20 Aug 2007 22:02:31 -0400 Subject: [RavenclawDev 338] [2010] Libraries/trunkSphinx2msdev/libsphinx2: Now libsphinx2 compiles in debug mode Message-ID: <200708210202.l7L22VXO016363@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070820/4cc25335/attachment.html -------------- next part -------------- Modified: Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj =================================================================== --- Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj 2007-08-18 00:35:26 UTC (rev 2009) +++ Libraries/trunkSphinx2msdev/libsphinx2/libsphinx2.vcproj 2007-08-21 02:02:30 UTC (rev 2010) @@ -118,7 +118,7 @@ An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070820/45664140/attachment.html -------------- next part -------------- Modified: Agents/Helios3/Helios3.vcproj =================================================================== --- Agents/Helios3/Helios3.vcproj 2007-08-21 02:02:30 UTC (rev 2010) +++ Agents/Helios3/Helios3.vcproj 2007-08-21 02:02:58 UTC (rev 2011) @@ -26,6 +26,8 @@ > An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070821/6d430a17/attachment.html -------------- next part -------------- Modified: Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj =================================================================== --- Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj 2007-08-21 02:02:58 UTC (rev 2011) +++ Agents/MultiDecoder/Sphinx_Engine/Sphinx_Engine.vcproj 2007-08-21 19:31:13 UTC (rev 2012) @@ -25,6 +25,8 @@ > An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070821/3f04a067/attachment.html -------------- next part -------------- Modified: Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj =================================================================== --- Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj 2007-08-21 19:31:13 UTC (rev 2012) +++ Agents/MultiDecoder/Audio_Server/Audio_Server.vcproj 2007-08-21 19:31:29 UTC (rev 2013) @@ -25,6 +25,8 @@ > From tk at edam.speech.cs.cmu.edu Thu Aug 30 16:09:47 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 30 Aug 2007 16:09:47 -0400 Subject: [RavenclawDev 342] [2014] trunk/: Added main trunk hierarchy Message-ID: <200708302009.l7UK9lBK010662@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070830/bbdac915/attachment.html -------------- next part -------------- From tk at edam.speech.cs.cmu.edu Thu Aug 30 16:10:45 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 30 Aug 2007 16:10:45 -0400 Subject: [RavenclawDev 343] [2015] trunk: Moved directories into trunk Message-ID: <200708302010.l7UKAjT8010675@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070830/b658eabb/attachment.html -------------- next part -------------- Copied: trunk/Tools (from rev 2014, Tools) From tk at edam.speech.cs.cmu.edu Thu Aug 30 16:10:46 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 30 Aug 2007 16:10:46 -0400 Subject: [RavenclawDev 344] [2017] trunk: Moved directories into trunk Message-ID: <200708302010.l7UKAkub010695@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070830/309bf6ba/attachment.html -------------- next part -------------- Copied: trunk/Libraries (from rev 2016, Libraries) From tk at edam.speech.cs.cmu.edu Thu Aug 30 16:10:46 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 30 Aug 2007 16:10:46 -0400 Subject: [RavenclawDev 345] [2016] trunk: Moved directories into trunk Message-ID: <200708302010.l7UKAkdo010685@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070830/eef8c098/attachment.html -------------- next part -------------- Copied: trunk/Agents (from rev 2015, Agents) From tk at edam.speech.cs.cmu.edu Thu Aug 30 16:30:54 2007 From: tk at edam.speech.cs.cmu.edu (tk@edam.speech.cs.cmu.edu) Date: Thu, 30 Aug 2007 16:30:54 -0400 Subject: [RavenclawDev 346] [24] Fixed olympus references to trunk Message-ID: <200708302030.l7UKUsQi010738@edam.speech.cs.cmu.edu> An HTML attachment was scrubbed... URL: http://mailman.srv.cs.cmu.edu/pipermail/ravenclaw-developers/attachments/20070830/c71f683c/attachment.html -------------- next part -------------- Property changes on: Agents ___________________________________________________________________ Name: svn:externals - BackendServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/BackendServer2 DateTime4 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/DateTime4 Helios3 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Helios3 Kalliope http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Kalliope MultiDecoder/Audio_Server http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/Audio_Server MultiDecoder/DTMF_Engine http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/DTMF_Engine MultiDecoder/Sphinx_Engine http://edam.speech.cs.cmu.edu/repos/olympus/Agents/MultiDecoder/Sphinx_Engine NlgServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/NlgServer2 Phoenix2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/Phoenix2 ProcessMonitor http://edam.speech.cs.cmu.edu/repos/olympus/Agents/ProcessMonitor TTYRecognitionServer2 http://edam.speech.cs.cmu.edu/repos/olympus/Agents/TTYRecognitionServer2 + BackendServer2 http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/BackendServer2 DateTime4 http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/DateTime4 Helios3 http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Helios3 Kalliope http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Kalliope MultiDecoder/Audio_Server http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/MultiDecoder/Audio_Server MultiDecoder/DTMF_Engine http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/MultiDecoder/DTMF_Engine MultiDecoder/Sphinx_Engine http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/MultiDecoder/Sphinx_Engine NlgServer2 http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/NlgServer2 Phoenix2 http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/Phoenix2 ProcessMonitor http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/ProcessMonitor TTYRecognitionServer2 http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Agents/TTYRecognitionServer2 Property changes on: Libraries ___________________________________________________________________ Name: svn:externals - DTMFDecoder http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/DTMFDecoder Galaxy http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/Galaxy RavenClaw http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/RavenClaw Rosetta http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/Rosetta sphinx2 https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk/sphinx2 trunkSphinx2msdev http://edam.speech.cs.cmu.edu/repos/olympus/Libraries/trunkSphinx2msdev + DTMFDecoder http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/DTMFDecoder Galaxy http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Galaxy RavenClaw http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/RavenClaw Rosetta http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/Rosetta sphinx2 https://cmusphinx.svn.sourceforge.net/svnroot/cmusphinx/trunk/sphinx2 trunkSphinx2msdev http://edam.speech.cs.cmu.edu/repos/olympus/trunk/Libraries/trunkSphinx2msdev