diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-12-16 11:25:36 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-12-16 11:27:03 +0800 |
commit | 56e07beb2df88f6b27cc647eea5b00bfc4ab34a1 (patch) | |
tree | 5bc48c79278eb4cebfce1302768e556f4f9d14ac /build/win32 | |
parent | c403ddfa064ef3ffaa908fae6323de0dd2519b7d (diff) | |
download | atk-56e07beb2df88f6b27cc647eea5b00bfc4ab34a1.tar.gz |
build: Use Python to Generate the MSVC Projects
This would move the generation of the ATK Visual C++ 2008/2010 project
to Python 2/3 scripts from autotools scripts. This would have the
following advantages:
-Reduce congestion in the autotools files, most notably atk/Makefile.am,
and make everything that concerns the completion of MSVC project files
fo under build/
-Easier to maintain and test, as a standard installation of Python (even
on Windows) is enough to generate the Project files, and this can still
be easily called during 'make dist'.
-Also paves the first steps for people wanting to build ATK from a GIT
checkout, as this will help simplify the process
There is now a dependency on Python 2/3 for people that are wishing to do
'make dist', as naturally the scripts to do the Visual C++ project
generation is done with Python, but since one is likely going to generate
the .gir files for ATK when doing 'make dist'/'make distcheck', this is
satisfied as the scripts used to generate the .gir files are Python 2.6+
scripts as well.
https://bugzilla.gnome.org/show_bug.cgi?id=690145
Diffstat (limited to 'build/win32')
-rw-r--r-- | build/win32/vs10/.gitignore | 1 | ||||
-rw-r--r-- | build/win32/vs10/Makefile.am | 8 | ||||
-rw-r--r-- | build/win32/vs10/atk-install.props | 90 | ||||
-rw-r--r-- | build/win32/vs10/atk-install.propsin | 28 | ||||
-rw-r--r-- | build/win32/vs10/atk.vcxproj.filtersin | 4 | ||||
-rw-r--r-- | build/win32/vs10/atk.vcxprojin | 2 | ||||
-rw-r--r-- | build/win32/vs9/.gitignore | 1 | ||||
-rw-r--r-- | build/win32/vs9/Makefile.am | 8 | ||||
-rw-r--r-- | build/win32/vs9/atk-install.vsprops | 53 | ||||
-rw-r--r-- | build/win32/vs9/atk-install.vspropsin | 22 | ||||
-rw-r--r-- | build/win32/vs9/atk.vcprojin | 2 |
11 files changed, 72 insertions, 147 deletions
diff --git a/build/win32/vs10/.gitignore b/build/win32/vs10/.gitignore index 73afdd0..0231580 100644 --- a/build/win32/vs10/.gitignore +++ b/build/win32/vs10/.gitignore @@ -1,2 +1,3 @@ atk.vcxproj atk.vcxproj.filters +atk-install.props diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 7623024..34f1c58 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -11,4 +11,12 @@ EXTRA_DIST = \ atk-gen-src.props \ atk-gengir.props \ atk-install.props \ + atk-install.propsin \ atk-version-paths.props + +atk-install.props atk.vcxproj.filter: atk.vcxproj + +atk.vcxproj: + $(PYTHON) $(top_srcdir)/build/atk_msvc_files.py -t vs10 + +DISTCLEANFILES = atk.vcxproj atk.vcxproj.filters atk-install.props diff --git a/build/win32/vs10/atk-install.props b/build/win32/vs10/atk-install.props deleted file mode 100644 index 0a9907d..0000000 --- a/build/win32/vs10/atk-install.props +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets"> - <Import Project="atk-build-defines.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros"> - <AtkDoInstall> -mkdir $(CopyDir)\bin - -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin - - -mkdir $(CopyDir)\lib - -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib - - -mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atk.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkaction.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkcomponent.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkdocument.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkeditabletext.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkgobjectaccessible.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkhyperlink.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkhyperlinkimpl.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkhypertext.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atknoopobject.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atknoopobjectfactory.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkobject.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkobjectfactory.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkplug.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkimage.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkregistry.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkrelation.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkrelationtype.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkrelationset.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkselection.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atksocket.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkstate.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkstateset.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkstreamablecontent.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atktable.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atktext.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkutil.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkmisc.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkvalue.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkwindow.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkversion.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atk-enum-types.h $(CopyDir)\include\atk-$(ApiVersion)\atk - </AtkDoInstall> - </PropertyGroup> - <ItemGroup> - <BuildMacro Include="AtkDoInstall"> - <Value>$(AtkDoInstall)</Value> - </BuildMacro> - </ItemGroup> -</Project> diff --git a/build/win32/vs10/atk-install.propsin b/build/win32/vs10/atk-install.propsin new file mode 100644 index 0000000..f952345 --- /dev/null +++ b/build/win32/vs10/atk-install.propsin @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ImportGroup Label="PropertySheets"> + <Import Project="atk-build-defines.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros"> + <AtkDoInstall> +mkdir $(CopyDir)\bin + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin + + +mkdir $(CopyDir)\lib + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib + + +mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk + +#include "atk.vs10instfiles" + </AtkDoInstall> + </PropertyGroup> + <ItemGroup> + <BuildMacro Include="AtkDoInstall"> + <Value>$(AtkDoInstall)</Value> + </BuildMacro> + </ItemGroup> +</Project> diff --git a/build/win32/vs10/atk.vcxproj.filtersin b/build/win32/vs10/atk.vcxproj.filtersin index 13bd339..d83ee42 100644 --- a/build/win32/vs10/atk.vcxproj.filtersin +++ b/build/win32/vs10/atk.vcxproj.filtersin @@ -15,7 +15,7 @@ </Filter> </ItemGroup> <ItemGroup> -#include "libatk.vs10.sourcefiles.filters" +#include "atk.vs10.sourcefiles.filters" </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild> @@ -27,4 +27,4 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/build/win32/vs10/atk.vcxprojin b/build/win32/vs10/atk.vcxprojin index b2fc326..66eb5fc 100644 --- a/build/win32/vs10/atk.vcxprojin +++ b/build/win32/vs10/atk.vcxprojin @@ -161,7 +161,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> -#include "libatk.vs10.sourcefiles" +#include "atk.vs10.sourcefiles" </ItemGroup> <ItemGroup> <CustomBuild Include="..\..\..\config.h.win32"> diff --git a/build/win32/vs9/.gitignore b/build/win32/vs9/.gitignore index 063f099..0e18109 100644 --- a/build/win32/vs9/.gitignore +++ b/build/win32/vs9/.gitignore @@ -1 +1,2 @@ atk.vcproj +atk-install.vsprops diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 29520a8..f7ed4f5 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -9,4 +9,12 @@ EXTRA_DIST = \ atk-gen-src.vsprops \ atk-gengir.vsprops \ atk-install.vsprops \ + atk-install.vspropsin \ atk-version-paths.vsprops + +atk-install.vsprops: atk.vcproj + +atk.vcproj: + $(PYTHON) $(top_srcdir)/build/atk_msvc_files.py -t vs9 + +DISTCLEANFILES = atk.vcproj atk-install.vsprops diff --git a/build/win32/vs9/atk-install.vsprops b/build/win32/vs9/atk-install.vsprops deleted file mode 100644 index 67caef6..0000000 --- a/build/win32/vs9/atk-install.vsprops +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="atkinstallprops" - InheritedPropertySheets=".\atk-build-defines.vsprops" - > - <UserMacro - Name="AtkDoInstall" - Value=" -mkdir $(CopyDir)
 -mkdir $(CopyDir)\bin
 -copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin
 - -mkdir $(CopyDir)\lib
 -copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
 - -mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atk.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkaction.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkcomponent.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkdocument.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkeditabletext.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkgobjectaccessible.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkhyperlink.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkhyperlinkimpl.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkhypertext.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atknoopobject.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atknoopobjectfactory.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkobject.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkobjectfactory.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkplug.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkimage.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkregistry.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkrelation.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkrelationtype.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkrelationset.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkselection.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atksocket.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkstate.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkstateset.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkstreamablecontent.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atktable.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atktext.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkutil.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkmisc.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkvalue.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkwindow.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atkversion.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -copy ..\..\..\atk\atk-enum-types.h $(CopyDir)\include\atk-$(ApiVersion)\atk
 -" - /> -</VisualStudioPropertySheet> diff --git a/build/win32/vs9/atk-install.vspropsin b/build/win32/vs9/atk-install.vspropsin new file mode 100644 index 0000000..5bf3b73 --- /dev/null +++ b/build/win32/vs9/atk-install.vspropsin @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="atkinstallprops" + InheritedPropertySheets=".\atk-build-defines.vsprops" + > + <UserMacro + Name="AtkDoInstall" + Value=" +mkdir $(CopyDir)
 +mkdir $(CopyDir)\bin
 +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin
 + +mkdir $(CopyDir)\lib
 +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
 + +mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk
 +#include "atk.vs9instfiles" +" + /> +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/atk.vcprojin b/build/win32/vs9/atk.vcprojin index 6dcd55d..ec1174c 100644 --- a/build/win32/vs9/atk.vcprojin +++ b/build/win32/vs9/atk.vcprojin @@ -158,7 +158,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > -#include "libatk.sourcefiles" +#include "atk.sourcefiles" </Filter> <Filter Name="Headers" |