Commit a5d84bbc authored by Daniel Elstner's avatar Daniel Elstner Committed by Murray Cumming

Split off atkmm into its own separate module

* atk/, MSVC_Net200[58]/atkmm/: Delete atkmm subdirectories.
* configure.ac: Remove module definition of atkmm-1.6.  Adjust the
pkg-config dependencies to pull in an installed atkmm.
* **/Makefile.am: Remove references to atkmm from the build rules.
* docs/reference/Doxyfile.in: Remove references to in-tree atkmm.
* gtk/{gtkmm,gtkmm-uninstalled}.pc.in: Remove atkmm substitutions.
* tools/extra_defs_gen/generate_defs_gtk.cc: Remove code to output
definitions for ATK types.
parent ca7da7bf
Please use the mailing list (gtkmm-list@gnome.org) instead of emailing developers directly.
See the ChangeLog for up-to-date information.
Murray Cumming <murrayc@usa.net>
Daniel Elstner <daniel.elstner@gmx.net>
Murray Cumming
Daniel Elstner
Some former contributors:
......
2010-06-23 Daniel Elstner <danielk@openismus.com>
Split off atkmm into its own separate module
* atk/, MSVC_Net200[58]/atkmm/: Delete atkmm subdirectories.
* configure.ac: Remove module definition of atkmm-1.6. Adjust the
pkg-config dependencies to pull in an installed atkmm.
* **/Makefile.am: Remove references to atkmm from the build rules.
* docs/reference/Doxyfile.in: Remove references to in-tree atkmm.
* gtk/{gtkmm,gtkmm-uninstalled}.pc.in: Remove atkmm substitutions.
* tools/extra_defs_gen/generate_defs_gtk.cc: Remove code to output
definitions for ATK types.
2010-06-16 Murray Cumming <murrayc@murrayc.com>
Entry: Added im_context_filter_keypress().
......
#define APSTUDIO_READONLY_SYMBOLS
#include <windows.h>
#undef APSTUDIO_READONLY_SYMBOLS
#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
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
VS_VERSION_INFO VERSIONINFO
FILEVERSION @ATKMM_MAJOR_VERSION@,@ATKMM_MINOR_VERSION@,@ATKMM_MICRO_VERSION@,1
PRODUCTVERSION @ATKMM_MAJOR_VERSION@,@ATKMM_MINOR_VERSION@,@ATKMM_MICRO_VERSION@,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
VALUE "FileDescription", "The official C++ binding for ATK"
VALUE "FileVersion", "@PACKAGE_VERSION@"
VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
VALUE "OriginalFilename", "@ATKMM_MODULE_NAME@.dll"
VALUE "ProductName", "atkmm"
VALUE "ProductVersion", "@PACKAGE_VERSION@"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
#ifndef APSTUDIO_INVOKED
#endif // not APSTUDIO_INVOKED
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="atkmm-1.6"
ProjectGUID="{9FE0D5A6-458C-45C7-B954-2C3C1E6196C2}"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
Optimization="0"
AdditionalIncludeDirectories="../../atk"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ATKMM_BUILD"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate atkmm def file"
CommandLine="$(SolutionDir)gendef\$(ConfigurationName)\gendef $(ConfigurationName)\$(InputName).def $(TargetFileName) $(IntDir)\*.obj"
ExcludedFromBuild="false"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="atk-1.0.lib glib-2.0.lib gobject-2.0.lib sigc-vc80-d-2_0.lib glibmm-vc80-d-2_4.lib"
OutputFile="$(OutDir)/atkmm-vc80-d-1_6.dll"
ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"
GenerateDebugInformation="true"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
AdditionalIncludeDirectories="../../atk"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate atkmm def file"
CommandLine="$(SolutionDir)gendef\$(ConfigurationName)\gendef $(ConfigurationName)\$(InputName).def $(TargetFileName) $(IntDir)\*.obj"
ExcludedFromBuild="false"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="atk-1.0.lib glib-2.0.lib gobject-2.0.lib sigc-vc80-2_0.lib glibmm-vc80-2_4.lib"
OutputFile="$(OutDir)\atkmm-vc80-1_6.dll"
ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\atk\atkmm\action.cc"
>
</File>
<File
RelativePath="..\blank.cpp"
>
</File>
<File
RelativePath="..\..\atk\atkmm\component.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\document.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\editabletext.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\hyperlink.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\hypertext.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\image.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\implementor.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\init.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\noopobject.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\object.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\objectaccessible.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\relation.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\relationset.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\selection.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\stateset.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\streamablecontent.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\table.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\text.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\value.cc"
>
</File>
<File
RelativePath="..\..\atk\atkmm\wrap_init.cc"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\..\atk\atkmm\action.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\component.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\document.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\editabletext.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\hyperlink.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\hypertext.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\image.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\implementor.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\init.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\noopobject.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\object.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\objectaccessible.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\relation.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\relationset.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\selection.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\stateset.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\streamablecontent.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\table.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\text.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\value.h"
>
</File>
<File
RelativePath="..\..\atk\atkmm\wrap_init.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath=".\atkmm.rc"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
......@@ -6,8 +6,6 @@ msvc_net2005_data = \
gtkmm.sln \
gendef/gendef.vcproj \
gendef/gendef.cc \
atkmm/atkmm.rc \
atkmm/atkmm.vcproj \
gdkmm/gdkmm.rc \
gdkmm/gdkmm.vcproj \
gdkmm/gdkmmconfig.h \
......
#define APSTUDIO_READONLY_SYMBOLS
#include <windows.h>
#undef APSTUDIO_READONLY_SYMBOLS
#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
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
VS_VERSION_INFO VERSIONINFO
FILEVERSION @ATKMM_MAJOR_VERSION@,@ATKMM_MINOR_VERSION@,@ATKMM_MICRO_VERSION@,1
PRODUCTVERSION @ATKMM_MAJOR_VERSION@,@ATKMM_MINOR_VERSION@,@ATKMM_MICRO_VERSION@,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x4L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "The gtkmm development team (see AUTHORS)"
VALUE "FileDescription", "The official C++ binding for ATK"
VALUE "FileVersion", "@PACKAGE_VERSION@"
VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
VALUE "OriginalFilename", "@ATKMM_MODULE_NAME@.dll"
VALUE "ProductName", "atkmm"
VALUE "ProductVersion", "@PACKAGE_VERSION@"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // English (U.S.) resources
#ifndef APSTUDIO_INVOKED
#endif // not APSTUDIO_INVOKED
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="atkmm-1.6"
ProjectGUID="{9FE0D5A6-458C-45C7-B954-2C3C1E6196C2}"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
Optimization="0"
AdditionalIncludeDirectories="../../atk"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ATKMM_BUILD"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate atkmm def file"
CommandLine="$(SolutionDir)gendef\$(ConfigurationName)\gendef $(ConfigurationName)\$(InputName).def $(TargetFileName) $(IntDir)\*.obj"
ExcludedFromBuild="false"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="atk-1.0.lib glib-2.0.lib gobject-2.0.lib sigc-vc90-d-2_0.lib glibmm-vc90-d-2_4.lib"
OutputFile="$(OutDir)/atkmm-vc90-d-1_6.dll"
ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"
GenerateDebugInformation="true"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
AdditionalIncludeDirectories="../../atk"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate atkmm def file"
CommandLine="$(SolutionDir)gendef\$(ConfigurationName)\gendef $(ConfigurationName)\$(InputName).def $(TargetFileName) $(IntDir)\*.obj"
ExcludedFromBuild="false"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="atk-1.0.lib glib-2.0.lib gobject-2.0.lib sigc-vc90-2_0.lib glibmm-vc90-2_4.lib"
OutputFile="$(OutDir)\atkmm-vc90-1_6.dll"
ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>