sphere-axis-commits Mailing List for Axis for Sphere (Page 2)
Brought to you by:
pesterle
Menu
▾
▴
sphere-axis-commits — Sends log information when files are committed to CVS
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(71) |
Jun
(4) |
Jul
(26) |
Aug
(23) |
Sep
(6) |
Oct
(2) |
Nov
(74) |
Dec
(89) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(88) |
Feb
(51) |
Mar
(26) |
Apr
(8) |
May
(55) |
Jun
(67) |
Jul
(37) |
Aug
(46) |
Sep
(12) |
Oct
(6) |
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
(13) |
Apr
(8) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Philip E. <pes...@us...> - 2003-10-03 21:18:05
|
Update of /cvsroot/sphere-axis/Utilities/CCWizard
In directory sc8-pr-cvs1:/tmp/cvs-serv7311
Modified Files:
CCWizard.rc CCWizardDlg.cpp CCWizardDlg.h
Log Message:
no message
Index: CCWizard.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Utilities/CCWizard/CCWizard.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CCWizard.rc 3 Oct 2003 17:38:27 -0000 1.2
--- CCWizard.rc 3 Oct 2003 21:17:53 -0000 1.3
***************
*** 101,105 ****
CONTROL "C#",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,67,84,26,10
CONTROL "VB",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,105,84,24,10
! PUSHBUTTON "Create Files",IDC_CREATEFILES,161,82,57,15
PUSHBUTTON "Finished",IDOK,263,7,50,16
LTEXT "Library Name",IDC_STATIC,12,43,44,8
--- 101,105 ----
CONTROL "C#",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,67,84,26,10
CONTROL "VB",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,105,84,24,10
! DEFPUSHBUTTON "Create Files",IDC_CREATEFILES,161,82,57,15
PUSHBUTTON "Finished",IDOK,263,7,50,16
LTEXT "Library Name",IDC_STATIC,12,43,44,8
Index: CCWizardDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Utilities/CCWizard/CCWizardDlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CCWizardDlg.cpp 3 Oct 2003 17:38:27 -0000 1.2
--- CCWizardDlg.cpp 3 Oct 2003 21:17:53 -0000 1.3
***************
*** 103,107 ****
m_eLibraryName.SetWindowText(_T("CC_Custom"));
m_eClassName.SetWindowText(_T("Commands"));
!
return TRUE;
}
--- 103,107 ----
m_eLibraryName.SetWindowText(_T("CC_Custom"));
m_eClassName.SetWindowText(_T("Commands"));
!
return TRUE;
}
***************
*** 169,176 ****
void CCCWizardDlg::OnBnClickedCreatefiles()
{
! m_eStatus.Clear();
m_eOutput.GetWindowText(m_sPath);
m_eClassName.GetWindowText(m_sClass);
m_eLibraryName.GetWindowText(m_sLibrary);
// Which language is selected?
int idLanguage = GetCheckedRadioButton(IDC_RADIO1, IDC_RADIO3);
--- 169,180 ----
void CCCWizardDlg::OnBnClickedCreatefiles()
{
! m_eStatus.SetWindowText(_T(""));
m_eOutput.GetWindowText(m_sPath);
m_eClassName.GetWindowText(m_sClass);
m_eLibraryName.GetWindowText(m_sLibrary);
+ m_sClassUpper = m_sClass;
+ m_sClassUpper.MakeUpper();
+ m_sLibraryUpper = m_sLibrary;
+ m_sLibraryUpper.MakeUpper();
// Which language is selected?
int idLanguage = GetCheckedRadioButton(IDC_RADIO1, IDC_RADIO3);
***************
*** 241,245 ****
int CCCWizardDlg::BuildFilesCPlusPlus()
{
- m_eStatus.Clear();
// Since there are a bunch of necessary files for the C++ projects, we'll break this up a bit.
BuildCDllDataFiles();
--- 245,248 ----
***************
*** 253,257 ****
int CCCWizardDlg::BuildFilesCSharp()
{
- m_eStatus.Clear();
CString sFile;
CStdioFile f;
--- 256,259 ----
***************
*** 331,336 ****
FileWrite(f, _T("//\n"));
FileWrite(f, _T("[assembly: AssemblyDelaySign(false)]\n"));
! FileWrite(f, _T("[assembly: AssemblyKeyFile("")]\n"));
! FileWrite(f, _T("[assembly: AssemblyKeyName("")]\n"));
f.Close();
// **********************
--- 333,338 ----
FileWrite(f, _T("//\n"));
FileWrite(f, _T("[assembly: AssemblyDelaySign(false)]\n"));
! FileWrite(f, _T("[assembly: AssemblyKeyFile(\"\")]\n"));
! FileWrite(f, _T("[assembly: AssemblyKeyName(\"\")]\n"));
f.Close();
// **********************
***************
*** 513,519 ****
FileWrite(f, _T(" }\n"));
FileWrite(f, _T("\n"));
- FileWrite(f, _T(" private uint m_iPrefix;\n"));
- FileWrite(f, _T(" private string m_prefix;\n"));
- FileWrite(f, _T(" \n"));
FileWrite(f, _T(" /// <summary>\n"));
FileWrite(f, _T(" /// </summary>\n"));
--- 515,518 ----
***************
*** 600,604 ****
FileWrite(f, _T(" {\n"));
FileWrite(f, _T(" // There are no server defined commands for this module\n"));
! FileWrite(f, _T(" return "";\n"));
FileWrite(f, _T(" }\n"));
FileWrite(f, _T("\n"));
--- 599,603 ----
FileWrite(f, _T(" {\n"));
FileWrite(f, _T(" // There are no server defined commands for this module\n"));
! FileWrite(f, _T(" return \"\";\n"));
FileWrite(f, _T(" }\n"));
FileWrite(f, _T("\n"));
***************
*** 741,744 ****
--- 740,779 ----
FileWrite(f, _T("</VisualStudioProject>\n"));
f.Close();
+ // **********************
+ // <Library>.sln
+ // **********************
+ sFile.Format(_T("%s\\%s.sln"), m_sPath, m_sLibrary);
+ sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
+ status.Append(sLine);
+ m_eStatus.SetWindowText(status);
+ if ( !f.Open(sFile, CFile::modeCreate | CFile::modeWrite | CFile::typeText | CFile::shareDenyWrite) )
+ {
+ sLine.Format(_T("Error creating file %s%c%c"), sFile, 0x0d, 0x0a);
+ status.Append(sLine);
+ m_eStatus.SetWindowText(status);
+ return -1;
+ }
+ FileWrite(f, _T("Microsoft Visual Studio Solution File, Format Version 7.00\n"));
+ FileWrite(f, _T("Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"CC_Custom\", \"CC_Custom.csproj\", \"{%s}\"\n"), m_sProjectGUID);
+ FileWrite(f, _T("EndProject\n"));
+ FileWrite(f, _T("Global\n"));
+ FileWrite(f, _T(" GlobalSection(SolutionConfiguration) = preSolution\n"));
+ FileWrite(f, _T(" ConfigName.0 = Debug\n"));
+ FileWrite(f, _T(" ConfigName.1 = Release\n"));
+ FileWrite(f, _T(" EndGlobalSection\n"));
+ FileWrite(f, _T(" GlobalSection(ProjectDependencies) = postSolution\n"));
+ FileWrite(f, _T(" EndGlobalSection\n"));
+ FileWrite(f, _T(" GlobalSection(ProjectConfiguration) = postSolution\n"));
+ FileWrite(f, _T(" {%s}.Debug.ActiveCfg = Debug|.NET\n"), m_sProjectGUID);
+ FileWrite(f, _T(" {%s}.Debug.Build.0 = Debug|.NET\n"), m_sProjectGUID);
+ FileWrite(f, _T(" {%s}.Release.ActiveCfg = Release|.NET\n"), m_sProjectGUID);
+ FileWrite(f, _T(" {%s}.Release.Build.0 = Release|.NET\n"), m_sProjectGUID);
+ FileWrite(f, _T(" EndGlobalSection\n"));
+ FileWrite(f, _T(" GlobalSection(ExtensibilityGlobals) = postSolution\n"));
+ FileWrite(f, _T(" EndGlobalSection\n"));
+ FileWrite(f, _T(" GlobalSection(ExtensibilityAddIns) = postSolution\n"));
+ FileWrite(f, _T(" EndGlobalSection\n"));
+ FileWrite(f, _T("EndGlobal\n"));
+ f.Close();
return 0;
}
***************
*** 780,784 ****
FileWrite(f, _T("#define ENTRY_PREFIX Prx\n\n"));
FileWrite(f, _T("#include \"dlldata.c\"\n"));
! FileWrite(f, _T("#include \"%s_p.c\"\n\n"), m_sClass);
FileWrite(f, _T("#endif //_MERGE_PROXYSTUB\n"));
f.Close();
--- 815,819 ----
FileWrite(f, _T("#define ENTRY_PREFIX Prx\n\n"));
FileWrite(f, _T("#include \"dlldata.c\"\n"));
! FileWrite(f, _T("#include \"%s_p.c\"\n\n"), m_sLibrary);
FileWrite(f, _T("#endif //_MERGE_PROXYSTUB\n"));
f.Close();
***************
*** 891,895 ****
FileWrite(f, _T("\tpublic CComCoClass<C%s, &CLSID_%s>,\n"), m_sClass, m_sClass);
FileWrite(f, _T("\tpublic ISupportErrorInfo,\n"));
! FileWrite(f, _T("\tpublic IDispatchImpl<IClientCommands, &IID_I%s, &LIBID_%s, /*wMajor =*/ 1, /*wMinor =*/ 0>\n"), m_sLibrary, m_sLibrary);
FileWrite(f, _T("{\n"));
FileWrite(f, _T("public:\n"));
--- 926,930 ----
FileWrite(f, _T("\tpublic CComCoClass<C%s, &CLSID_%s>,\n"), m_sClass, m_sClass);
FileWrite(f, _T("\tpublic ISupportErrorInfo,\n"));
! FileWrite(f, _T("\tpublic IDispatchImpl<IClientCommands, &IID_IClientCommands, &LIBID_%sLib, /*wMajor =*/ 1, /*wMinor =*/ 0>\n"), m_sLibrary);
FileWrite(f, _T("{\n"));
FileWrite(f, _T("public:\n"));
***************
*** 898,902 ****
FileWrite(f, _T("\t}\n"));
FileWrite(f, _T("\n"));
! FileWrite(f, _T("DECLARE_REGISTRY_RESOURCEID(IDR_%s)\n"), m_sClass);
FileWrite(f, _T("\n"));
FileWrite(f, _T("\n"));
--- 933,937 ----
FileWrite(f, _T("\t}\n"));
FileWrite(f, _T("\n"));
! FileWrite(f, _T("DECLARE_REGISTRY_RESOURCEID(IDR_%s)\n"), m_sClassUpper);
FileWrite(f, _T("\n"));
FileWrite(f, _T("\n"));
***************
*** 939,943 ****
// <class>.cpp
// **********************
! sFile.Format(_T("%s\\%s.h"), m_sPath, m_sClass);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
--- 974,978 ----
// <class>.cpp
// **********************
! sFile.Format(_T("%s\\%s.cpp"), m_sPath, m_sClass);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
***************
*** 950,1047 ****
return;
}
! FileWrite(f, _T("// %s.cpp : Implementation of C%s"), m_sClass, m_sClass);
! FileWrite(f, _T(""));
! FileWrite(f, _T("#include \"stdafx.h\""));
! FileWrite(f, _T("#include \"%s.h\""), m_sClass);
! FileWrite(f, _T(""));
! FileWrite(f, _T(""));
! FileWrite(f, _T("// C%s"), m_sClass);
! FileWrite(f, _T(""));
! FileWrite(f, _T("STDMETHODIMP C%s::InterfaceSupportsErrorInfo(REFIID riid)"), m_sClass);
! FileWrite(f, _T("{"));
! FileWrite(f, _T("\tstatic const IID* arr[] = "));
! FileWrite(f, _T("\t{"));
! FileWrite(f, _T("\t\t&IID_IClientCommands,"));
! FileWrite(f, _T("\t};"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\tfor (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)"));
! FileWrite(f, _T("\t{"));
! FileWrite(f, _T("\t\tif (InlineIsEqualGUID(*arr[i],riid))"));
! FileWrite(f, _T("\t\t\treturn S_OK;"));
! FileWrite(f, _T("\t}"));
! FileWrite(f, _T("\treturn S_FALSE;"));
! FileWrite(f, _T("}"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("STDMETHODIMP C%s::Set(ULONG field, BSTR arg, VARIANT_BOOL target)"), m_sClass);
! FileWrite(f, _T("{"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\t// TODO: Add your implementation code here"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\treturn S_OK;"));
! FileWrite(f, _T("}"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("STDMETHODIMP C%s::SendCommand(ULONG cmd, BSTR arg1, BSTR arg2, VARIANT_BOOL target)"), m_sClass);
! FileWrite(f, _T("{"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\t// TODO: Add your implementation code here"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\treturn S_OK;"));
! FileWrite(f, _T("}"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("STDMETHODIMP C%s::Toggle(ULONG flag, VARIANT_BOOL target)"), m_sClass);
! FileWrite(f, _T("{"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\t// TODO: Add your implementation code here"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\treturn S_OK;"));
! FileWrite(f, _T("}"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("STDMETHODIMP C%s::SetSpawnInfo(BSTR id, ULONG type, ULONG amount, ULONG timelo, ULONG timehi, ULONG distance, ULONG rate)"), m_sClass);
! FileWrite(f, _T("{"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\t// TODO: Add your implementation code here"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\treturn S_OK;"));
! FileWrite(f, _T("}"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("STDMETHODIMP C%s::GetServerCommandCount(ULONG* count)"), m_sClass);
! FileWrite(f, _T("{"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\t// TODO: Add your implementation code here"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\treturn S_OK;"));
! FileWrite(f, _T("}"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("STDMETHODIMP C%s::GetServerCommandDescription(ULONG index, BSTR* description)"), m_sClass);
! FileWrite(f, _T("{"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\t// TODO: Add your implementation code here"));
! FileWrite(f, _T(""));
! FileWrite(f, _T(" return S_OK;"));
! FileWrite(f, _T("}"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("STDMETHODIMP C%s::InvokeServerCommand(ULONG index, BSTR arg)"), m_sClass);
! FileWrite(f, _T("{"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\t// TODO: Add your implementation code here"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\treturn S_OK;"));
! FileWrite(f, _T("}"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("STDMETHODIMP C%s::InvokeSettingEditor(void)"), m_sClass);
! FileWrite(f, _T("{"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\t// TODO: Add your implementation code here"));
! FileWrite(f, _T(""));
! FileWrite(f, _T("\treturn S_OK;"));
! FileWrite(f, _T("}"));
f.Close();
}
--- 985,1082 ----
return;
}
! FileWrite(f, _T("// %s.cpp : Implementation of C%s\n"), m_sClass, m_sClass);
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("#include \"stdafx.h\"\n"));
! FileWrite(f, _T("#include \"%s.h\"\n"), m_sClass);
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("// C%s\n"), m_sClass);
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("STDMETHODIMP C%s::InterfaceSupportsErrorInfo(REFIID riid)\n"), m_sClass);
! FileWrite(f, _T("{\n"));
! FileWrite(f, _T("\tstatic const IID* arr[] = \n"));
! FileWrite(f, _T("\t{\n"));
! FileWrite(f, _T("\t\t&IID_IClientCommands,\n"));
! FileWrite(f, _T("\t};\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\tfor (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)\n"));
! FileWrite(f, _T("\t{\n"));
! FileWrite(f, _T("\t\tif (InlineIsEqualGUID(*arr[i],riid))\n"));
! FileWrite(f, _T("\t\t\treturn S_OK;\n"));
! FileWrite(f, _T("\t}\n"));
! FileWrite(f, _T("\treturn S_FALSE;\n"));
! FileWrite(f, _T("}\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("STDMETHODIMP C%s::Set(ULONG field, BSTR arg, VARIANT_BOOL target)\n"), m_sClass);
! FileWrite(f, _T("{\n"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\t// TODO: Add your implementation code here\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\treturn S_OK;\n"));
! FileWrite(f, _T("}\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("STDMETHODIMP C%s::SendCommand(ULONG cmd, BSTR arg1, BSTR arg2, VARIANT_BOOL target)\n"), m_sClass);
! FileWrite(f, _T("{\n"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\t// TODO: Add your implementation code here\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\treturn S_OK;\n"));
! FileWrite(f, _T("}\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("STDMETHODIMP C%s::Toggle(ULONG flag, VARIANT_BOOL target)\n"), m_sClass);
! FileWrite(f, _T("{\n"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\t// TODO: Add your implementation code here\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\treturn S_OK;\n"));
! FileWrite(f, _T("}\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("STDMETHODIMP C%s::SetSpawnInfo(BSTR id, ULONG type, ULONG amount, ULONG timelo, ULONG timehi, ULONG distance, ULONG rate)\n"), m_sClass);
! FileWrite(f, _T("{\n"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\t// TODO: Add your implementation code here\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\treturn S_OK;\n"));
! FileWrite(f, _T("}\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("STDMETHODIMP C%s::GetServerCommandCount(ULONG* count)\n"), m_sClass);
! FileWrite(f, _T("{\n"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\t// TODO: Add your implementation code here\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\treturn S_OK;\n"));
! FileWrite(f, _T("}\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("STDMETHODIMP C%s::GetServerCommandDescription(ULONG index, BSTR* description)\n"), m_sClass);
! FileWrite(f, _T("{\n"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\t// TODO: Add your implementation code here\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T(" return S_OK;\n"));
! FileWrite(f, _T("}\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("STDMETHODIMP C%s::InvokeServerCommand(ULONG index, BSTR arg)\n"), m_sClass);
! FileWrite(f, _T("{\n"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\t// TODO: Add your implementation code here\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\treturn S_OK;\n"));
! FileWrite(f, _T("}\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("STDMETHODIMP C%s::InvokeSettingEditor(void)\n"), m_sClass);
! FileWrite(f, _T("{\n"));
! FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\t// TODO: Add your implementation code here\n"));
! FileWrite(f, _T("\n"));
! FileWrite(f, _T("\treturn S_OK;\n"));
! FileWrite(f, _T("}\n"));
f.Close();
}
***************
*** 1208,1212 ****
// <tlb>.cpp
// **********************
! sFile.Format(_T("%s\\%s.tlb"), m_sPath, m_sLibrary);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
--- 1243,1247 ----
// <tlb>.cpp
// **********************
! sFile.Format(_T("%s\\%s.cpp"), m_sPath, m_sLibrary);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
***************
*** 1228,1232 ****
FileWrite(f, _T("public :\n"));
FileWrite(f, _T("\tDECLARE_LIBID(LIBID_%sLib)\n"), m_sLibrary);
! FileWrite(f, _T("\tDECLARE_REGISTRY_APPID_RESOURCEID(IDR_CLIENTCOMMANDS, \"{%s}\")\n"), m_sAppIDResourceGUID);
FileWrite(f, _T("};\n"));
FileWrite(f, _T("\n"));
--- 1263,1267 ----
FileWrite(f, _T("public :\n"));
FileWrite(f, _T("\tDECLARE_LIBID(LIBID_%sLib)\n"), m_sLibrary);
! FileWrite(f, _T("\tDECLARE_REGISTRY_APPID_RESOURCEID(IDR_%s, \"{%s}\")\n"), m_sClassUpper, m_sAppIDResourceGUID);
FileWrite(f, _T("};\n"));
FileWrite(f, _T("\n"));
***************
*** 1365,1369 ****
// <tlb>.vcproj
// **********************
! sFile.Format(_T("%s\\%s.sln"), m_sPath, m_sLibrary);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
--- 1400,1404 ----
// <tlb>.vcproj
// **********************
! sFile.Format(_T("%s\\%s.vcproj"), m_sPath, m_sLibrary);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
***************
*** 1671,1687 ****
FileWrite(f, _T("1 TEXTINCLUDE \n"));
FileWrite(f, _T("BEGIN\n"));
! FileWrite(f, _T(" \"resource.h\0\"\n"));
FileWrite(f, _T("END\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("2 TEXTINCLUDE \n"));
FileWrite(f, _T("BEGIN\n"));
! FileWrite(f, _T(" \"#include \"\"afxres.h\"\"\r\n\"\n"));
! FileWrite(f, _T(" \"\0\"\n"));
FileWrite(f, _T("END\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("3 TEXTINCLUDE \n"));
FileWrite(f, _T("BEGIN\n"));
! FileWrite(f, _T(" \"1 TYPELIB \"\"%s.tlb\"\"\r\n\"\n"), m_sLibrary);
! FileWrite(f, _T(" \"\0\"\n"));
FileWrite(f, _T("END\n"));
FileWrite(f, _T("\n"));
--- 1706,1722 ----
FileWrite(f, _T("1 TEXTINCLUDE \n"));
FileWrite(f, _T("BEGIN\n"));
! FileWrite(f, _T(" \"resource.h\\0\"\n"));
FileWrite(f, _T("END\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("2 TEXTINCLUDE \n"));
FileWrite(f, _T("BEGIN\n"));
! FileWrite(f, _T(" \"#include \"\"afxres.h\"\"\\r\\n\"\n"));
! FileWrite(f, _T(" \"\\0\"\n"));
FileWrite(f, _T("END\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("3 TEXTINCLUDE \n"));
FileWrite(f, _T("BEGIN\n"));
! FileWrite(f, _T(" \"1 TYPELIB \"\"%s.tlb\"\"\\r\\n\"\n"), m_sLibrary);
! FileWrite(f, _T(" \"\\0\"\n"));
FileWrite(f, _T("END\n"));
FileWrite(f, _T("\n"));
***************
*** 1733,1738 ****
FileWrite(f, _T("//\n"));
FileWrite(f, _T("\n"));
! FileWrite(f, _T("IDR_%s REGISTRY \"%s.rgs\"\n"), m_sLibrary.MakeUpper(), m_sLibrary);
! FileWrite(f, _T("IDR_%s REGISTRY \"%s.rgs\"\n"), m_sClass.MakeUpper(), m_sClass);
FileWrite(f, _T("\n"));
FileWrite(f, _T("/////////////////////////////////////////////////////////////////////////////\n"));
--- 1768,1773 ----
FileWrite(f, _T("//\n"));
FileWrite(f, _T("\n"));
! FileWrite(f, _T("IDR_%s REGISTRY \"%s.rgs\"\n"), m_sLibraryUpper, m_sLibrary);
! FileWrite(f, _T("IDR_%s REGISTRY \"%s.rgs\"\n"), m_sClassUpper, m_sClass);
FileWrite(f, _T("\n"));
FileWrite(f, _T("/////////////////////////////////////////////////////////////////////////////\n"));
***************
*** 1782,1787 ****
FileWrite(f, _T("//\n"));
FileWrite(f, _T("#define IDS_PROJNAME 100\n"));
! FileWrite(f, _T("#define IDR_%s 101\n"), m_sLibrary.MakeUpper());
! FileWrite(f, _T("#define IDR_%s 103\n"), m_sClass.MakeUpper());
FileWrite(f, _T("\n"));
FileWrite(f, _T("// Next default values for new objects\n"));
--- 1817,1822 ----
FileWrite(f, _T("//\n"));
FileWrite(f, _T("#define IDS_PROJNAME 100\n"));
! FileWrite(f, _T("#define IDR_%s 101\n"), m_sLibraryUpper);
! FileWrite(f, _T("#define IDR_%s 103\n"), m_sClassUpper);
FileWrite(f, _T("\n"));
FileWrite(f, _T("// Next default values for new objects\n"));
Index: CCWizardDlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Utilities/CCWizard/CCWizardDlg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CCWizardDlg.h 3 Oct 2003 17:38:27 -0000 1.2
--- CCWizardDlg.h 3 Oct 2003 21:17:53 -0000 1.3
***************
*** 46,49 ****
--- 46,51 ----
CString m_sClass;
CString m_sLibrary;
+ CString m_sClassUpper;
+ CString m_sLibraryUpper;
// Functions to build C++ files
|
|
From: Philip E. <pes...@us...> - 2003-10-03 17:38:31
|
Update of /cvsroot/sphere-axis/Utilities/CCWizard
In directory sc8-pr-cvs1:/tmp/cvs-serv2741
Modified Files:
CCWizard.rc CCWizardDlg.cpp CCWizardDlg.h
Log Message:
Updates to CCWizard code. C++/C# sections mostly completed. Still need
to work on VB section.
Index: CCWizard.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Utilities/CCWizard/CCWizard.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CCWizard.rc 5 Sep 2003 18:29:26 -0000 1.1
--- CCWizard.rc 3 Oct 2003 17:38:27 -0000 1.2
***************
*** 108,112 ****
GROUPBOX "Language Properties",IDC_STATIC,7,73,151,26
EDITTEXT IDC_STATUS,7,101,306,92,ES_MULTILINE | ES_AUTOHSCROLL |
! ES_READONLY
GROUPBOX "Output",IDC_STATIC,7,7,249,26
LTEXT "Output Path",IDC_STATIC,13,18,40,8
--- 108,112 ----
GROUPBOX "Language Properties",IDC_STATIC,7,73,151,26
EDITTEXT IDC_STATUS,7,101,306,92,ES_MULTILINE | ES_AUTOHSCROLL |
! ES_READONLY | WS_VSCROLL
GROUPBOX "Output",IDC_STATIC,7,7,249,26
LTEXT "Output Path",IDC_STATIC,13,18,40,8
Index: CCWizardDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Utilities/CCWizard/CCWizardDlg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CCWizardDlg.cpp 5 Sep 2003 18:29:26 -0000 1.1
--- CCWizardDlg.cpp 3 Oct 2003 17:38:27 -0000 1.2
***************
*** 210,213 ****
--- 210,225 ----
sLine.Format(_T("Class GUID = %s%c%c"), m_sClassGUID, 0x0d, 0x0a);
sStatus.Append(sLine);
+ m_sCompRegGUID = MakeGUID();
+ sLine.Format(_T("CompReg GUID = %s%c%c"), m_sCompRegGUID, 0x0d, 0x0a);
+ sStatus.Append(sLine);
+ m_sCompRegInterfaceGUID = MakeGUID();
+ sLine.Format(_T("CompRegInterface GUID = %s%c%c"), m_sCompRegInterfaceGUID, 0x0d, 0x0a);
+ sStatus.Append(sLine);
+ m_sAppIDResourceGUID = MakeGUID();
[...1593 lines suppressed...]
+ // **********************
+ sFile.Format(_T("%s\\stdafx.cpp"), m_sPath);
+ sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
+ status.Append(sLine);
+ m_eStatus.SetWindowText(status);
+ if ( !f.Open(sFile, CFile::modeCreate | CFile::modeWrite | CFile::typeText | CFile::shareDenyWrite) )
+ {
+ sLine.Format(_T("Error creating file %s%c%c"), sFile, 0x0d, 0x0a);
+ status.Append(sLine);
+ m_eStatus.SetWindowText(status);
+ return;
+ }
+ FileWrite(f, _T("// stdafx.cpp : source file that includes just the standard includes\n"));
+ FileWrite(f, _T("// %s.pch will be the pre-compiled header\n"), m_sLibrary);
+ FileWrite(f, _T("// stdafx.obj will contain the pre-compiled type information\n"));
+ FileWrite(f, _T("\n"));
+ FileWrite(f, _T("#include \"stdafx.h\"\n"));
+ f.Close();
}
Index: CCWizardDlg.h
===================================================================
RCS file: /cvsroot/sphere-axis/Utilities/CCWizard/CCWizardDlg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CCWizardDlg.h 5 Sep 2003 18:29:26 -0000 1.1
--- CCWizardDlg.h 3 Oct 2003 17:38:27 -0000 1.2
***************
*** 38,41 ****
--- 38,45 ----
CString m_sTlbGUID;
CString m_sClassGUID;
+ CString m_sCompRegGUID;
+ CString m_sCompRegInterfaceGUID;
+ CString m_sAppIDResourceGUID;
+ CString m_sProjectGUID;
CString m_sPath;
***************
*** 44,52 ****
// Functions to build C++ files
! void BuildDllDataFiles();
! void BuildClassFiles();
! void BuildTlbFiles();
! void BuildProjectFiles();
! void BuildExtraFiles();
// Functions to build C# files
--- 48,56 ----
// Functions to build C++ files
! void BuildCDllDataFiles();
! void BuildCClassFiles();
! void BuildCTlbFiles();
! void BuildCProjectFiles();
! void BuildCExtraFiles();
// Functions to build C# files
|
Update of /cvsroot/sphere-axis/Utilities/CCWizard
In directory sc8-pr-cvs1:/tmp/cvs-serv5884
Added Files:
CCWizard.cpp CCWizard.h CCWizard.rc CCWizard.vcproj
CCWizardDlg.cpp CCWizardDlg.h resource.h stdafx.cpp stdafx.h
Log Message:
Initial check-in of CCWizard code
--- NEW FILE: CCWizard.cpp ---
// CCWizard.cpp : Defines the class behaviors for the application.
//
#include "stdafx.h"
#include "CCWizard.h"
#include "CCWizardDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
#endif
// CCCWizardApp
BEGIN_MESSAGE_MAP(CCCWizardApp, CWinApp)
ON_COMMAND(ID_HELP, CWinApp::OnHelp)
END_MESSAGE_MAP()
// CCCWizardApp construction
CCCWizardApp::CCCWizardApp()
{
// TODO: add construction code here,
// Place all significant initialization in InitInstance
}
// The one and only CCCWizardApp object
CCCWizardApp theApp;
// CCCWizardApp initialization
BOOL CCCWizardApp::InitInstance()
{
// InitCommonControls() is required on Windows XP if an application
// manifest specifies use of ComCtl32.dll version 6 or later to enable
// visual styles. Otherwise, any window creation will fail.
InitCommonControls();
CWinApp::InitInstance();
AfxEnableControlContainer();
CCCWizardDlg dlg;
m_pMainWnd = &dlg;
INT_PTR nResponse = dlg.DoModal();
if (nResponse == IDOK)
{
// TODO: Place code here to handle when the dialog is
// dismissed with OK
}
else if (nResponse == IDCANCEL)
{
// TODO: Place code here to handle when the dialog is
// dismissed with Cancel
}
// Since the dialog has been closed, return FALSE so that we exit the
// application, rather than start the application's message pump.
return FALSE;
}
--- NEW FILE: CCWizard.h ---
// CCWizard.h : main header file for the PROJECT_NAME application
//
#pragma once
#ifndef __AFXWIN_H__
#error include 'stdafx.h' before including this file for PCH
#endif
#include "resource.h" // main symbols
// CCCWizardApp:
// See CCWizard.cpp for the implementation of this class
//
class CCCWizardApp : public CWinApp
{
public:
CCCWizardApp();
// Overrides
public:
virtual BOOL InitInstance();
// Implementation
DECLARE_MESSAGE_MAP()
};
extern CCCWizardApp theApp;
--- NEW FILE: CCWizard.rc ---
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"#define _AFX_NO_SPLITTER_RESOURCES\r\n"
"#define _AFX_NO_OLE_RESOURCES\r\n"
"#define _AFX_NO_TRACKER_RESOURCES\r\n"
"#define _AFX_NO_PROPERTY_RESOURCES\r\n"
"\r\n"
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
"LANGUAGE 9, 1\r\n"
"#pragma code_page(1252)\r\n"
"#include ""res\\CCWizard.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
"#include ""afxres.rc"" // Standard components\r\n"
"#endif\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDR_MAINFRAME ICON "res\\CCWizard.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_ABOUTBOX DIALOGEX 0, 0, 235, 55
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
CAPTION "About CCWizard"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20
LTEXT "CCWizard Version 1.0",IDC_STATIC,40,10,119,8,
SS_NOPREFIX
LTEXT "Copyright (C) 2003 Philip A. Esterle",IDC_STATIC,40,25,
188,8
DEFPUSHBUTTON "OK",IDOK,178,7,50,16,WS_GROUP
END
IDD_CCWIZARD_DIALOG DIALOGEX 0, 0, 320, 200
STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_APPWINDOW
CAPTION "CCWizard"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
EDITTEXT IDC_OUTPUTPATH,55,15,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse",IDC_BROWSEPATH,205,16,45,12
EDITTEXT IDC_LIBRARYNAME,56,41,97,13,ES_AUTOHSCROLL
EDITTEXT IDC_CLASSNAME,56,56,98,14,ES_AUTOHSCROLL
CONTROL "C++",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,
29,84,31,10
CONTROL "C#",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,67,84,26,10
CONTROL "VB",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,105,84,24,10
PUSHBUTTON "Create Files",IDC_CREATEFILES,161,82,57,15
PUSHBUTTON "Finished",IDOK,263,7,50,16
LTEXT "Library Name",IDC_STATIC,12,43,44,8
LTEXT "Class Name",IDC_STATIC,18,59,38,8
GROUPBOX "Static",IDC_STATIC,7,32,151,41
GROUPBOX "Language Properties",IDC_STATIC,7,73,151,26
EDITTEXT IDC_STATUS,7,101,306,92,ES_MULTILINE | ES_AUTOHSCROLL |
ES_READONLY
GROUPBOX "Output",IDC_STATIC,7,7,249,26
LTEXT "Output Path",IDC_STATIC,13,18,40,8
END
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,1
PRODUCTVERSION 1,0,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904e4"
BEGIN
VALUE "CompanyName", "TODO: <Company name>"
VALUE "FileDescription", "TODO: <File description>"
VALUE "FileVersion", "1.0.0.1"
VALUE "InternalName", "CCWizard.exe"
VALUE "LegalCopyright", "TODO: (c) <Company name>. All rights reserved."
VALUE "OriginalFilename", "CCWizard.exe"
VALUE "ProductName", "TODO: <Product name>"
VALUE "ProductVersion", "1.0.0.1"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
IDD_ABOUTBOX, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 228
TOPMARGIN, 7
BOTTOMMARGIN, 48
END
IDD_CCWIZARD_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 313
TOPMARGIN, 7
BOTTOMMARGIN, 193
END
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// RT_MANIFEST
//
IDR_MANIFEST RT_MANIFEST "res\\CCWizard.manifest"
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE
BEGIN
IDS_ABOUTBOX "&About CCWizard..."
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
#define _AFX_NO_SPLITTER_RESOURCES
#define _AFX_NO_OLE_RESOURCES
#define _AFX_NO_TRACKER_RESOURCES
#define _AFX_NO_PROPERTY_RESOURCES
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE 9, 1
#pragma code_page(1252)
#include "res\CCWizard.rc2" // non-Microsoft Visual C++ edited resources
#include "afxres.rc" // Standard components
#endif
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
--- NEW FILE: CCWizard.vcproj ---
<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.00"
Name="CCWizard"
ProjectGUID="{D87556C2-D080-4D6D-B2DA-5EDFACA64397}"
Keyword="MFCProj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
UseOfMFC="1"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
TreatWChar_tAsBuiltInType="TRUE"
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib"
LinkIncremental="2"
GenerateDebugInformation="TRUE"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="FALSE"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
UseOfMFC="1"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="TRUE"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"
StringPooling="TRUE"
MinimalRebuild="FALSE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
TreatWChar_tAsBuiltInType="TRUE"
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib"
LinkIncremental="1"
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="FALSE"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
</Configuration>
</Configurations>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
<File
RelativePath="CCWizard.cpp">
</File>
<File
RelativePath="CCWizardDlg.cpp">
</File>
<File
RelativePath="stdafx.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc">
<File
RelativePath="CCWizard.h">
</File>
<File
RelativePath="CCWizardDlg.h">
</File>
<File
RelativePath="Resource.h">
</File>
<File
RelativePath="stdafx.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest">
<File
RelativePath="res\CCWizard.ico">
</File>
<File
RelativePath="res\CCWizard.manifest">
</File>
<File
RelativePath="CCWizard.rc">
</File>
<File
RelativePath="res\CCWizard.rc2">
</File>
</Filter>
<File
RelativePath="ReadMe.txt">
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
--- NEW FILE: CCWizardDlg.cpp ---
// CCWizardDlg.cpp : implementation file
//
#include "stdafx.h"
#include "CCWizard.h"
#include "CCWizardDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
#endif
// CAboutDlg dialog used for App About
class CAboutDlg : public CDialog
{
public:
CAboutDlg();
// Dialog Data
enum { IDD = IDD_ABOUTBOX };
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
// Implementation
protected:
DECLARE_MESSAGE_MAP()
};
CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
{
}
void CAboutDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
}
BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
END_MESSAGE_MAP()
// CCCWizardDlg dialog
CCCWizardDlg::CCCWizardDlg(CWnd* pParent /*=NULL*/)
: CDialog(CCCWizardDlg::IDD, pParent)
{
m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
}
void CCCWizardDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
DDX_Control(pDX, IDC_OUTPUTPATH, m_eOutput);
DDX_Control(pDX, IDC_LIBRARYNAME, m_eLibraryName);
DDX_Control(pDX, IDC_CLASSNAME, m_eClassName);
DDX_Control(pDX, IDC_STATUS, m_eStatus);
}
BEGIN_MESSAGE_MAP(CCCWizardDlg, CDialog)
ON_WM_SYSCOMMAND()
ON_WM_PAINT()
ON_WM_QUERYDRAGICON()
//}}AFX_MSG_MAP
ON_BN_CLICKED(IDC_BROWSEPATH, OnBnClickedBrowsepath)
ON_BN_CLICKED(IDC_CREATEFILES, OnBnClickedCreatefiles)
END_MESSAGE_MAP()
// CCCWizardDlg message handlers
BOOL CCCWizardDlg::OnInitDialog()
{
CDialog::OnInitDialog();
// Add "About..." menu item to system menu.
// IDM_ABOUTBOX must be in the system command range.
ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
ASSERT(IDM_ABOUTBOX < 0xF000);
CMenu* pSysMenu = GetSystemMenu(FALSE);
if (pSysMenu != NULL)
{
CString strAboutMenu;
strAboutMenu.LoadString(IDS_ABOUTBOX);
if (!strAboutMenu.IsEmpty())
{
pSysMenu->AppendMenu(MF_SEPARATOR);
pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu);
}
}
// Set the icon for this dialog. The framework does this automatically
// when the application's main window is not a dialog
SetIcon(m_hIcon, TRUE); // Set big icon
SetIcon(m_hIcon, FALSE); // Set small icon
CheckRadioButton(IDC_RADIO1, IDC_RADIO3, IDC_RADIO1);
m_eLibraryName.SetWindowText(_T("CC_Custom"));
m_eClassName.SetWindowText(_T("Commands"));
return TRUE;
}
void CCCWizardDlg::OnSysCommand(UINT nID, LPARAM lParam)
{
if ((nID & 0xFFF0) == IDM_ABOUTBOX)
{
CAboutDlg dlgAbout;
dlgAbout.DoModal();
}
else
{
CDialog::OnSysCommand(nID, lParam);
}
}
// If you add a minimize button to your dialog, you will need the code below
// to draw the icon. For MFC applications using the document/view model,
// this is automatically done for you by the framework.
void CCCWizardDlg::OnPaint()
{
if (IsIconic())
{
CPaintDC dc(this); // device context for painting
SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0);
// Center icon in client rectangle
int cxIcon = GetSystemMetrics(SM_CXICON);
int cyIcon = GetSystemMetrics(SM_CYICON);
CRect rect;
GetClientRect(&rect);
int x = (rect.Width() - cxIcon + 1) / 2;
int y = (rect.Height() - cyIcon + 1) / 2;
// Draw the icon
dc.DrawIcon(x, y, m_hIcon);
}
else
{
CDialog::OnPaint();
}
}
// The system calls this function to obtain the cursor to display while the user drags
// the minimized window.
HCURSOR CCCWizardDlg::OnQueryDragIcon()
{
return static_cast<HCURSOR>(m_hIcon);
}
void CCCWizardDlg::OnBnClickedBrowsepath()
{
CFileDialog dlg(TRUE, NULL, NULL, 0, NULL, NULL, 0);
if ( dlg.DoModal() == IDOK )
{
CString sFile = dlg.GetPathName();
sFile.SetAt(sFile.ReverseFind(_T('\\')), _T('\0'));
m_eOutput.SetWindowText(sFile);
}
}
void CCCWizardDlg::OnBnClickedCreatefiles()
{
m_eStatus.Clear();
m_eOutput.GetWindowText(m_sPath);
m_eClassName.GetWindowText(m_sClass);
m_eLibraryName.GetWindowText(m_sLibrary);
// Which language is selected?
int idLanguage = GetCheckedRadioButton(IDC_RADIO1, IDC_RADIO3);
GenerateGUIDs();
int rc = 0;
switch ( idLanguage )
{
case IDC_RADIO1:
rc = BuildFilesCPlusPlus();
break;
case IDC_RADIO2:
rc = BuildFilesCSharp();
break;
case IDC_RADIO3:
rc = BuildFilesVB();
break;
default:
break;
}
return;
}
void CCCWizardDlg::GenerateGUIDs()
{
CString sStatus, sLine;
m_eStatus.GetWindowText(sStatus);
sLine.Format(_T("Generating GUIDs%c%c"), 0x0d, 0x0a);
sStatus.Append(sLine);
m_sInterfaceGUID = MakeGUID();
sLine.Format(_T("Interface GUID = %s%c%c"), m_sInterfaceGUID, 0x0d, 0x0a);
sStatus.Append(sLine);
m_sTlbGUID = MakeGUID();
sLine.Format(_T("TypeLibrary GUID = %s%c%c"), m_sTlbGUID, 0x0d, 0x0a);
sStatus.Append(sLine);
m_sClassGUID = MakeGUID();
sLine.Format(_T("Class GUID = %s%c%c"), m_sClassGUID, 0x0d, 0x0a);
sStatus.Append(sLine);
m_eStatus.SetWindowText(sStatus);
}
CString CCCWizardDlg::MakeGUID()
{
GUID guid;
CoCreateGuid(&guid);
BYTE * b;
UuidToString((UUID*)&guid, &b);
CString s((LPTSTR)b);
RpcStringFree(&b);
return s;
}
int CCCWizardDlg::BuildFilesCPlusPlus()
{
return 0;
}
int CCCWizardDlg::BuildFilesCSharp()
{
return 0;
}
int CCCWizardDlg::BuildFilesVB()
{
return 0;
}
void CCCWizardDlg::BuildDllDataFiles()
{
CString sFile;
CStdioFile f;
CString status, sLine;
m_eStatus.GetWindowText(status);
// **********************
// dlldatax.c
// **********************
sFile.Format(_T("%s\\dlldatax.c"), m_sPath);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
m_eStatus.SetWindowText(status);
if ( !f.Open(sFile, CFile::modeCreate | CFile::typeText | CFile::shareDenyWrite) )
{
sLine.Format(_T("Error creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
m_eStatus.SetWindowText(status);
return;
}
FileWrite(f, _T("// wrapper for dlldata.c\n\n"));
FileWrite(f, _T("#ifdef _MERGE_PROXYSTUB // merge proxy stub DLL\n\n"));
FileWrite(f, _T("#define REGISTER_PROXY_DLL //DllRegisterServer, etc.\n\n"));
FileWrite(f, _T("#define _WIN32_WINNT 0x0400 //for WinNT 4.0 or Win95 with DCOM\n"));
FileWrite(f, _T("#define USE_STUBLESS_PROXY //defined only with MIDL switch /Oicf\n\n"));
FileWrite(f, _T("#pragma comment(lib, \"rpcndr.lib\")\n"));
FileWrite(f, _T("#pragma comment(lib, \"rpcns4.lib\")\n"));
FileWrite(f, _T("#pragma comment(lib, \"rpcrt4.lib\")\n\n"));
FileWrite(f, _T("#define ENTRY_PREFIX Prx\n\n"));
FileWrite(f, _T("#include \"dlldata.c\"\n"));
FileWrite(f, _T("#include \"ClientCommands_p.c\"\n\n"));
FileWrite(f, _T("#endif //_MERGE_PROXYSTUB\n"));
f.Close();
// **********************
// dlldatax.h
// **********************
sFile.Format(_T("%s\\dlldatax.h"), m_sPath);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
m_eStatus.SetWindowText(status);
if ( !f.Open(sFile, CFile::modeCreate | CFile::typeText | CFile::shareDenyWrite) )
{
sLine.Format(_T("Error creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
m_eStatus.SetWindowText(status);
return;
}
FileWrite(f, _T("#pragma once\n\n"));
FileWrite(f, _T("#ifdef _MERGE_PROXYSTUB\n\n"));
FileWrite(f, _T("extern \"C\" \n"));
FileWrite(f, _T("{\n"));
FileWrite(f, _T("BOOL WINAPI PrxDllMain(HINSTANCE hInstance, DWORD dwReason, \n"));
FileWrite(f, _T("\tLPVOID lpReserved);\n"));
FileWrite(f, _T("STDAPI PrxDllCanUnloadNow(void);\n"));
FileWrite(f, _T("STDAPI PrxDllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv);\n"));
FileWrite(f, _T("STDAPI PrxDllRegisterServer(void);\n"));
FileWrite(f, _T("STDAPI PrxDllUnregisterServer(void);\n"));
FileWrite(f, _T("}\n\n"));
FileWrite(f, _T("#endif\n"));
f.Close();
}
void CCCWizardDlg::BuildClassFiles()
{
CString sFile;
CStdioFile f;
CString status, sLine;
m_eStatus.GetWindowText(status);
// **********************
// <class>.rgs
// **********************
sFile.Format(_T("%s\\%s.rgs"), m_sPath, m_sClass);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
m_eStatus.SetWindowText(status);
if ( !f.Open(sFile, CFile::modeCreate | CFile::typeText | CFile::shareDenyWrite) )
{
sLine.Format(_T("Error creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
m_eStatus.SetWindowText(status);
return;
}
FileWrite(f, _T("HKCR"));
FileWrite(f, _T("{"));
FileWrite(f, _T("\t%s.%s.1 = s '%s Class'"), m_sLibrary, m_sClass, m_sClass);
FileWrite(f, _T("\t{"));
FileWrite(f, _T("\t\tCLSID = s '{%s}'"), m_sClassGUID);
FileWrite(f, _T("\t}"));
FileWrite(f, _T("\t%s.%s = s '%s Class'"), m_sLibrary, m_sClass, m_sClass);
FileWrite(f, _T("\t{"));
FileWrite(f, _T("\t\tCLSID = s '{%s}'"), m_sClassGUID);
FileWrite(f, _T("\t\tCurVer = s '%s.%s.1'"), m_sLibrary, m_sClass);
FileWrite(f, _T("\t}"));
FileWrite(f, _T("\tNoRemove CLSID"));
FileWrite(f, _T("\t{"));
FileWrite(f, _T("\t\tForceRemove {%s} = s '%s Class'"), m_sClassGUID, m_sClass);
FileWrite(f, _T("\t\t{"));
FileWrite(f, _T("\t\t\tProgID = s '%s.%s.1'"), m_sLibrary, m_sClass);
FileWrite(f, _T("\t\t\tVersionIndependentProgID = s '%s.%s'"), m_sLibrary, m_sClass);
FileWrite(f, _T("\t\t\tForceRemove 'Programmable'"));
FileWrite(f, _T("\t\t\tInprocServer32 = s '%MODULE%'"));
FileWrite(f, _T("\t\t\t{"));
FileWrite(f, _T("\t\t\t\tval ThreadingModel = s 'Apartment'"));
FileWrite(f, _T("\t\t\t}"));
FileWrite(f, _T("\t\t\tval AppID = s '%APPID%'"));
FileWrite(f, _T("\t\t\t'TypeLib' = s '{%s}'"), m_sTlbGUID);
FileWrite(f, _T("\t\t}"));
FileWrite(f, _T("\t}"));
FileWrite(f, _T("}"));
f.Close();
// **********************
// <class>.h
// **********************
sFile.Format(_T("%s\\%s.h"), m_sPath, m_sClass);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
m_eStatus.SetWindowText(status);
if ( !f.Open(sFile, CFile::modeCreate | CFile::typeText | CFile::shareDenyWrite) )
{
sLine.Format(_T("Error creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
m_eStatus.SetWindowText(status);
return;
}
FileWrite(f, _T("// SphereClientCommands.h : Declaration of the CSphereClientCommands\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("#pragma once\n"));
FileWrite(f, _T("#include \"resource.h\" // main symbols\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("#include \"%s.h\"\n"), m_sLibrary);
FileWrite(f, _T("\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("// C%s\n"), m_sClass);
FileWrite(f, _T("\n"));
FileWrite(f, _T("class ATL_NO_VTABLE C%s : \n"), m_sClass);
FileWrite(f, _T("\tpublic CComObjectRootEx<CComSingleThreadModel>,\n"));
FileWrite(f, _T("\tpublic CComCoClass<C%s, &CLSID_%s>,\n"), m_sClass, m_sClass);
FileWrite(f, _T("\tpublic ISupportErrorInfo,\n"));
FileWrite(f, _T("\tpublic IDispatchImpl<IClientCommands, &IID_I%s, &LIBID_%s, /*wMajor =*/ 1, /*wMinor =*/ 0>\n"), m_sLibrary, m_sLibrary);
FileWrite(f, _T("{\n"));
FileWrite(f, _T("public:\n"));
FileWrite(f, _T("\tC%s()\n"), m_sClass);
FileWrite(f, _T("\t{\n"));
FileWrite(f, _T("\t}\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("DECLARE_REGISTRY_RESOURCEID(IDR_%s)\n"), m_sClass);
FileWrite(f, _T("\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("BEGIN_COM_MAP(C%s)\n"), m_sClass);
FileWrite(f, _T("\tCOM_INTERFACE_ENTRY(IClientCommands)\n"));
FileWrite(f, _T("\tCOM_INTERFACE_ENTRY(IDispatch)\n"));
FileWrite(f, _T("\tCOM_INTERFACE_ENTRY(ISupportErrorInfo)\n"));
FileWrite(f, _T("END_COM_MAP()\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("// ISupportsErrorInfo\n"));
FileWrite(f, _T("\tSTDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("\tDECLARE_PROTECT_FINAL_CONSTRUCT()\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("\tHRESULT FinalConstruct()\n"));
FileWrite(f, _T("\t{\n"));
FileWrite(f, _T("\t\treturn S_OK;\n"));
FileWrite(f, _T("\t}\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("\tvoid FinalRelease() \n"));
FileWrite(f, _T("\t{\n"));
FileWrite(f, _T("\t}\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("public:\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("\tSTDMETHOD(Set)(ULONG field, BSTR arg, VARIANT_BOOL target);\n"));
FileWrite(f, _T("\tSTDMETHOD(SendCommand)(ULONG cmd, BSTR arg1, BSTR arg2, VARIANT_BOOL target);\n"));
FileWrite(f, _T("\tSTDMETHOD(Toggle)(ULONG flag, VARIANT_BOOL target);\n"));
FileWrite(f, _T("\tSTDMETHOD(SetSpawnInfo)(BSTR id, ULONG type, ULONG amount, ULONG timelo, ULONG timehi, ULONG distance, ULONG rate);\n"));
FileWrite(f, _T("\tSTDMETHOD(InvokeSettingEditor)(void);\n"));
FileWrite(f, _T("\tSTDMETHOD(GetServerCommandCount)(ULONG* count);\n"));
FileWrite(f, _T("\tSTDMETHOD(GetServerCommandDescription)(ULONG index, BSTR* description);\n"));
FileWrite(f, _T("\tSTDMETHOD(InvokeServerCommand)(ULONG index, BSTR arg);\n"));
FileWrite(f, _T("};\n"));
FileWrite(f, _T("\n"));
FileWrite(f, _T("OBJECT_ENTRY_AUTO(__uuidof(%s), C%s)\n"), m_sClass, m_sClass);
f.Close();
// **********************
// <class>.cpp
// **********************
sFile.Format(_T("%s\\%s.h"), m_sPath, m_sClass);
sLine.Format(_T("Creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
m_eStatus.SetWindowText(status);
if ( !f.Open(sFile, CFile::modeCreate | CFile::typeText | CFile::shareDenyWrite) )
{
sLine.Format(_T("Error creating file %s%c%c"), sFile, 0x0d, 0x0a);
status.Append(sLine);
m_eStatus.SetWindowText(status);
return;
}
FileWrite(f, _T("// %s.cpp : Implementation of C%s"), m_sClass, m_sClass);
FileWrite(f, _T(""));
FileWrite(f, _T("#include \"stdafx.h\""));
FileWrite(f, _T("#include \"%s.h\""), m_sClass);
FileWrite(f, _T(""));
FileWrite(f, _T(""));
FileWrite(f, _T("// C%s"), m_sClass);
FileWrite(f, _T(""));
FileWrite(f, _T("STDMETHODIMP C%s::InterfaceSupportsErrorInfo(REFIID riid)"), m_sClass);
FileWrite(f, _T("{"));
FileWrite(f, _T("\tstatic const IID* arr[] = "));
FileWrite(f, _T("\t{"));
FileWrite(f, _T("\t\t&IID_IClientCommands,"));
FileWrite(f, _T("\t};"));
FileWrite(f, _T(""));
FileWrite(f, _T("\tfor (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)"));
FileWrite(f, _T("\t{"));
FileWrite(f, _T("\t\tif (InlineIsEqualGUID(*arr[i],riid))"));
FileWrite(f, _T("\t\t\treturn S_OK;"));
FileWrite(f, _T("\t}"));
FileWrite(f, _T("\treturn S_FALSE;"));
FileWrite(f, _T("}"));
FileWrite(f, _T(""));
FileWrite(f, _T("STDMETHODIMP C%s::Set(ULONG field, BSTR arg, VARIANT_BOOL target)"), m_sClass);
FileWrite(f, _T("{"));
FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
FileWrite(f, _T(""));
FileWrite(f, _T("\t// TODO: Add your implementation code here"));
FileWrite(f, _T(""));
FileWrite(f, _T("\treturn S_OK;"));
FileWrite(f, _T("}"));
FileWrite(f, _T(""));
FileWrite(f, _T("STDMETHODIMP C%s::SendCommand(ULONG cmd, BSTR arg1, BSTR arg2, VARIANT_BOOL target)"), m_sClass);
FileWrite(f, _T("{"));
FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
FileWrite(f, _T(""));
FileWrite(f, _T("\t// TODO: Add your implementation code here"));
FileWrite(f, _T(""));
FileWrite(f, _T("\treturn S_OK;"));
FileWrite(f, _T("}"));
FileWrite(f, _T(""));
FileWrite(f, _T("STDMETHODIMP C%s::Toggle(ULONG flag, VARIANT_BOOL target)"), m_sClass);
FileWrite(f, _T("{"));
FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
FileWrite(f, _T(""));
FileWrite(f, _T("\t// TODO: Add your implementation code here"));
FileWrite(f, _T(""));
FileWrite(f, _T("\treturn S_OK;"));
FileWrite(f, _T("}"));
FileWrite(f, _T(""));
FileWrite(f, _T("STDMETHODIMP C%s::SetSpawnInfo(BSTR id, ULONG type, ULONG amount, ULONG timelo, ULONG timehi, ULONG distance, ULONG rate)"), m_sClass);
FileWrite(f, _T("{"));
FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
FileWrite(f, _T(""));
FileWrite(f, _T("\t// TODO: Add your implementation code here"));
FileWrite(f, _T(""));
FileWrite(f, _T("\treturn S_OK;"));
FileWrite(f, _T("}"));
FileWrite(f, _T(""));
FileWrite(f, _T("STDMETHODIMP C%s::GetServerCommandCount(ULONG* count)"), m_sClass);
FileWrite(f, _T("{"));
FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
FileWrite(f, _T(""));
FileWrite(f, _T("\t// TODO: Add your implementation code here"));
FileWrite(f, _T(""));
FileWrite(f, _T("\treturn S_OK;"));
FileWrite(f, _T("}"));
FileWrite(f, _T(""));
FileWrite(f, _T("STDMETHODIMP C%s::GetServerCommandDescription(ULONG index, BSTR* description)"), m_sClass);
FileWrite(f, _T("{"));
FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
FileWrite(f, _T(""));
FileWrite(f, _T("\t// TODO: Add your implementation code here"));
FileWrite(f, _T(""));
FileWrite(f, _T(" return S_OK;"));
FileWrite(f, _T("}"));
FileWrite(f, _T(""));
FileWrite(f, _T("STDMETHODIMP C%s::InvokeServerCommand(ULONG index, BSTR arg)"), m_sClass);
FileWrite(f, _T("{"));
FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
FileWrite(f, _T(""));
FileWrite(f, _T("\t// TODO: Add your implementation code here"));
FileWrite(f, _T(""));
FileWrite(f, _T("\treturn S_OK;"));
FileWrite(f, _T("}"));
FileWrite(f, _T(""));
FileWrite(f, _T("STDMETHODIMP C%s::InvokeSettingEditor(void)"), m_sClass);
FileWrite(f, _T("{"));
FileWrite(f, _T("\tAFX_MANAGE_STATE(AfxGetStaticModuleState());"));
FileWrite(f, _T(""));
FileWrite(f, _T("\t// TODO: Add your implementation code here"));
FileWrite(f, _T(""));
FileWrite(f, _T("\treturn S_OK;"));
FileWrite(f, _T("}"));
f.Close();
}
void CCCWizardDlg::BuildTlbFiles()
{
}
void CCCWizardDlg::BuildProjectFiles()
{
}
void CCCWizardDlg::BuildExtraFiles()
{
}
void CCCWizardDlg::FileWrite(CStdioFile &f, const char *format, ...)
{
CString s;
va_list vargs;
va_start(vargs, format);
s.FormatV(format, vargs);
va_end(vargs);
f.WriteString(s);
}
--- NEW FILE: CCWizardDlg.h ---
// CCWizardDlg.h : header file
//
#pragma once
#include "afxwin.h"
// CCCWizardDlg dialog
class CCCWizardDlg : public CDialog
{
// Construction
public:
CCCWizardDlg(CWnd* pParent = NULL); // standard constructor
// Dialog Data
enum { IDD = IDD_CCWIZARD_DIALOG };
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
// Implementation
protected:
HICON m_hIcon;
// Generated message map functions
virtual BOOL OnInitDialog();
afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
afx_msg void OnPaint();
afx_msg HCURSOR OnQueryDragIcon();
DECLARE_MESSAGE_MAP()
int BuildFilesCPlusPlus();
int BuildFilesCSharp();
int BuildFilesVB();
void GenerateGUIDs();
CString MakeGUID();
CString m_sInterfaceGUID;
CString m_sTlbGUID;
CString m_sClassGUID;
CString m_sPath;
CString m_sClass;
CString m_sLibrary;
// Functions to build C++ files
void BuildDllDataFiles();
void BuildClassFiles();
void BuildTlbFiles();
void BuildProjectFiles();
void BuildExtraFiles();
// Functions to build C# files
// Functions to build VB files
// Other functions
void FileWrite(CStdioFile &f, const char * format, ...);
public:
afx_msg void OnBnClickedBrowsepath();
afx_msg void OnBnClickedCreatefiles();
CEdit m_eOutput;
CEdit m_eLibraryName;
CEdit m_eClassName;
CEdit m_eStatus;
};
--- NEW FILE: resource.h ---
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by CCWizard.rc
//
#define IDR_MANIFEST 1
#define IDM_ABOUTBOX 0x0010
#define IDD_ABOUTBOX 100
#define IDS_ABOUTBOX 101
#define IDD_CCWIZARD_DIALOG 102
#define IDR_MAINFRAME 128
#define IDC_LIBRARYNAME 1000
#define IDC_CLASSNAME 1001
#define IDC_RADIO1 1002
#define IDC_RADIO2 1003
#define IDC_RADIO3 1004
#define IDC_EDIT3 1005
#define IDC_STATUS 1005
#define IDC_CREATEFILES 1006
#define IDC_OUTPUTPATH 1007
#define IDC_BROWSEPATH 1008
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 129
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1009
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
--- NEW FILE: stdafx.cpp ---
// stdafx.cpp : source file that includes just the standard includes
// CCWizard.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
--- NEW FILE: stdafx.h ---
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently,
// but are changed infrequently
#pragma once
#ifndef VC_EXTRALEAN
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
#endif
// Modify the following defines if you have to target a platform prior to the ones specified below.
// Refer to MSDN for the latest info on corresponding values for different platforms.
#ifndef WINVER // Allow use of features specific to Windows 95 and Windows NT 4 or later.
#define WINVER 0x0400 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
#endif
#ifndef _WIN32_WINNT // Allow use of features specific to Windows NT 4 or later.
#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
#endif
#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
#endif
#ifndef _WIN32_IE // Allow use of features specific to IE 4.0 or later.
#define _WIN32_IE 0x0400 // Change this to the appropriate value to target IE 5.0 or later.
#endif
#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
// turns off MFC's hiding of some common and often safely ignored warning messages
#define _AFX_ALL_WARNINGS
#include <afxwin.h> // MFC core and standard components
#include <afxext.h> // MFC extensions
#include <afxdisp.h> // MFC Automation classes
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
#ifndef _AFX_NO_AFXCMN_SUPPORT
#include <afxcmn.h> // MFC support for Windows Common Controls
#endif // _AFX_NO_AFXCMN_SUPPORT
|
|
From: Philip E. <pes...@us...> - 2003-09-05 18:29:29
|
Update of /cvsroot/sphere-axis/Utilities/CCWizard/res
In directory sc8-pr-cvs1:/tmp/cvs-serv5884/res
Added Files:
CCWizard.manifest CCWizard.rc2 CCWizard.ico
Log Message:
Initial check-in of CCWizard code
--- NEW FILE: CCWizard.manifest ---
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="1.0.0.0"
processorArchitecture="X86"
name="Microsoft.Windows.CCWizard"
type="win32"
/>
<description>Your app description here</description>
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="X86"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
</assembly>
--- NEW FILE: CCWizard.rc2 ---
//
// CCWizard.RC2 - resources Microsoft Visual C++ does not edit directly
//
#ifdef APSTUDIO_INVOKED
#error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
// Add manually edited resources here...
/////////////////////////////////////////////////////////////////////////////
--- NEW FILE: CCWizard.ico ---
÷÷÷÷÷÷÷÷÷÷÷÷÷÷ï À®êÊËÌÜÝÞÎÏпËÌÌÇÒ¿§ ÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷÷ïïïïïÀ®êàÊËõôÍÎÏÐõ
üüüüüüüû´ÇÓÔÖ×ØÚÊËÅ¿«¬ üüüüüüüüüûû¡æÆçÓõøòçãø÷Å« üüüüüüüüüüüüüæÆãçõ
!D?H31IT. -,%B;G1JKS.(
) *E9A011R.&#++E/4678:."&' NQWhX^XXXe rpqt}~]mv\l{
£hE¤iJX7§bIêεùîÛéȧ²t5RDE #
|
|
From: Philip E. <pes...@us...> - 2003-09-05 18:28:12
|
Update of /cvsroot/sphere-axis/Utilities/CCWizard/res In directory sc8-pr-cvs1:/tmp/cvs-serv5714/res Log Message: Directory /cvsroot/sphere-axis/Utilities/CCWizard/res added to the repository |
|
From: Philip E. <pes...@us...> - 2003-09-05 18:25:24
|
Update of /cvsroot/sphere-axis/Utilities/CCWizard In directory sc8-pr-cvs1:/tmp/cvs-serv5274/CCWizard Log Message: Directory /cvsroot/sphere-axis/Utilities/CCWizard added to the repository |
|
From: Philip E. <pes...@us...> - 2003-09-04 02:32:33
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv24238
Modified Files:
Def.cpp ScriptsMain.cpp
Log Message:
no message
Index: Def.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/Def.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Def.cpp 24 Jul 2003 20:12:44 -0000 1.5
--- Def.cpp 4 Sep 2003 02:32:28 -0000 1.6
***************
*** 112,115 ****
--- 112,117 ----
if ( IsHexValue(pszExp) )
return ahextoi(pszExp);
+ if ( IsDecimalValue(pszExp) )
+ return atoi(pszExp);
int iDef = Main->m_pScripts->m_aDefs.Find(pszExp);
if ( iDef != -1 )
Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** ScriptsMain.cpp 8 Aug 2003 15:49:43 -0000 1.32
--- ScriptsMain.cpp 4 Sep 2003 02:32:28 -0000 1.33
***************
*** 3067,3071 ****
// Format the spawn info here
CString sInfo;
! sInfo.Format(_T("%s,%s,%ld,%ld,%ld"), pSpawn->m_dwItemType == ITEM_SPAWN_CHAR ? _T("NPC") : _T("ITEM"), pSpawn->m_csBaseID, pSpawn->m_pX, pSpawn->m_pY, pSpawn->m_pZ);
return sInfo;
}
--- 3067,3071 ----
// Format the spawn info here
CString sInfo;
! sInfo.Format(_T("%s,0%04x,%ld,%ld,%ld"), pSpawn->m_dwItemType == ITEM_SPAWN_CHAR ? _T("NPC") : _T("ITEM"), pSpawn->m_dwMore1, pSpawn->m_pX, pSpawn->m_pY, pSpawn->m_pZ);
return sInfo;
}
***************
*** 3237,3241 ****
m_pDlg->SetRange32(0, (ULONG) fWorld.GetLength());
m_pDlg->SetPos(0);
! CString sMessage = locale->String(IDS_TRAVEL_LOADINGSPAWNS);
m_pDlg->m_csMessage.SetWindowText(sMessage);
BOOL bStatus = TRUE;
--- 3237,3242 ----
m_pDlg->SetRange32(0, (ULONG) fWorld.GetLength());
m_pDlg->SetPos(0);
! CString sMessage;
! sMessage.Format(locale->String(IDS_READINGFILE), m_sWorldItemFile);
m_pDlg->m_csMessage.SetWindowText(sMessage);
BOOL bStatus = TRUE;
***************
*** 3249,3253 ****
if ( ! bStatus )
break;
! if ( iLine % 10000 == 0 )
m_pDlg->SetPos(offset);
if ( sLine.Find(_T("[WORLDITEM")) == 0 )
--- 3250,3254 ----
if ( ! bStatus )
break;
! if ( iLine++ % 10000 == 0 )
m_pDlg->SetPos(offset);
if ( sLine.Find(_T("[WORLDITEM")) == 0 )
|
|
From: Philip E. <pes...@us...> - 2003-09-03 21:13:39
|
Update of /cvsroot/sphere-axis/Utilities In directory sc8-pr-cvs1:/tmp/cvs-serv3767 Log Message: no message Status: Vendor Tag: avendor Release Tags: arelease N Utilities/Utilities.sln N Utilities/rc2xml/drewsky.rc N Utilities/rc2xml/rc2xml.cpp N Utilities/rc2xml/rc2xml.h N Utilities/rc2xml/rc2xml.rc N Utilities/rc2xml/rc2xml.sln N Utilities/rc2xml/rc2xml.vcproj N Utilities/rc2xml/res.h N Utilities/rc2xml/Resource.h N Utilities/rc2xml/stdafx.cpp N Utilities/rc2xml/stdafx.h No conflicts created by this import ***** Bogus filespec: - ***** Bogus filespec: Imported ***** Bogus filespec: sources |
|
From: Philip E. <pes...@us...> - 2003-09-03 02:54:34
|
Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv5099/S_Sphere52
Modified Files:
WorldItem.cpp WorldItem.h
Log Message:
no message
Index: WorldItem.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/WorldItem.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** WorldItem.cpp 5 Aug 2003 20:43:05 -0000 1.5
--- WorldItem.cpp 3 Sep 2003 02:54:29 -0000 1.6
***************
*** 27,55 ****
#include "item.h"
! bool CWorldItem::Read(CStdioFile &csfInput)
{
! LoadBase();
! static const TCHAR * szWorldItemKeys [] =
! {
! _T("SERIAL"),
! _T("NAME"),
! _T("COLOR"),
! _T("TIMER"),
! _T("DISPID"),
! _T("AMOUNT"),
! _T("TYPE"),
! _T("LINK"),
! _T("ATTR"),
! _T("MORE1"),
! _T("MORE2"),
! _T("MOREP"),
! _T("LAYER"),
! _T("CONT"),
! _T("P"),
! _T("REGION.FLAGS"),
! _T("AGE"),
! };
BOOL bStatus = TRUE;
--- 27,56 ----
#include "item.h"
! const TCHAR * CWorldItem::szWorldItemKeys [] =
{
! _T("SERIAL"),
! _T("NAME"),
! _T("COLOR"),
! _T("TIMER"),
!
! _T("DISPID"),
! _T("AMOUNT"),
! _T("TYPE"),
! _T("LINK"),
! _T("ATTR"),
! _T("MORE1"),
! _T("MORE2"),
! _T("MOREP"),
! _T("LAYER"),
! _T("CONT"),
! _T("P"),
! _T("REGION.FLAGS"),
! _T("AGE"),
! };
! bool CWorldItem::Read(CStdioFile &csfInput)
! {
! LoadBase();
BOOL bStatus = TRUE;
***************
*** 74,100 ****
switch( FindTable(csKey, &szWorldItemKeys[0], 15) )
{
! case 0:
m_dwSerial = (DWORD) ahextoi(csValue); break;
! case 1:
m_csName = csValue; break;
! case 2:
m_wColor = (WORD) ahextoi(csValue); break;
! case 3:
m_dwTimer = (DWORD) ahextoi(csValue); break;
! case 4:
m_wArtID = (WORD) ahextoi(csValue); break;
! case 5:
m_wAmount = (WORD) _tstoi(csValue); break;
! case 6:
m_dwItemType = (DWORD) DefLookup(csValue); break;
! case 7:
m_dwLink = (DWORD) ahextoi(csValue); break;
! case 8:
m_dwAttr = (DWORD) ahextoi(csValue); break;
! case 9:
m_dwMore1 = (DWORD) ahextoi(csValue); break;
! case 10:
m_dwMore2 = (DWORD) ahextoi(csValue); break;
! case 11:
// Need to parse this data out into the X, Y, and Z components.
{
--- 75,101 ----
switch( FindTable(csKey, &szWorldItemKeys[0], 15) )
{
! case Serial:
m_dwSerial = (DWORD) ahextoi(csValue); break;
! case Name:
m_csName = csValue; break;
! case Color:
m_wColor = (WORD) ahextoi(csValue); break;
! case Timer:
m_dwTimer = (DWORD) ahextoi(csValue); break;
! case DispID:
m_wArtID = (WORD) ahextoi(csValue); break;
! case Amount:
m_wAmount = (WORD) _tstoi(csValue); break;
! case Type:
m_dwItemType = (DWORD) DefLookup(csValue); break;
! case Link:
m_dwLink = (DWORD) ahextoi(csValue); break;
! case Attr:
m_dwAttr = (DWORD) ahextoi(csValue); break;
! case More1:
m_dwMore1 = (DWORD) ahextoi(csValue); break;
! case More2:
m_dwMore2 = (DWORD) ahextoi(csValue); break;
! case MoreP:
// Need to parse this data out into the X, Y, and Z components.
{
***************
*** 126,134 ****
}
}
! case 12:
m_bLayer = (BYTE) _tstoi(csValue); break;
! case 13:
m_dwContainer = (DWORD) ahextoi(csValue); break;
! case 14:
// Need to parse this data out into the X, Y, and Z components.
{
--- 127,135 ----
}
}
! case Layer:
m_bLayer = (BYTE) _tstoi(csValue); break;
! case Cont:
m_dwContainer = (DWORD) ahextoi(csValue); break;
! case P:
// Need to parse this data out into the X, Y, and Z components.
{
***************
*** 160,166 ****
}
}
! case 15:
m_wRegionFlags = (WORD) ahextoi(csValue); break;
! case 16:
m_dwAge = ahextoi(csValue); break;
default:
--- 161,167 ----
}
}
! case RegionFlags:
m_wRegionFlags = (WORD) ahextoi(csValue); break;
! case Age:
m_dwAge = ahextoi(csValue); break;
default:
Index: WorldItem.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/WorldItem.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** WorldItem.h 23 Jul 2003 19:10:57 -0000 1.3
--- WorldItem.h 3 Sep 2003 02:54:29 -0000 1.4
***************
*** 59,61 ****
--- 59,84 ----
WORD m_wRegionFlags;
DWORD m_dwAge;
+
+ static const TCHAR * szWorldItemKeys [];
+
+ enum WorldItemKeys
+ {
+ Serial,
+ Name,
+ Color,
+ Timer,
+ DispID,
+ Amount,
+ Type,
+ Link,
+ Attr,
+ More1,
+ More2,
+ MoreP,
+ Layer,
+ Cont,
+ P,
+ RegionFlags,
+ Age
+ };
};
|
|
From: Philip E. <pes...@us...> - 2003-09-03 02:54:33
|
Update of /cvsroot/sphere-axis/Axis/AxisLib In directory sc8-pr-cvs1:/tmp/cvs-serv5099/AxisLib Modified Files: AxisServerInterface.h Log Message: no message Index: AxisServerInterface.h =================================================================== RCS file: /cvsroot/sphere-axis/Axis/AxisLib/AxisServerInterface.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** AxisServerInterface.h 2 Sep 2003 19:16:36 -0000 1.3 --- AxisServerInterface.h 3 Sep 2003 02:54:29 -0000 1.4 *************** *** 90,94 **** #ifndef MAX_BUFFER ! #define MAX_BUFFER 8192 #endif --- 90,94 ---- #ifndef MAX_BUFFER ! #define MAX_BUFFER 1024 #endif |
|
From: Philip E. <pes...@us...> - 2003-09-03 02:46:50
|
Update of /cvsroot/sphere-axis/Axis
In directory sc8-pr-cvs1:/tmp/cvs-serv3681
Modified Files:
Tag: v0_13-Stable
StaticToolDlg.cpp
Log Message:
no message
Index: StaticToolDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/StaticToolDlg.cpp,v
retrieving revision 1.34.2.4
retrieving revision 1.34.2.5
diff -C2 -r1.34.2.4 -r1.34.2.5
*** StaticToolDlg.cpp 29 Aug 2003 05:55:03 -0000 1.34.2.4
--- StaticToolDlg.cpp 3 Sep 2003 02:46:46 -0000 1.34.2.5
***************
*** 489,493 ****
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, NULL, NULL, 0, "Script Files (*.scp)|*.scp||", 0);
if ( dlg.DoModal() == IDOK )
m_csWorldFile = dlg.GetPathName();
--- 489,493 ----
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, NULL, NULL, 0, "Script Files (*.scp)|*.scp||", NULL, 0);
if ( dlg.DoModal() == IDOK )
m_csWorldFile = dlg.GetPathName();
|
|
From: Philip E. <pes...@us...> - 2003-09-02 19:18:03
|
Update of /cvsroot/sphere-axis/UOMap
In directory sc8-pr-cvs1:/tmp/cvs-serv19833
Modified Files:
UOMapCtl.cpp
Log Message:
no message
Index: UOMapCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/UOMapCtl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** UOMapCtl.cpp 28 May 2003 21:40:13 -0000 1.14
--- UOMapCtl.cpp 2 Sep 2003 19:18:00 -0000 1.15
***************
*** 1544,1551 ****
DWORD dwIndex = FindPatch(*pArray, (DWORD) BlockNumber);
- CFile fMap;
- CString csMapFile;
- MapBlock block;
-
if ( dwIndex == 0xFFFFFFFF )
{
--- 1544,1547 ----
***************
*** 1565,1569 ****
dwIndex = BlockNumber;
}
! if ( !fMap.Open(csMapFile, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
return 0;
fMap.Seek(dwIndex * sizeof(MapBlock), CFile::begin);
--- 1561,1569 ----
dwIndex = BlockNumber;
}
!
! CFile fMap;
! MapBlock block;
!
! if ( !fMap.Open(sFile, CFile::modeRead | CFile::typeBinary | CFile::shareDenyNone) )
return 0;
fMap.Seek(dwIndex * sizeof(MapBlock), CFile::begin);
|
|
From: Philip E. <pes...@us...> - 2003-09-02 19:17:53
|
Update of /cvsroot/sphere-axis/UOMap
In directory sc8-pr-cvs1:/tmp/cvs-serv19799
Modified Files:
UOMap.rc
Log Message:
no message
Index: UOMap.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/UOMap.rc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** UOMap.rc 14 May 2003 02:54:56 -0000 1.15
--- UOMap.rc 2 Sep 2003 19:17:49 -0000 1.16
***************
*** 54,59 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,3,0,0
! PRODUCTVERSION 1,3,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 54,59 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,3,2,0
! PRODUCTVERSION 1,3,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 71,80 ****
BEGIN
VALUE "FileDescription", "UOMap ActiveX Control Module"
! VALUE "FileVersion", "1, 3, 0, 0"
VALUE "InternalName", "UOMap"
VALUE "LegalCopyright", "Copyright (C) 2000-2003"
VALUE "OriginalFilename", "UOMap.OCX"
VALUE "ProductName", "UOMap ActiveX Control Module"
! VALUE "ProductVersion", "1, 3, 0, 0"
END
END
--- 71,80 ----
BEGIN
VALUE "FileDescription", "UOMap ActiveX Control Module"
! VALUE "FileVersion", "1, 3, 2, 0"
VALUE "InternalName", "UOMap"
VALUE "LegalCopyright", "Copyright (C) 2000-2003"
VALUE "OriginalFilename", "UOMap.OCX"
VALUE "ProductName", "UOMap ActiveX Control Module"
! VALUE "ProductVersion", "1, 3, 2, 0"
END
END
|
|
From: Philip E. <pes...@us...> - 2003-09-02 19:16:40
|
Update of /cvsroot/sphere-axis/Axis/AxisLib In directory sc8-pr-cvs1:/tmp/cvs-serv19593 Modified Files: AxisServerInterface.h AxisServerProxy.cpp Log Message: no message Index: AxisServerInterface.h =================================================================== RCS file: /cvsroot/sphere-axis/Axis/AxisLib/AxisServerInterface.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AxisServerInterface.h 23 May 2003 05:44:27 -0000 1.2 --- AxisServerInterface.h 2 Sep 2003 19:16:36 -0000 1.3 *************** *** 26,30 **** --- 26,34 ---- #include <winsock.h> + #ifdef _DEBUG #import "Debug/AxisLib.tlb" + #else + #import "Release/AxisLib.tlb" + #endif #include "Logger.h" Index: AxisServerProxy.cpp =================================================================== RCS file: /cvsroot/sphere-axis/Axis/AxisLib/AxisServerProxy.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AxisServerProxy.cpp 23 May 2003 05:44:27 -0000 1.2 --- AxisServerProxy.cpp 2 Sep 2003 19:16:36 -0000 1.3 *************** *** 29,33 **** --- 29,37 ---- #include "AxisServerInterface.h" + #ifdef _DEBUG #import "Debug/AxisLib.tlb" + #else + #import "Release/AxisLib.tlb" + #endif using namespace AxisLib; |
|
From: Philip E. <pes...@us...> - 2003-08-31 03:21:48
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv31000
Modified Files:
Tag: v0_13-Stable
Makefile.in
Log Message:
Added gwhogsvr.h to EXTRA_DIST so that it would be included in the distro.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/Makefile.in,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -C2 -r1.1.4.2 -r1.1.4.3
*** Makefile.in 30 Aug 2003 17:02:52 -0000 1.1.4.2
--- Makefile.in 31 Aug 2003 03:21:45 -0000 1.1.4.3
***************
*** 110,113 ****
--- 110,114 ----
Makefile.in NEWS acinclude.m4 aclocal.m4 configure configure.in \
depcomp install-sh missing mkinstalldirs
+ EXTRA_DIST = gwhogsvr.h
SOURCES = $(axissvr_SOURCES)
|
|
From: Philip E. <pes...@us...> - 2003-08-30 17:02:56
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv11358
Modified Files:
Tag: v0_13-Stable
Makefile.in configure configure.in
Log Message:
Additional build environment changes.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/Makefile.in,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -r1.1.4.1 -r1.1.4.2
*** Makefile.in 30 Aug 2003 16:27:34 -0000 1.1.4.1
--- Makefile.in 30 Aug 2003 17:02:52 -0000 1.1.4.2
***************
*** 64,68 ****
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
! AMTAR = @AMTAR@
AWK = @AWK@
CC = @CC@
--- 64,68 ----
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
! AMTAR = tar
AWK = @AWK@
CC = @CC@
***************
*** 108,113 ****
DIST_SOURCES = $(axissvr_SOURCES)
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS aclocal.m4 configure configure.in depcomp \
! install-sh missing mkinstalldirs
SOURCES = $(axissvr_SOURCES)
--- 108,113 ----
DIST_SOURCES = $(axissvr_SOURCES)
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS acinclude.m4 aclocal.m4 configure configure.in \
! depcomp install-sh missing mkinstalldirs
SOURCES = $(axissvr_SOURCES)
***************
*** 262,270 ****
|| chmod -R a+r $(distdir)
dist-gzip: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
--- 262,270 ----
|| chmod -R a+r $(distdir)
dist-gzip: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tgz
$(am__remove_distdir)
dist dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tgz
$(am__remove_distdir)
***************
*** 274,278 ****
distcheck: dist
$(am__remove_distdir)
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
--- 274,278 ----
distcheck: dist
$(am__remove_distdir)
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tgz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
***************
*** 294,301 ****
exit 1; } >&2 ) \
&& $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
! && rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
! @echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
distcleancheck: distclean
--- 294,301 ----
exit 1; } >&2 ) \
&& $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
! && rm -f $(distdir).tgz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
! @echo "$(distdir).tgz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
distcleancheck: distclean
Index: configure
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/configure,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -r1.1.4.1 -r1.1.4.2
*** configure 30 Aug 2003 16:27:34 -0000 1.1.4.1
--- configure 30 Aug 2003 17:02:52 -0000 1.1.4.2
***************
*** 1,5 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57 for AxisServer 0.13.3.5.
#
# Report bugs to <bu...@fi...>.
--- 1,5 ----
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57 for AxisSvr 0.13.3.5.
#
# Report bugs to <bu...@fi...>.
***************
*** 267,274 ****
# Identity of this package.
! PACKAGE_NAME='AxisServer'
! PACKAGE_TARNAME='axisserver'
PACKAGE_VERSION='0.13.3.5'
! PACKAGE_STRING='AxisServer 0.13.3.5'
PACKAGE_BUGREPORT='bu...@fi...'
--- 267,274 ----
# Identity of this package.
! PACKAGE_NAME='AxisSvr'
! PACKAGE_TARNAME='axissvr'
PACKAGE_VERSION='0.13.3.5'
! PACKAGE_STRING='AxisSvr 0.13.3.5'
PACKAGE_BUGREPORT='bu...@fi...'
***************
*** 788,792 ****
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
! \`configure' configures AxisServer 0.13.3.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
--- 788,792 ----
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
! \`configure' configures AxisSvr 0.13.3.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
***************
*** 850,854 ****
if test -n "$ac_init_help"; then
case $ac_init_help in
! short | recursive ) echo "Configuration of AxisServer 0.13.3.5:";;
esac
cat <<\_ACEOF
--- 850,854 ----
if test -n "$ac_init_help"; then
case $ac_init_help in
! short | recursive ) echo "Configuration of AxisSvr 0.13.3.5:";;
esac
cat <<\_ACEOF
***************
*** 937,941 ****
if $ac_init_version; then
cat <<\_ACEOF
! AxisServer configure 0.13.3.5
generated by GNU Autoconf 2.57
--- 937,941 ----
if $ac_init_version; then
cat <<\_ACEOF
! AxisSvr configure 0.13.3.5
generated by GNU Autoconf 2.57
***************
*** 952,956 ****
running configure, to aid debugging if configure makes a mistake.
! It was created by AxisServer $as_me 0.13.3.5, which was
generated by GNU Autoconf 2.57. Invocation command line was
--- 952,956 ----
running configure, to aid debugging if configure makes a mistake.
! It was created by AxisSvr $as_me 0.13.3.5, which was
generated by GNU Autoconf 2.57. Invocation command line was
***************
*** 1542,1546 ****
# Define the identity of the package.
! PACKAGE=axisserver
VERSION=0.13.3.5
--- 1542,1546 ----
# Define the identity of the package.
! PACKAGE=axissvr
VERSION=0.13.3.5
***************
*** 5925,5929 ****
cat >&5 <<_CSEOF
! This file was extended by AxisServer $as_me 0.13.3.5, which was
generated by GNU Autoconf 2.57. Invocation command line was
--- 5925,5929 ----
cat >&5 <<_CSEOF
! This file was extended by AxisSvr $as_me 0.13.3.5, which was
generated by GNU Autoconf 2.57. Invocation command line was
***************
*** 5983,5987 ****
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
! AxisServer config.status 0.13.3.5
configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--- 5983,5987 ----
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
! AxisSvr config.status 0.13.3.5
configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Index: configure.in
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/configure.in,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -r1.1.4.1 -r1.1.4.2
*** configure.in 30 Aug 2003 16:27:35 -0000 1.1.4.1
--- configure.in 30 Aug 2003 17:02:52 -0000 1.1.4.2
***************
*** 1,5 ****
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
! AC_INIT([AxisServer],[0.13.3.5],[bu...@fi...])
AC_CONFIG_SRCDIR([gwhogsvr.h])
AM_INIT_AUTOMAKE
--- 1,5 ----
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
! AC_INIT([AxisSvr],[0.13.3.5],[bu...@fi...])
AC_CONFIG_SRCDIR([gwhogsvr.h])
AM_INIT_AUTOMAKE
|
|
From: Philip E. <pes...@us...> - 2003-08-30 16:27:41
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv5077
Modified Files:
Tag: v0_13-Stable
Makefile.in aclocal.m4 configure configure.in
Added Files:
Tag: v0_13-Stable
depcomp
Log Message:
Adding depcomp script.
--- NEW FILE: depcomp ---
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
# Copyright 1999, 2000 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Originally written by Alexandre Oliva <ol...@dc...>.
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
# `libtool' can also be set to `yes' or `no'.
if test -z "$depfile"; then
base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
dir=`echo "$object" | sed 's,/.*$,/,'`
if test "$dir" = "$object"; then
dir=
fi
# FIXME: should be _deps on DOS.
depfile="$dir.deps/$base"
fi
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
# here, because this file can only contain one case statement.
if test "$depmode" = hp; then
# HP compiler uses -M and no extra arg.
gccflag=-M
depmode=gcc
fi
if test "$depmode" = dashXmstdout; then
# This is just like dashmstdout with a different argument.
dashmflag=-xM
depmode=dashmstdout
fi
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
"$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
mv "$tmpdepfile" "$depfile"
;;
gcc)
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
## -MM, not -M (despite what the docs say).
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then
gccflag=-MD,
fi
"$@" -Wp,"$gccflag$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
## The second -e expression handles DOS-style file names with drive letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
## This next piece of magic avoids the `deleted header file' problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
tr ' ' '
' < "$tmpdepfile" |
## Some versions of gcc put a space before the `:'. On the theory
## that the space means something, we add a space to the output as
## well.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
hp)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
sgi)
if test "$libtool" = yes; then
"$@" "-Wp,-MDupdate,$tmpdepfile"
else
"$@" -MDupdate "$tmpdepfile"
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
rm -f "$depfile"
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
echo "$object : \\" > "$depfile"
# Clip off the initial element (the dependent). Don't try to be
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
# the IRIX cc adds comments like `#:fec' to the end of the
# dependency line.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr '
' ' ' >> $depfile
echo >> $depfile
# The second pass generates a dummy entry for each header file.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
>> $depfile
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
# "include basename.Plo" scheme.
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. This file always lives in the current directory.
# Also, the AIX compiler puts `$object:' at the start of each line;
# $object doesn't have directory information.
stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
outname="$stripped.o"
if test "$libtool" = yes; then
"$@" -Wc,-M
else
"$@" -M
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
exit $stat
fi
if test -f "$tmpdepfile"; then
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
# "include basename.Plo" scheme.
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
test "x$dir" = "x$object" && dir=
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
tmpdepfile1="$dir.libs/$base.lo.d"
tmpdepfile2="$dir.libs/$base.d"
"$@" -Wc,-MD
else
tmpdepfile1="$dir$base.o.d"
tmpdepfile2="$dir$base.d"
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
if test -f "$tmpdepfile1"; then
tmpdepfile="$tmpdepfile1"
else
tmpdepfile="$tmpdepfile2"
fi
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
# That's a space and a tab in the [].
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile"
;;
#nosideeffect)
# This comment above is used by automake to tell side-effect
# dependency tracking mechanisms from slower ones.
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do
shift
done
shift
fi
# Remove `-o $object'. We will use -o /dev/null later,
# however we can't do the remplacement now because
# `-o $object' might simply not be used
IFS=" "
for arg
do
case $arg in
-o)
shift
;;
$object)
shift
;;
*)
set fnord "$@" "$arg"
shift # fnord
shift # $arg
;;
esac
done
test -z "$dashmflag" && dashmflag=-M
"$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
' < "$tmpdepfile" | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
dashXmstdout)
# This case only exists to satisfy depend.m4. It is never actually
# run, as this mode is specially recognized in the preamble.
exit 1
;;
makedepend)
"$@" || exit $?
# X makedepend
shift
cleared=no
for arg in "$@"; do
case $cleared in
no)
set ""; shift
cleared=yes ;;
esac
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
-*)
;;
*)
set fnord "$@" "$arg"; shift ;;
esac
done
obj_suffix="`echo $object | sed 's/^.*\././'`"
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
sed '1,2d' "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile" "$tmpdepfile".bak
;;
cpp)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do
shift
done
shift
fi
# Remove `-o $object'.
IFS=" "
for arg
do
case $arg in
-o)
shift
;;
$object)
shift
;;
*)
set fnord "$@" "$arg"
shift # fnord
shift # $arg
;;
esac
done
"$@" -E |
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
"$@" || exit $?
IFS=" "
for arg
do
case "$arg" in
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
shift
;;
*)
set fnord "$@" "$arg"
shift
shift
;;
esac
done
"$@" -E |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
none)
exec "$@"
;;
*)
echo "Unknown depmode $depmode" 1>&2
exit 1
;;
esac
exit 0
Index: Makefile.in
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -r1.1 -r1.1.4.1
*** Makefile.in 9 May 2002 22:19:43 -0000 1.1
--- Makefile.in 30 Aug 2003 16:27:34 -0000 1.1.4.1
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.6.3 from Makefile.am.
! # @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 11,15 ****
# PARTICULAR PURPOSE.
!
SHELL = @SHELL@
--- 13,17 ----
# PARTICULAR PURPOSE.
! @SET_MAKE@
SHELL = @SHELL@
***************
*** 32,42 ****
includedir = @includedir@
oldincludedir = /usr/include
-
- DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = .
--- 34,40 ----
***************
*** 46,55 ****
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 44,57 ----
AUTOHEADER = @AUTOHEADER@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,135 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
CC = @CC@
CPP = @CPP@
CXX = @CXX@
! MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
!
bin_PROGRAMS = axissvr
axissvr_SOURCES = gwhogsvr.cpp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_CLEAN_FILES =
! PROGRAMS = $(bin_PROGRAMS)
! DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! axissvr_OBJECTS = gwhogsvr.o
! axissvr_LDADD = $(LDADD)
! axissvr_DEPENDENCIES =
! axissvr_LDFLAGS =
! CXXFLAGS = @CXXFLAGS@
! CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
! CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS acinclude.m4 aclocal.m4 configure configure.in \
! install-sh missing mkinstalldirs
!
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
!
! TAR = tar
! GZIP_ENV = --best
! DEP_FILES = .deps/gwhogsvr.P
SOURCES = $(axissvr_SOURCES)
- OBJECTS = $(axissvr_OBJECTS)
! all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .cpp .o .s
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
!
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
! $(ACLOCAL_M4): configure.in acinclude.m4
! cd $(srcdir) && $(ACLOCAL)
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
! mostlyclean-binPROGRAMS:
!
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
!
! distclean-binPROGRAMS:
!
! maintainer-clean-binPROGRAMS:
!
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
--- 60,146 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
+
+ EXEEXT = @EXEEXT@
+ OBJEXT = @OBJEXT@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ AMTAR = @AMTAR@
+ AWK = @AWK@
CC = @CC@
CPP = @CPP@
CXX = @CXX@
! DEPDIR = @DEPDIR@
! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
PACKAGE = @PACKAGE@
+ STRIP = @STRIP@
VERSION = @VERSION@
! am__include = @am__include@
! am__quote = @am__quote@
! install_sh = @install_sh@
bin_PROGRAMS = axissvr
axissvr_SOURCES = gwhogsvr.cpp
+ subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_CLEAN_FILES =
! bin_PROGRAMS = axissvr$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS)
+ am_axissvr_OBJECTS = gwhogsvr.$(OBJEXT)
+ axissvr_OBJECTS = $(am_axissvr_OBJECTS)
+ axissvr_LDADD = $(LDADD)
+ axissvr_DEPENDENCIES =
+ axissvr_LDFLAGS =
! DEFS = @DEFS@
! DEFAULT_INCLUDES = -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
! depcomp = $(SHELL) $(top_srcdir)/depcomp
! am__depfiles_maybe = depfiles
! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gwhogsvr.Po
! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
! CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
! -o $@
! CXXFLAGS = @CXXFLAGS@
! DIST_SOURCES = $(axissvr_SOURCES)
! DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS aclocal.m4 configure configure.in depcomp \
! install-sh missing mkinstalldirs
SOURCES = $(axissvr_SOURCES)
! all: all-am
!
.SUFFIXES:
! .SUFFIXES: .cpp .o .obj
! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
! configure.lineno
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
! $(ACLOCAL_M4): configure.in
! cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
! binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! ; then \
! f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
***************
*** 137,197 ****
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(bin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
! .s.o:
! $(COMPILE) -c $<
!
! .S.o:
! $(COMPILE) -c $<
mostlyclean-compile:
! -rm -f *.o core *.core
!
! clean-compile:
distclean-compile:
-rm -f *.tab.c
! maintainer-clean-compile:
- axissvr: $(axissvr_OBJECTS) $(axissvr_DEPENDENCIES)
- @rm -f axissvr
- $(CXXLINK) $(axissvr_LDFLAGS) $(axissvr_OBJECTS) $(axissvr_LDADD) $(LIBS)
.cpp.o:
! $(CXXCOMPILE) -c $<
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
! mostlyclean-tags:
! clean-tags:
! distclean-tags:
! -rm -f TAGS ID
! maintainer-clean-tags:
! distdir = $(PACKAGE)-$(VERSION)
! top_distdir = $(distdir)
# This target untars the dist file and tries a VPATH configuration. Then
--- 148,271 ----
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(bin_PROGRAMS)'; for p in $$list; do \
! f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! rm -f $(DESTDIR)$(bindir)/$$f; \
done
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
! axissvr$(EXEEXT): $(axissvr_OBJECTS) $(axissvr_DEPENDENCIES)
! @rm -f axissvr$(EXEEXT)
! $(CXXLINK) $(axissvr_LDFLAGS) $(axissvr_OBJECTS) $(axissvr_LDADD) $(LIBS)
mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwhogsvr.Po@am__quote@
!
! distclean-depend:
! -rm -rf ./$(DEPDIR)
.cpp.o:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
!
! .cpp.obj:
! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! $(CXXCOMPILE) -c -o $@ `cygpath -w $<`
! CXXDEPMODE = @CXXDEPMODE@
! uninstall-info-am:
!
! ETAGS = etags
! ETAGSFLAGS =
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
!
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
! distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = .
! distdir = $(PACKAGE)-$(VERSION)
! am__remove_distdir = \
! { test ! -d $(distdir) \
! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
! && rm -fr $(distdir); }; }
! GZIP_ENV = --best
! distcleancheck_listfiles = find . -type f -print
! distdir: $(DISTFILES)
! $(am__remove_distdir)
! mkdir $(distdir)
! @list='$(DISTFILES)'; for file in $$list; do \
! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! dir="/$$dir"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
! if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
! else \
! test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
! fi; \
! done
! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! || chmod -R a+r $(distdir)
! dist-gzip: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
!
! dist dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
***************
*** 199,209 ****
# tarfile.
distcheck: dist
! -rm -rf $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
! dc_install_base=`cd $(distdir)/=inst && pwd`; \
! cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
--- 273,286 ----
# tarfile.
distcheck: dist
! $(am__remove_distdir)
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
! chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
! chmod a-w $(distdir)
! dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
! && cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
***************
*** 211,326 ****
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) dist
! -rm -rf $(distdir)
! @banner="$(distdir).tar.gz is ready for distribution"; \
! dashes=`echo "$$banner" | sed s/./=/g`; \
! echo "$$dashes"; \
! echo "$$banner"; \
! echo "$$dashes"
! dist: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! dist-all: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! distdir: $(DISTFILES)
! -rm -rf $(distdir)
! mkdir $(distdir)
! -chmod 777 $(distdir)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
! if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
! else \
! test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
! fi; \
! done
!
! DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
!
! -include $(DEP_FILES)
!
! mostlyclean-depend:
!
! clean-depend:
!
! distclean-depend:
! -rm -rf .deps
!
! maintainer-clean-depend:
!
! %.o: %.c
! @echo '$(COMPILE) -c $<'; \
! $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-cp .deps/$(*F).pp .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm .deps/$(*F).pp
!
! %.lo: %.c
! @echo '$(LTCOMPILE) -c $<'; \
! $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
! < .deps/$(*F).pp > .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm -f .deps/$(*F).pp
!
! %.o: %.cpp
! @echo '$(CXXCOMPILE) -c $<'; \
! $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-cp .deps/$(*F).pp .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm .deps/$(*F).pp
!
! %.lo: %.cpp
! @echo '$(LTCXXCOMPILE) -c $<'; \
! $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
! < .deps/$(*F).pp > .deps/$(*F).P; \
! tr ' ' '\012' < .deps/$(*F).pp \
! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
! >> .deps/$(*F).P; \
! rm -f .deps/$(*F).pp
! info-am:
! info: info-am
! dvi-am:
! dvi: dvi-am
check-am: all-am
check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-binPROGRAMS
! install-exec: install-exec-am
! install-data-am:
! install-data: install-data-am
- install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
! uninstall-am: uninstall-binPROGRAMS
uninstall: uninstall-am
- all-am: Makefile $(PROGRAMS)
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
mostlyclean-generic:
--- 288,332 ----
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) uninstall \
! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
! || { echo "ERROR: files left after uninstall:" ; \
! find $$dc_install_base -type f -print ; \
! exit 1; } >&2 ) \
! && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
! && rm -f $(distdir).tar.gz \
! && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
! $(am__remove_distdir)
! @echo "$(distdir).tar.gz is ready for distribution" | \
! sed 'h;s/./=/g;p;x;p;x'
! distcleancheck: distclean
! if test '$(srcdir)' = . ; then \
! echo "ERROR: distcleancheck can only run from a VPATH build" ; \
! exit 1 ; \
! fi
! test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! || { echo "ERROR: files left after distclean:" ; \
! $(distcleancheck_listfiles) ; \
! exit 1; } >&2
check-am: all-am
check: check-am
! all-am: Makefile $(PROGRAMS)
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(bindir)
install: install-am
! install-exec: install-exec-am
! install-data: install-data-am
uninstall: uninstall-am
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 329,373 ****
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
! mostlyclean-tags mostlyclean-depend mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
! clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
! distclean-depend distclean-generic clean-am
! distclean: distclean-am
! -rm -f config.status
! maintainer-clean-am: maintainer-clean-binPROGRAMS \
! maintainer-clean-compile maintainer-clean-tags \
! maintainer-clean-depend maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! -rm -f config.status
! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
! mostlyclean-compile distclean-compile clean-compile \
! maintainer-clean-compile tags mostlyclean-tags distclean-tags \
! clean-tags maintainer-clean-tags distdir mostlyclean-depend \
! distclean-depend clean-depend maintainer-clean-depend info-am info \
! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
! install-exec install-data-am install-data install-am install \
! uninstall-am uninstall all-redirect all-am all installdirs \
! mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 335,391 ----
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
! distclean: distclean-am
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! distclean-am: clean-am distclean-compile distclean-depend \
! distclean-generic distclean-tags
! dvi: dvi-am
! dvi-am:
! info: info-am
! info-am:
!
! install-data-am:
!
! install-exec-am: install-binPROGRAMS
!
! install-info: install-info-am
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-am
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf autom4te.cache
! maintainer-clean-am: distclean-am maintainer-clean-generic
!
! mostlyclean: mostlyclean-am
!
! mostlyclean-am: mostlyclean-compile mostlyclean-generic
! uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+ .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic dist dist-all dist-gzip distcheck distclean \
+ distclean-compile distclean-depend distclean-generic \
+ distclean-tags distcleancheck distdir dvi dvi-am info info-am \
+ install install-am install-binPROGRAMS install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic tags uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/aclocal.m4,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -r1.1 -r1.1.4.1
*** aclocal.m4 9 May 2002 22:19:43 -0000 1.1
--- aclocal.m4 30 Aug 2003 16:27:34 -0000 1.1.4.1
***************
*** 1,94 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p5
!
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
!
! dnl aclocal.m4 generated automatically by aclocal 1.4
!
! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
!
! dnl aclocal.m4 generated automatically by aclocal 1.4
!
! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
!
! dnl aclocal.m4 generated automatically by aclocal 1.4-p5
!
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
!
! dnl aclocal.m4 generated automatically by aclocal 1.4-p5
!
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
!
! # Do all the work for Automake. This macro actually does too much --
! # some checks are only needed if your package does certain things.
! # But this isn't really a big deal.
!
! # serial 1
!
! dnl Usage:
! dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN([AM_INIT_AUTOMAKE],
! [AC_REQUIRE([AC_PROG_INSTALL])
! PACKAGE=[$1]
! AC_SUBST(PACKAGE)
! VERSION=[$2]
! AC_SUBST(VERSION)
! dnl test to see if srcdir already configured
! if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
! ifelse([$3],,
! AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
! AC_REQUIRE([AM_SANITY_CHECK])
! AC_REQUIRE([AC_ARG_PROGRAM])
! dnl FIXME This is truly gross.
! missing_dir=`cd $ac_aux_dir && pwd`
! AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
! AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
! AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
! AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
! AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
! AC_REQUIRE([AC_PROG_MAKE_SET])])
#
--- 1,187 ----
! # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+ # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
+ # Do all the work for Automake. -*- Autoconf -*-
+
+ # This macro actually does too much some checks are only needed if
+ # your package does certain things. But this isn't really a big deal.
+
+ # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2, or (at your option)
+ # any later version.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+
+ # serial 8
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+ # will think it sees a *use*, and therefore will trigger all it's
+ # C support machinery. Also note that it means that autoscan, seeing
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+ AC_PREREQ([2.52])
+
+ # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+ # the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+ # -----------------------------------------------
+ # The call with PACKAGE and VERSION arguments is the old style
+ # call (pre autoconf-2.50), which is being phased out. PACKAGE
+ # and VERSION should now be passed to AC_INIT and removed from
+ # the call to AM_INIT_AUTOMAKE.
+ # We support both call styles for the transition. After
+ # the next Automake release, Autoconf can make the AC_INIT
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
! [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
! AC_REQUIRE([AC_PROG_INSTALL])dnl
! # test to see if srcdir already configured
! if test "`cd $srcdir && pwd`" != "`pwd`" &&
! test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
!
! # Define the identity of the package.
! dnl Distinguish between old-style and new-style calls.
! m4_ifval([$2],
! [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
! AC_SUBST([PACKAGE], [$1])dnl
! AC_SUBST([VERSION], [$2])],
! [_AM_SET_OPTIONS([$1])dnl
! AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
! AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
!
! _AM_IF_OPTION([no-define],,
! [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
!
! # Some tools Automake needs.
! AC_REQUIRE([AM_SANITY_CHECK])dnl
! AC_REQUIRE([AC_ARG_PROGRAM])dnl
! AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
! AM_MISSING_PROG(AUTOCONF, autoconf)
! AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
! AM_MISSING_PROG(AUTOHEADER, autoheader)
! AM_MISSING_PROG(MAKEINFO, makeinfo)
! AM_MISSING_PROG(AMTAR, tar)
! AM_PROG_INSTALL_SH
! AM_PROG_INSTALL_STRIP
! # We need awk for the "check" target. The system "awk" is bad on
! # some platforms.
! AC_REQUIRE([AC_PROG_AWK])dnl
! AC_REQUIRE([AC_PROG_MAKE_SET])dnl
!
! _AM_IF_OPTION([no-dependencies],,
! [AC_PROVIDE_IFELSE([AC_PROG_][CC],
! [_AM_DEPENDENCIES(CC)],
! [define([AC_PROG_][CC],
! defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
! AC_PROVIDE_IFELSE([AC_PROG_][CXX],
! [_AM_DEPENDENCIES(CXX)],
! [define([AC_PROG_][CXX],
! defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
! ])
! ])
!
! # Copyright 2002 Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
!
! # AM_AUTOMAKE_VERSION(VERSION)
! # ----------------------------
! # Automake X.Y traces this macro to ensure aclocal.m4 has been
! # generated from the m4 files accompanying Automake X.Y.
! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
!
! # AM_SET_CURRENT_AUTOMAKE_VERSION
! # -------------------------------
! # Call AM_AUTOMAKE_VERSION so it can be traced.
! # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
! AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! [AM_AUTOMAKE_VERSION([1.6.3])])
!
! # Helper functions for option handling. -*- Autoconf -*-
!
! # Copyright 2001, 2002 Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
!
! # serial 2
!
! # _AM_MANGLE_OPTION(NAME)
! # -----------------------
! AC_DEFUN([_AM_MANGLE_OPTION],
! [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
!
! # _AM_SET_OPTION(NAME)
! # ------------------------------
! # Set option NAME. Presently that only means defining a flag for this option.
! AC_DEFUN([_AM_SET_OPTION],
! [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
!
! # _AM_SET_OPTIONS(OPTIONS)
! # ----------------------------------
! # OPTIONS is a space-separated list of Automake options.
! AC_DEFUN([_AM_SET_OPTIONS],
! [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
!
! # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
! # -------------------------------------------
! # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
! AC_DEFUN([_AM_IF_OPTION],
! [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
#
***************
*** 96,104 ****
#
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
! echo timestamp > conftestfile
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
--- 189,218 ----
#
+ # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2, or (at your option)
+ # any later version.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+
+ # serial 3
+
+ # AM_SANITY_CHECK
+ # ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
! echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
***************
*** 107,117 ****
# directory).
if (
! set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
! if test "[$]*" = "X"; then
# -L didn't work.
! set X `ls -t $srcdir/configure conftestfile`
fi
! if test "[$]*" != "X $srcdir/configure conftestfile" \
! && test "[$]*" != "X conftestfile $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
--- 221,232 ----
# directory).
if (
! set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
! if test "$[*]" = "X"; then
# -L didn't work.
! set X `ls -t $srcdir/configure conftest.file`
fi
! rm -f conftest.file
! if test "$[*]" != "X $srcdir/configure conftest.file" \
! && test "$[*]" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
***************
*** 123,127 ****
fi
! test "[$]2" = conftestfile
)
then
--- 238,242 ----
fi
! test "$[2]" = conftest.file
)
then
***************
*** 132,156 ****
Check your system clock])
fi
- rm -f conftest*
AC_MSG_RESULT(yes)])
! dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
! dnl The program must properly implement --version.
AC_DEFUN([AM_MISSING_PROG],
! [AC_MSG_CHECKING(for working $2)
! # Run test in a subshell; some versions of sh will print an error if
! # an executable is not found, even if stderr is redirected.
! # Redirect stdin to placate older versions of autoconf. Sigh.
! if ($2 --version) < /dev/null > /dev/null 2>&1; then
! $1=$2
! AC_MSG_RESULT(found)
else
! $1="$3/missing $2"
! AC_MSG_RESULT(missing)
fi
! AC_SUBST($1)])
--- 247,758 ----
Check your system clock])
fi
AC_MSG_RESULT(yes)])
! # -*- Autoconf -*-
!
!
! # Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
!
! # serial 3
!
! # AM_MISSING_PROG(NAME, PROGRAM)
! # ------------------------------
AC_DEFUN([AM_MISSING_PROG],
! [AC_REQUIRE([AM_MISSING_HAS_RUN])
! $1=${$1-"${am_missing_run}$2"}
! AC_SUBST($1)])
!
!
! # AM_MISSING_HAS_RUN
! # ------------------
! # Define MISSING if not defined so far and test if it supports --run.
! # If it does, set am_missing_run to use it, otherwise, to nothing.
! AC_DEFUN([AM_MISSING_HAS_RUN],
! [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
! test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
! # Use eval to expand $SHELL
! if eval "$MISSING --run true"; then
! am_missing_run="$MISSING --run "
else
! am_missing_run=
! AC_MSG_WARN([`missing' script is too old or missing])
fi
! ])
!
! # AM_AUX_DIR_EXPAND
!
! # Copyright 2001 Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
!
! # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
! # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
! # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
! #
! # Of course, Automake must honor this variable whenever it calls a
! # tool from the auxiliary directory. The problem is that $srcdir (and
! # therefore $ac_aux_dir as well) can be either absolute or relative,
! # depending on how configure is run. This is pretty annoying, since
! # it makes $ac_aux_dir quite unusable in subdirectories: in the top
! # source directory, any form will work fine, but in subdirectories a
! # relative path needs to be adjusted first.
! #
! # $ac_aux_dir/missing
! # fails when called from a subdirectory if $ac_aux_dir is relative
! # $top_srcdir/$ac_aux_dir/missing
! # fails if $ac_aux_dir is absolute,
! # fails when called from a subdirectory in a VPATH build with
! # a relative $ac_aux_dir
! #
! # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
! # are both prefixed by $srcdir. In an in-source build this is usually
! # harmless because $srcdir is `.', but things will broke when you
! # start a VPATH build or use an absolute $srcdir.
! #
! # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
! # iff we strip the leading $srcdir from $ac_aux_dir. That would be:
! # am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
! # and then we would define $MISSING as
! # MISSING="\${SHELL} $am_aux_dir/missing"
! # This will work as long as MISSING is not called from configure, because
! # unfortunately $(top_srcdir) has no meaning in configure.
! # However there are other variables, like CC, which are often used in
! # configure, and could therefore not use this "fixed" $ac_aux_dir.
! #
! # Another solution, used here, is to always expand $ac_aux_dir to an
! # absolute PATH. The drawback is that using absolute paths prevent a
! # configured tree to be moved without reconfiguration.
!
! # Rely on autoconf to set up CDPATH properly.
! AC_PREREQ([2.50])
!
! AC_DEFUN([AM_AUX_DIR_EXPAND], [
! # expand $ac_aux_dir to an absolute path
! am_aux_dir=`cd $ac_aux_dir && pwd`
! ])
!
! # AM_PROG_INSTALL_SH
! # ------------------
! # Define $install_sh.
!
! # Copyright 2001 Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
!
! AC_DEFUN([AM_PROG_INSTALL_SH],
! [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
! install_sh=${install_sh-"$am_aux_dir/install-sh"}
! AC_SUBST(install_sh)])
!
! # AM_PROG_INSTALL_STRIP
!
! # Copyright 2001 Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
!
! # One issue with vendor `install' (even GNU) is that you can't
! # specify the program used to strip binaries. This is especially
! # annoying in cross-compiling environments, where the build's strip
! # is unlikely to handle the host's binaries.
! # Fortunately install-sh will honor a STRIPPROG variable, so we
! # always use install-sh in `make install-strip', and initialize
! # STRIPPROG with the value of the STRIP variable (set by the user).
! AC_DEFUN([AM_PROG_INSTALL_STRIP],
! [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
! # Installed binaries are usually stripped using `strip' when the user
! # run `make install-strip'. However `strip' might not be the right
! # tool to use in cross-compilation environments, therefore Automake
! # will honor the `STRIP' environment variable to overrule this program.
! dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
! if test "$cross_compiling" != no; then
! AC_CHECK_TOOL([STRIP], [strip], :)
! fi
! INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
! AC_SUBST([INSTALL_STRIP_PROGRAM])])
!
! # serial 4 -*- Autoconf -*-
!
! # Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+ # will think it sees a *use*, and therefore will trigger all it's
+ # C support machinery. Also note that it means that autoscan, seeing
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+ # _AM_DEPENDENCIES(NAME)
+ # ----------------------
+ # See how the compiler implements dependency checking.
+ # NAME is "CC", "CXX", "GCJ", or "OBJC".
+ # We try a few techniques and use that to set a single cache variable.
+ #
+ # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+ # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+ # dependency, and given that the user is not expected to run this macro,
+ # just rely on AC_PROG_CC.
+ AC_DEFUN([_AM_DEPENDENCIES],
+ [AC_REQUIRE([AM_SET_DEPDIR])dnl
+ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+ AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+ AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+ AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+ [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+
+ ...
[truncated message content] |
|
From: Philip E. <pes...@us...> - 2003-08-29 05:55:14
|
Update of /cvsroot/sphere-axis/Axis
In directory sc8-pr-cvs1:/tmp/cvs-serv5918
Modified Files:
Tag: v0_13-Stable
AdditionalSettingsDlg.cpp launchertab.cpp RemoteConsoleDlg.cpp
ScriptEditDlg.cpp StaticToolDlg.cpp
Log Message:
Fixes to the CFileDialog constructor calls to support Win9x.
Index: AdditionalSettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/AdditionalSettingsDlg.cpp,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** AdditionalSettingsDlg.cpp 9 Feb 2003 18:21:04 -0000 1.9
--- AdditionalSettingsDlg.cpp 29 Aug 2003 05:55:03 -0000 1.9.2.1
***************
*** 457,461 ****
void CAdditionalSettingsDlg::OnAsMulbrowse()
{
! CFileDialog dlg(TRUE, "exe", "map0.mul", 0, "Ultima Online client files (*.mul)|*.mul|All files (*.*)|*.*||");
if ( dlg.DoModal() == IDOK )
{
--- 457,461 ----
void CAdditionalSettingsDlg::OnAsMulbrowse()
{
! CFileDialog dlg(TRUE, "exe", "map0.mul", 0, "Ultima Online client files (*.mul)|*.mul|All files (*.*)|*.*||", NULL, 0);
if ( dlg.DoModal() == IDOK )
{
***************
*** 469,473 ****
void CAdditionalSettingsDlg::OnAsClientbrowse()
{
! CFileDialog dlg(TRUE, "exe", "client.exe", 0, "Application files (*.exe)|*.exe|All files (*.*)|*.*||");
if ( dlg.DoModal() == IDOK )
{
--- 469,473 ----
void CAdditionalSettingsDlg::OnAsClientbrowse()
{
! CFileDialog dlg(TRUE, "exe", "client.exe", 0, "Application files (*.exe)|*.exe|All files (*.*)|*.*||", NULL, 0);
if ( dlg.DoModal() == IDOK )
{
***************
*** 641,645 ****
csFile = csPath;
// Pop up a file dialog to select the custom mul
! CFileDialog dlg(TRUE, "mul", csFile, 0, "Ultima Online Client files (*.mul; *.idx)|*.mul;*.idx|All Files (*.*)|*.*||");
if ( dlg.DoModal() == IDOK )
{
--- 641,645 ----
csFile = csPath;
// Pop up a file dialog to select the custom mul
! CFileDialog dlg(TRUE, "mul", csFile, 0, "Ultima Online Client files (*.mul; *.idx)|*.mul;*.idx|All Files (*.*)|*.*||", NULL, 0);
if ( dlg.DoModal() == IDOK )
{
Index: launchertab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/launchertab.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** launchertab.cpp 9 Feb 2003 18:21:09 -0000 1.7
--- launchertab.cpp 29 Aug 2003 05:55:03 -0000 1.7.2.1
***************
*** 780,784 ****
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, NULL, NULL, 0, "Executable Files (*.exe)|*.exe||");
if (dlg.DoModal() == IDOK)
this->m_ceClient.SetWindowText(dlg.GetPathName());
--- 780,784 ----
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, NULL, NULL, 0, "Executable Files (*.exe)|*.exe||", NULL, 0);
if (dlg.DoModal() == IDOK)
this->m_ceClient.SetWindowText(dlg.GetPathName());
***************
*** 793,797 ****
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, NULL, csUOExe, 0, "Executable Files (*.exe)|*.exe||");
if ( dlg.DoModal() == IDOK )
--- 793,797 ----
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, NULL, csUOExe, 0, "Executable Files (*.exe)|*.exe||", NULL, 0);
if ( dlg.DoModal() == IDOK )
Index: RemoteConsoleDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/RemoteConsoleDlg.cpp,v
retrieving revision 1.13.4.1
retrieving revision 1.13.4.2
diff -C2 -r1.13.4.1 -r1.13.4.2
*** RemoteConsoleDlg.cpp 14 Aug 2003 02:20:18 -0000 1.13.4.1
--- RemoteConsoleDlg.cpp 29 Aug 2003 05:55:03 -0000 1.13.4.2
***************
*** 502,506 ****
{
// Find out which file to log to
! CFileDialog dlg(FALSE, ".log", NULL, OFN_HIDEREADONLY, "Log Files (*.log)|*.log||" , NULL);
if ( dlg.DoModal() == IDOK )
m_csLogFile = dlg.GetFileName();
--- 502,506 ----
{
// Find out which file to log to
! CFileDialog dlg(FALSE, ".log", NULL, OFN_HIDEREADONLY, "Log Files (*.log)|*.log||" , NULL, 0);
if ( dlg.DoModal() == IDOK )
m_csLogFile = dlg.GetFileName();
Index: ScriptEditDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/ScriptEditDlg.cpp,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -C2 -r1.6 -r1.6.4.1
*** ScriptEditDlg.cpp 14 May 2002 20:03:35 -0000 1.6
--- ScriptEditDlg.cpp 29 Aug 2003 05:55:03 -0000 1.6.4.1
***************
*** 119,123 ****
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, NULL, NULL, 0, "Sphere Files (*.scp;*.ini)|*.scp; *.ini|Log Files (*.log)|*.log||");
if ( dlg.DoModal() == IDOK)
{
--- 119,123 ----
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, NULL, NULL, 0, "Sphere Files (*.scp;*.ini)|*.scp; *.ini|Log Files (*.log)|*.log||", NULL, 0);
if ( dlg.DoModal() == IDOK)
{
Index: StaticToolDlg.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/StaticToolDlg.cpp,v
retrieving revision 1.34.2.3
retrieving revision 1.34.2.4
diff -C2 -r1.34.2.3 -r1.34.2.4
*** StaticToolDlg.cpp 18 Aug 2003 01:21:42 -0000 1.34.2.3
--- StaticToolDlg.cpp 29 Aug 2003 05:55:03 -0000 1.34.2.4
***************
*** 371,375 ****
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, ".pat", NULL, 0, "Patch Files (*.pat)|*.pat||", NULL);
if ( dlg.DoModal() == IDOK )
{
--- 371,375 ----
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, ".pat", NULL, 0, "Patch Files (*.pat)|*.pat||", NULL, 0);
if ( dlg.DoModal() == IDOK )
{
***************
*** 422,426 ****
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(FALSE, ".pat", NULL, OFN_OVERWRITEPROMPT, "Patch Files (*.pat)|*.pat||", NULL);
if ( dlg.DoModal() == IDOK )
{
--- 422,426 ----
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(FALSE, ".pat", NULL, OFN_OVERWRITEPROMPT, "Patch Files (*.pat)|*.pat||", NULL, 0);
if ( dlg.DoModal() == IDOK )
{
***************
*** 489,493 ****
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, NULL, NULL, 0, "Script Files (*.scp)|*.scp||");
if ( dlg.DoModal() == IDOK )
m_csWorldFile = dlg.GetPathName();
--- 489,493 ----
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(TRUE, NULL, NULL, 0, "Script Files (*.scp)|*.scp||", 0);
if ( dlg.DoModal() == IDOK )
m_csWorldFile = dlg.GetPathName();
***************
*** 2208,2212 ****
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(FALSE, NULL, NULL, 0, "Script Files (*.scp)|*.scp||");
if ( dlg.DoModal() == IDOK )
csImportFile = dlg.GetPathName();
--- 2208,2212 ----
memset(&szCwd[0], 0x00, sizeof(szCwd));
getcwd(szCwd, sizeof(szCwd));
! CFileDialog dlg(FALSE, NULL, NULL, 0, "Script Files (*.scp)|*.scp||", NULL, 0);
if ( dlg.DoModal() == IDOK )
csImportFile = dlg.GetPathName();
|
|
From: Philip E. <pes...@us...> - 2003-08-26 06:24:17
|
Update of /cvsroot/sphere-axis/UOMap/Hlp In directory sc8-pr-cvs1:/tmp/cvs-serv11625/UOMap/Hlp Removed Files: UOMap.hm Log Message: no message --- UOMap.hm DELETED --- |
|
From: Philip E. <pes...@us...> - 2003-08-22 11:56:38
|
Update of /cvsroot/sphere-axis/Axis
In directory sc8-pr-cvs1:/tmp/cvs-serv17047
Modified Files:
Tag: v0_13-Stable
axis.nsi
Log Message:
Updated the install script to include the MSVC 7.0 dlls.
Index: axis.nsi
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/axis.nsi,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** axis.nsi 17 Nov 2002 04:25:27 -0000 1.4
--- axis.nsi 22 Aug 2003 04:01:51 -0000 1.4.4.1
***************
*** 25,30 ****
Section "" ; (default section)
SetOutPath "$INSTDIR"
! ; add files / whatever that need to be installed here.
File /r install\*.*
IfFileExists "$SYSDIR\UOMap.ocx" +1 +3
UnregDLL "$SYSDIR\UOMap.ocx"
--- 25,31 ----
Section "" ; (default section)
SetOutPath "$INSTDIR"
! ; Install Axis files
File /r install\*.*
+ ; Make sure the ocx files aren't in the system directory
IfFileExists "$SYSDIR\UOMap.ocx" +1 +3
UnregDLL "$SYSDIR\UOMap.ocx"
***************
*** 35,38 ****
--- 36,62 ----
RegDLL "$INSTDIR\UOMap.ocx"
RegDLL "$INSTDIR\UOArt.ocx"
+ ; install the msvcr70 dll if necessary
+ SetOutPath $SYSDIR
+ GetFiletimeLocal "d:\winnt\system32\msvcr70.dll" $0 $1
+ IfFileExists "$SYSDIR\msvcr70.dll" +1 +4
+ GetFiletime "$SYSDIR\msvcr70.dll" $2 $3
+ IntCmp $2 $0 +1 +2 +3
+ IntCmp $3 $1 +2 +1 +2
+ File "d:\winnt\system32\msvcr70.dll"
+ ; install the mfc70 dll if necessary
+ GetFiletimeLocal "d:\winnt\system32\mfc70.dll" $0 $1
+ IfFileExists "$SYSDIR\mfc70.dll" +1 +4
+ GetFiletime "$SYSDIR\mfc70.dll" $2 $3
+ IntCmp $2 $0 +1 +2 +3
+ IntCmp $3 $1 +2 +1 +2
+ File "d:\winnt\system32\mfc70.dll"
+ ; install the msvcp70.dll if necessary
+ GetFiletimeLocal "d:\winnt\system32\msvcp70.dll" $0 $1
+ IfFileExists "$SYSDIR\msvcp70.dll" +1 +4
+ GetFiletime "$SYSDIR\msvcp70.dll" $2 $3
+ IntCmp $2 $0 +1 +2 +3
+ IntCmp $3 $1 +2 +1 +2
+ File "d:\winnt\system32\msvcp70.dll"
+
;WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Menasoft\GM Tools" "" "$INSTDIR"
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Axis" "DisplayName" "Axis (remove only)"
***************
*** 66,69 ****
--- 90,94 ----
DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Axis"
; RMDir "$INSTDIR"
+ ; Don't uninstall the system files, because we have no idea what else is using them.
SectionEnd ; end of uninstall section
|
|
From: Philip E. <pes...@us...> - 2003-08-22 04:39:09
|
Update of /cvsroot/sphere-axis/axissvr In directory sc8-pr-cvs1:/tmp/cvs-serv21471 Modified Files: Makefile.in README Log Message: Index: Makefile.in =================================================================== RCS file: /cvsroot/sphere-axis/axissvr/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Makefile.in 7 Aug 2003 18:16:42 -0000 1.4 --- Makefile.in 22 Aug 2003 04:39:02 -0000 1.5 *************** *** 111,114 **** --- 111,120 ---- CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(axissvr_SOURCES) + EXTRA_DIST = AxisServer.cpp ConfigDlg.cpp DatabaseSelectDlg.cpp DBConfigDlg.cpp \ + FontPreviewCombo.cpp FontSelectionDlg.cpp HostmaskDlg.cpp MainFrm.cpp \ + ntservice.cpp UserDlg.cpp AxisServer.h ConfigDlg.h DatabaseSelectDlg.h \ + DBConfigDlg.h FontPreviewCombo.h FontSelectionDlg.h HostmaskDlg.h \ + MainFrm.h ntservice.h resource.h UserDlg.h res/AxisServer.ico \ + res/AxisServer.rc2 res/Font_tru.bmp AxisServer.dsp DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ Makefile.in NEWS acinclude.m4 aclocal.m4 configure configure.in \ *************** *** 162,166 **** axissvr$(EXEEXT): $(axissvr_OBJECTS) $(axissvr_DEPENDENCIES) @rm -f axissvr$(EXEEXT) ! $(CXXLINK) $(axissvr_LDFLAGS) $(axissvr_OBJECTS) $(axissvr_LDADD) $(LIBS) mostlyclean-compile: --- 168,173 ---- axissvr$(EXEEXT): $(axissvr_OBJECTS) $(axissvr_DEPENDENCIES) @rm -f axissvr$(EXEEXT) ! @echo " Linking $(bin_PROGRAMS)" ! @$(CXXLINK) $(axissvr_LDFLAGS) $(axissvr_OBJECTS) $(axissvr_LDADD) $(LIBS) mostlyclean-compile: *************** *** 180,184 **** .cpp.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --- 187,192 ---- .cpp.o: ! @echo " Compiling $<" ! @AMDEP_TRUE@ @source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ *************** *** 186,190 **** .cpp.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --- 194,199 ---- .cpp.obj: ! @echo " Compiling $<" ! @AMDEP_TRUE@ @source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ *************** *** 244,247 **** --- 253,257 ---- $(am__remove_distdir) mkdir $(distdir) + mkdir $(distdir)/res @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ *************** *** 270,278 **** || chmod -R a+r $(distdir) dist-gzip: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) --- 280,288 ---- || chmod -R a+r $(distdir) dist-gzip: distdir ! tar chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist dist-all: distdir ! tar chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) Index: README =================================================================== RCS file: /cvsroot/sphere-axis/axissvr/README,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** README 9 May 2002 22:19:43 -0000 1.1 --- README 22 Aug 2003 04:39:02 -0000 1.2 *************** *** 1,5 **** ! Axis Server is a program that allows your remeote GMs to retrieve the most recent script files for your Sphere server, and also provides them with information about spawnpoints in your worldfile. For more information, visit http://sphere-axis.sourceforge.net --- 1,71 ---- ! AxisServer is a program that allows your remeote GMs to retrieve the most recent script files for your Sphere server, and also provides them with information about spawnpoints in your worldfile. For more information, visit http://sphere-axis.sourceforge.net + + ========================= + = SOFTWARE REQUIREMENTS = + ========================= + + AxisServer makes use of a number of libraries that are not part of the standard + installation of Linux. In order for AxisServer to compile and work correctly, these + libraries must be present on your system. + + pthreads -- libpthread is the posix thread library used for multithreading applications. + This library should be present on most linux operating systems, as it is a very common + threading model. + + Libxml2 -- This is the XML C parser and toolkit developed for the Gnome project. It + can be obtained from http://xmlsoft.org. + + libiodbc -- This is the platform independent ODBC engine. It allows applications to + make use of databases independent of the back-end database engine. It can be obtained + from http://www.iodbc.org. + + Crypto++ -- This is a free C++ library for cryptography, including one-way hash + functions, such as md5. It can be obtained from + http://sourceforge.net/projects/cryptopp. + + If these libraries are not installed on your system, the configure script may fail, and + AxisServer will not build. You will need to install these libraries first. + + ========================= + = BUILDING INSTRUCTIONS = + ========================= + + In order to build the application, you will need a C++ compiler. Most likely, one is + already installed. + + The first step is to run the configure script. This is done by executing the following: + ./configure + + If all goes well, no errors will occur, and a Makefile will be created. + + From there, running 'make' will build the axissvr executable. + + ============================= + = INSTALLATION INSTRUCTIONS = + ============================= + + There is no automated install script for AxisServer. Instead, you must manually copy + the axissvr binary to the base directory of your Sphere server. AxisServer expects to + read the sphere.ini file in the directory it is running from. + + If you have a copy of axissvr.cfg from a previous version of AxisServer, it will be + read, but all configuration data from that point on will reside in the axissvr.xml file. + + ==================== + = USING A DATABASE = + ==================== + + If you wish to use a database for added security in AxisServer, you can specify + this in the axissvr.xml file. Simply change the "UseDatabase" value to 'true', + and set the ODBC parameters accordingly. + + At the moment, there is no easy way to configure the database from Axis Server + in Linux. This should be added in time for the official 0.14 release of Axis + Server. + + + |
|
From: Philip E. <pes...@us...> - 2003-08-22 04:36:41
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv21259
Modified Files:
gwhogsvr.h
Log Message:
Updated version number.
Index: gwhogsvr.h
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/gwhogsvr.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** gwhogsvr.h 4 Aug 2003 23:20:54 -0000 1.10
--- gwhogsvr.h 22 Aug 2003 04:36:37 -0000 1.11
***************
*** 49,53 ****
#include <stdio.h>
! #define SVR_VERSION _T("0.14.0.0 alpha")
#ifdef WIN32
#define SVR_PLATFORM _T("Win32")
--- 49,53 ----
#include <stdio.h>
! #define SVR_VERSION _T("0.14.0.0 RC1")
#ifdef WIN32
#define SVR_PLATFORM _T("Win32")
|
|
From: Philip E. <pes...@us...> - 2003-08-22 04:11:32
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv18574
Removed Files:
Tag: v0_13-Stable
messages.h messages.rc
Log Message:
These files are created by the build process and are not needed in CVS.
--- messages.h DELETED ---
--- messages.rc DELETED ---
|
|
From: Philip E. <pes...@us...> - 2003-08-22 04:05:29
|
Update of /cvsroot/sphere-axis/UOArt
In directory sc8-pr-cvs1:/tmp/cvs-serv17661
Modified Files:
Tag: v1_3-Stable
UOArt.rc
Log Message:
Updated the version number.
Index: UOArt.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOArt/UOArt.rc,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -r1.16.2.1 -r1.16.2.2
*** UOArt.rc 29 May 2003 21:34:57 -0000 1.16.2.1
--- UOArt.rc 22 Aug 2003 04:05:26 -0000 1.16.2.2
***************
*** 54,59 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,3,1,0
! PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 54,59 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,3,2,0
! PRODUCTVERSION 1,3,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 71,80 ****
BEGIN
VALUE "FileDescription", "UOArt ActiveX Control Module"
! VALUE "FileVersion", "1, 3, 0, 0"
VALUE "InternalName", "UOArt"
VALUE "LegalCopyright", "Copyright (C) 2000-2003"
VALUE "OriginalFilename", "UOArt.OCX"
VALUE "ProductName", "UOArt ActiveX Control Module"
! VALUE "ProductVersion", "1, 3, 0, 0"
END
END
--- 71,80 ----
BEGIN
VALUE "FileDescription", "UOArt ActiveX Control Module"
! VALUE "FileVersion", "1, 3, 2, 0"
VALUE "InternalName", "UOArt"
VALUE "LegalCopyright", "Copyright (C) 2000-2003"
VALUE "OriginalFilename", "UOArt.OCX"
VALUE "ProductName", "UOArt ActiveX Control Module"
! VALUE "ProductVersion", "1, 3, 2, 0"
END
END
|
|
From: Philip E. <pes...@us...> - 2003-08-22 04:05:08
|
Update of /cvsroot/sphere-axis/axissvr
In directory sc8-pr-cvs1:/tmp/cvs-serv17569
Modified Files:
Tag: v0_13-Stable
gwhogsvr.cpp
Log Message:
Updated version number. Also included bug fixes from herby, and a patch for
a security exploit.
Index: gwhogsvr.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/axissvr/gwhogsvr.cpp,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -C2 -r1.27.2.1 -r1.27.2.2
*** gwhogsvr.cpp 3 Jun 2003 03:38:56 -0000 1.27.2.1
--- gwhogsvr.cpp 22 Aug 2003 04:05:03 -0000 1.27.2.2
***************
*** 44,48 ****
#endif
! #define SVR_VERSION "0.13.3.3"
#ifdef WIN32
#define SVR_PLATFORM "Win32"
--- 44,48 ----
#endif
! #define SVR_VERSION "0.13.3.5"
#ifdef WIN32
#define SVR_PLATFORM "Win32"
***************
*** 446,449 ****
--- 446,461 ----
#endif
}
+ if ( nBytes >= MAX_PATH )
+ {
+ shutdown(pThread->sock, 2 );
+ SysMessage("Exploit attempt from %s blocked.\n", pThread->szIPAddr);
+ #ifdef WIN32
+ closesocket(pThread->sock);
+ return;
+ #else
+ close(pThread->sock);
+ return NULL;
+ #endif
+ }
szIn[nBytes] = 0x00;
Trim(&szIn[0], strlen(szIn));
***************
*** 470,474 ****
#endif
}
! szIn[nBytes] = 0x00;
Trim(&szIn[0], strlen(szIn));
memcpy(szPassword, szIn, strlen(szIn));
--- 482,497 ----
#endif
}
! if ( nBytes >= MAX_PATH )
! {
! shutdown(pThread->sock, 2 );
! SysMessage("Exploit attempt from %s blocked.\n", pThread->szIPAddr);
! #ifdef WIN32
! closesocket(pThread->sock);
! return;
! #else
! close(pThread->sock);
! return NULL;
! #endif
! }
Trim(&szIn[0], strlen(szIn));
memcpy(szPassword, szIn, strlen(szIn));
***************
*** 510,513 ****
--- 533,548 ----
#endif
}
+ if ( nBytes >= MAX_PATH + 4 )
+ {
+ shutdown(pThread->sock, 2 );
+ SysMessage("Exploit attempt from %s blocked.\n", pThread->szIPAddr);
+ #ifdef WIN32
+ closesocket(pThread->sock);
+ return;
+ #else
+ close(pThread->sock);
+ return NULL;
+ #endif
+ }
szIn[nBytes] = 0x00;
if (nBytes > 0)
***************
*** 1057,1060 ****
--- 1092,1096 ----
if (szLine[0] != 0x00)
{
+ // comment herby: I should write a stristr (not case sensitive) function
if ((strstr(szLine, "WORLDSAVE=") == szLine) && (szPath[0] == 0x00))
memcpy(&szPath[0], &szLine[10], strlen(szLine) - 10);
***************
*** 1996,2001 ****
if (strstr(szLine, "WORLDSAVE=") == szLine && ( strlen(szLine) > 10 ))
{
! memset(&szPath[0], 0x00, sizeof(szPath));
! memcpy(&szPath[0], &szLine[10], strlen(szLine) - 10);
break;
}
--- 2032,2039 ----
if (strstr(szLine, "WORLDSAVE=") == szLine && ( strlen(szLine) > 10 ))
{
! //memset(&szPath[0], 0x00, sizeof(szPath));
! //memcpy(&szPath[0], &szLine[10], strlen(szLine) - 10);
! // herbys comment: I do this like this, because of the compiler make more effective code - probably, maybe, sometime ;-)
! strcpy (szPath, &szLine[10]);
break;
}
***************
*** 2048,2061 ****
sprintf(szType, "<unknown>");
sprintf(szID, "<invalid>");
! sprintf(szCoords, "-1,-1,-1,0");
fReadLine(pWorldFile, &szLine[0], sizeof(szLine));
stoupper(&szLine[0], strlen(szLine));
Trim(&szLine[0], strlen(szLine));
! if ( strstr(szLine, "[WORLDITEM I_WORLDGEM_BIT") != NULL )
bWorldGem = TRUE;
else if ( strstr(szLine, "[") != NULL )
bWorldGem = FALSE;
if (strstr(szLine, "TYPE=34") != NULL || strstr(szLine, "TYPE=T_SPAWN_CHAR") != NULL || strstr(szLine, "TYPE=034") != NULL || ( strstr(szLine, "DISPID=I_PET_") != NULL && bWorldGem ) )
! {
// this is a NPC spawn point
npcCount++;
--- 2086,2106 ----
sprintf(szType, "<unknown>");
sprintf(szID, "<invalid>");
! if (!bWorldGem)
! sprintf(szCoords, "-1,-1,-1,0");
fReadLine(pWorldFile, &szLine[0], sizeof(szLine));
stoupper(&szLine[0], strlen(szLine));
Trim(&szLine[0], strlen(szLine));
! //Problem is in 99z Files the P= Tag is saved before the TYPE grrrrr! so we have to keep the P in memory
! //the other problem is spawnpoint don't appear only as i_worldgem_bit as I can see they might be i_pet_somewhat - maybe problem
! //I use the flag bWorldGem which is init above
! if ( (strstr(szLine, "[WORLDITEM I_WORLDGEM_BIT") != NULL ) || (strstr(szLine, "[WORLDITEM I_PET_") != NULL ) || (strstr(szLine, "[WORLDITEM I_SPAWNBIT") != NULL ) )
bWorldGem = TRUE;
else if ( strstr(szLine, "[") != NULL )
bWorldGem = FALSE;
+ if (strstr(szLine, "P=") == szLine && (strlen(szLine) > 2) && (bWorldGem))
+ sprintf(szCoords, &szLine[2]);
+
if (strstr(szLine, "TYPE=34") != NULL || strstr(szLine, "TYPE=T_SPAWN_CHAR") != NULL || strstr(szLine, "TYPE=034") != NULL || ( strstr(szLine, "DISPID=I_PET_") != NULL && bWorldGem ) )
! {
// this is a NPC spawn point
npcCount++;
***************
*** 2091,2095 ****
sprintf(szType, "<unknown>");
sprintf(szID, "<invalid>");
! sprintf(szCoords, "-1,-1,-1,0");
break;
}
--- 2136,2140 ----
sprintf(szType, "<unknown>");
sprintf(szID, "<invalid>");
! //sprintf(szCoords, "-1,-1,-1,0");
break;
}
***************
*** 2140,2144 ****
sprintf(szType, "<unknown>");
sprintf(szID, "<invalid>");
! sprintf(szCoords, "-1,-1,-1,0");
break;
}
--- 2185,2189 ----
sprintf(szType, "<unknown>");
sprintf(szID, "<invalid>");
! //sprintf(szCoords, "-1,-1,-1,0");
break;
}
***************
*** 2147,2155 ****
if (strstr(szLine, "MORE=") != NULL && (strlen(szLine) > 5))
sprintf(szID, &szLine[5]);
! if (strstr(szLine, "P=") != NULL && (strlen(szLine) > 2))
! {
! if (strstr(szLine, "MOREP=") == NULL)
! sprintf(szCoords, &szLine[2]);
! }
}
}
--- 2192,2200 ----
if (strstr(szLine, "MORE=") != NULL && (strlen(szLine) > 5))
sprintf(szID, &szLine[5]);
! //if (strstr(szLine, "P=") != NULL && (strlen(szLine) > 2))
! //{
! // if (strstr(szLine, "MOREP=") == NULL)
! // sprintf(szCoords, &szLine[2]);
! //}
}
}
|
