summaryrefslogtreecommitdiff
path: root/win32/vs9
diff options
context:
space:
mode:
Diffstat (limited to 'win32/vs9')
-rw-r--r--win32/vs9/Makefile.am1
-rw-r--r--win32/vs9/README.txt14
-rw-r--r--win32/vs9/atk-build-defines.vsprops8
-rw-r--r--win32/vs9/atk-install.vspropsin3
-rw-r--r--win32/vs9/atk-introspect.vcproj76
-rw-r--r--win32/vs9/atk-version-paths.vsprops.in8
-rw-r--r--win32/vs9/atk.sln14
7 files changed, 124 insertions, 0 deletions
diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
index f0d98f8..c679306 100644
--- a/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = \
atk.sln \
atk.vcprojin \
atk-install.vcproj \
+ atk-introspection.vcproj \
atk-build-defines.vsprops \
atk-gen-src.vsprops \
atk-install.vspropsin \
diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt
index 6f2cfec..472e419 100644
--- a/win32/vs9/README.txt
+++ b/win32/vs9/README.txt
@@ -83,6 +83,20 @@ headers, EXEs, DLLs and LIBs will end up in
<root>\vs9\<PlatformName>\bin (EXEs/DLLs)
respectively.
+Building introspection files are now integrated in the build process of the
+solution files. In order for this to work, ensure that PythonDir (32-bit builds)
+or PythonDirX64 (x64 builds) are set at the installation directory of where your
+Python installation is. Please note the following:
+
+-This Python installation must be the same installation/configuration as the
+ one that was used to build GObject-Introspection.
+
+-g-ir-scanner needs to be found at <root>\vs9\<PlatformName>\bin, and the
+ other Python items needs to be under <root>\vs9\<PlatformName>\lib\gobject-introspection.
+
+-If this fails, the other parts of the build/"install" will still continue to proceed
+ normally, so this is optional.
+
After the build of ATK, the "install" project will copy build results
and headers into their appropriate location under <root>\vs9\<PlatformName>.
For instance, built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
diff --git a/win32/vs9/atk-build-defines.vsprops b/win32/vs9/atk-build-defines.vsprops
index fc7b509..e363626 100644
--- a/win32/vs9/atk-build-defines.vsprops
+++ b/win32/vs9/atk-build-defines.vsprops
@@ -23,4 +23,12 @@
Name="AtkDefines"
Value="ATK_COMPILATION;DLL_EXPORT;ATK_LOCALEDIR=\&quot;/dummy/share/locale\&quot;"
/>
+ <UserMacro
+ Name="AtkIntrospectNMakeCmd"
+ Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f atk-introspection-msvc.mak CFG=$(ConfigurationName) PREFIX=$(GlibEtcInstallRoot)"
+ />
+ <UserMacro
+ Name="AtkIntrospectBuiltFiles"
+ Value="$(SolutionDir)\..\Atk-1.0.gir;$(SolutionDir)\..\Atk-1.0.typelib"
+ />
</VisualStudioPropertySheet>
diff --git a/win32/vs9/atk-install.vspropsin b/win32/vs9/atk-install.vspropsin
index dcb22d4..958cd1a 100644
--- a/win32/vs9/atk-install.vspropsin
+++ b/win32/vs9/atk-install.vspropsin
@@ -19,6 +19,9 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\atk-$(ApiVersion).li
mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk&#x0D;&#x0A;
#include "atk.headers"
+if exist ..\Atk-1.0.gir (mkdir $(CopyDir)\share\gir-1.0 &amp; copy ..\Atk-1.0.gir $(CopyDir)\share\gir-1.0)&#x0D;&#x0A;
+if exist ..\Atk-1.0.typelib (mkdir $(CopyDir)\lib\girepository-1.0 &amp; copy ..\Atk-1.0.gir $(CopyDir)\lib\girepository-1.0)&#x0D;&#x0A;
+
mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
copy ..\atk.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
"
diff --git a/win32/vs9/atk-introspect.vcproj b/win32/vs9/atk-introspect.vcproj
new file mode 100644
index 0000000..a7b7cae
--- /dev/null
+++ b/win32/vs9/atk-introspect.vcproj
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="atk-introspect"
+ ProjectGUID="{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}"
+ Keyword="MakeFileProj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ ConfigurationType="0"
+ InheritedPropertySheets=".\atk-build-defines.vsprops"
+ >
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam)"
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
+ CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
+ Output="$(AtkIntrospectBuiltFiles)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ ConfigurationType="0"
+ InheritedPropertySheets=".\atk-build-defines.vsprops"
+ >
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
+ CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
+ Output="$(AtkIntrospectBuiltFiles)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="0"
+ InheritedPropertySheets=".\atk-build-defines.vsprops"
+ CharacterSet="2"
+ DeleteExtensionsOnClean=""
+ >
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam)"
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
+ CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
+ Output="$(AtkIntrospectBuiltFiles)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="0"
+ InheritedPropertySheets=".\atk-build-defines.vsprops"
+ >
+ <Tool
+ Name="VCNMakeTool"
+ BuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
+ ReBuildCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
+ CleanCommandLine="$(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
+ Output="$(AtkIntrospectBuiltFiles)"
+ />
+ </Configuration>
+ </Configurations>
+</VisualStudioProject>
diff --git a/win32/vs9/atk-version-paths.vsprops.in b/win32/vs9/atk-version-paths.vsprops.in
index 401bd24..9d9973a 100644
--- a/win32/vs9/atk-version-paths.vsprops.in
+++ b/win32/vs9/atk-version-paths.vsprops.in
@@ -66,4 +66,12 @@
Name="PythonDirX64"
Value="$(PythonDir).x64"
/>
+ <UserMacro
+ Name="IntrospectPythonParam"
+ Value="PYTHON=$(PythonDir)\python.exe"
+ />
+ <UserMacro
+ Name="IntrospectPythonParamX64"
+ Value="PYTHON=$(PythonDirX64)\python.exe"
+ />
</VisualStudioPropertySheet>
diff --git a/win32/vs9/atk.sln b/win32/vs9/atk.sln
index a760553..4880737 100644
--- a/win32/vs9/atk.sln
+++ b/win32/vs9/atk.sln
@@ -3,9 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk", "atk.vcproj", "{86EACD59-F69F-4AAD-854B-AA03D5447360}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360}
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-install", "atk-install.vcproj", "{00702787-1566-484D-991F-3E7E459BB909}"
ProjectSection(ProjectDependencies) = postProject
{86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360}
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A} = {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}
EndProjectSection
EndProject
Global
@@ -24,6 +30,14 @@ Global
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|x64.Build.0 = Debug|x64
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.ActiveCfg = Release|x64
{86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.Build.0 = Release|x64
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.Build.0 = Debug|Win32
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.Build.0 = Release|Win32
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.Build.0 = Debug|x64
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64
+ {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.Build.0 = Release|x64
{00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.ActiveCfg = Debug|Win32
{00702787-1566-484D-991F-3E7E459BB909}.Debug|Win32.Build.0 = Debug|Win32
{00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.ActiveCfg = Release|Win32
View Lorry Controller Status