MSVC Builds: Rework Introspection Build
authorChun-wei Fan <fanchunwei@src.gnome.org>
Fri, 10 Jan 2014 07:36:29 +0000 (15:36 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Fri, 10 Jan 2014 07:36:29 +0000 (15:36 +0800)
The current approach of building the introspection files for ATK works, but
is often cumbersome as one needs to set many environmental variables before
launching a solution file, which runs a Windows batch script to generate
the .gir/.typelib files.  It was also possible to hand-run the batch script
from the Visual Studio command prompt, but even more environmental
variables need to be set.

This changes the approach to build the introspection files using an NMake
Makefile (but elimating from the Visual Studio Project Files the part to
build the introspection files) to:
-Make it clearer to the person building the introspection files what
 environmental variables are needed, specifically for PKG_CONFIG_PATH and
 MINGWDIR and CFG (formerly CONF).  Setting stuff like VSVER, PLAT and
 BASEDIR is no longer required, which was a bit clunky.
-Allows some more easier flexibility on the build of the intropsection
 files.

This also cleans up the gen-file-list.py file as it can share parts in the
recently-added msvcfiles.py

15 files changed:
build/Makefile.am
build/atk-introspection-msvc.mak [new file with mode: 0644]
build/gen-file-list-atk.py [new file with mode: 0644]
build/introspection-msvc.mak [new file with mode: 0644]
build/win32/Makefile.am
build/win32/gen-file-list-atk.py [deleted file]
build/win32/gengir.bat [deleted file]
build/win32/vs10/Makefile.am
build/win32/vs10/atk-gengir.props [deleted file]
build/win32/vs10/atk.sln
build/win32/vs10/gengir.vcxproj [deleted file]
build/win32/vs9/Makefile.am
build/win32/vs9/atk-gengir.vsprops [deleted file]
build/win32/vs9/atk.sln
build/win32/vs9/gengir.vcproj [deleted file]

index 3bbca43..334c8cf 100644 (file)
@@ -4,5 +4,8 @@ SUBDIRS = \
 EXTRA_DIST =   \
        atk_msvc_files.py       \
        msvcfiles.py    \
-       testsrules_msvc.mak
+       testsrules_msvc.mak     \
+       introspection-msvc.mak
+       atk-introspection-msvc.mak      \
+       gen-file-list-atk.py
 
diff --git a/build/atk-introspection-msvc.mak b/build/atk-introspection-msvc.mak
new file mode 100644 (file)
index 0000000..0c20812
--- /dev/null
@@ -0,0 +1,54 @@
+# NMake Makefile to build Introspection Files for ATK
+
+# Change or pass in as a variable/env var if needed
+DLLNAME = atk-1-vs$(VSVER)
+
+# Please do not change anything after this line
+
+!include testsrules_msvc.mak
+
+APIVERSION = 1.0
+
+CHECK_PACKAGE = gobject-2.0
+
+!include introspection-msvc.mak
+
+!if "$(BUILD_INTROSPECTION)" == "TRUE"
+all: Atk-$(APIVERSION).gir Atk-$(APIVERSION).typelib
+
+atk_list:
+       @-echo Generating Filelist to Introspect for ATK...
+       $(PYTHON2) gen-file-list-atk.py
+
+Atk-$(APIVERSION).gir: atk_list
+       @-echo Generating Atk-$(APIVERSION).gir...
+       @set CC=$(CC)
+       @set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection
+       @set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PATH);$(MINGWDIR)\bin
+       @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
+       $(PYTHON2) $(G_IR_SCANNER) --verbose -I.. --add-include-path=.. \
+       --namespace=Atk --nsversion=$(APIVERSION) --include=GObject-2.0 \
+       --no-libtool --pkg=glib-2.0 --library=$(DLLNAME)        \
+       --reparse-validate --add-include-path=$(G_IR_INCLUDEDIR)        \
+       --pkg-export atk --warn-all --c-include "atk/atk.h"     \
+       -DATK_DISABLE_DEPRECATED -DATK_COMPILATION -DATK_LOCALEDIR=\"/dummy/share/locale\"      \
+       --filelist=atk_list -o Atk-$(APIVERSION).gir
+
+Atk-$(APIVERSION).typelib: Atk-$(APIVERSION).gir
+       @-echo Compiling Atk-$(APIVERSION).typelib...
+       $(G_IR_COMPILER) --includedir=. --debug --verbose Atk-1.0.gir -o Atk-1.0.typelib
+
+install-introspection: Atk-$(APIVERSION).gir Atk-$(APIVERSION).typelib
+       @-copy Atk-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
+       @-copy /b Atk-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
+
+!else
+all:
+       @-echo $(ERROR_MSG)
+!endif
+
+clean:
+       @-del /f/q Atk-$(APIVERSION).typelib
+       @-del /f/q Atk-$(APIVERSION).gir
+       @-del /f/q atk_list
+       @-del /f/q *.pyc
diff --git a/build/gen-file-list-atk.py b/build/gen-file-list-atk.py
new file mode 100644 (file)
index 0000000..f008022
--- /dev/null
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+# vim: encoding=utf-8
+# Generate the file lists for processing with g-ir-scanner
+import os
+import sys
+import re
+import string
+import subprocess
+import optparse
+
+from msvcfiles import read_vars_from_AM
+
+def gen_atk_filelist(srcroot, subdir, dest):
+    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
+                             vars = {'top_builddir':'.'},
+                             conds = {'HAVE_INTROSPECTION':True},
+                             filters = ['introspection_sources', 'introspection_generated_sources'])
+
+    files = vars['introspection_sources'].split() + \
+            vars['introspection_generated_sources'].split()
+
+    with open(dest, 'w') as d:
+        for i in files:
+            if (i.startswith('./atk/')):
+                i = i.replace('./atk/','')
+            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def main(argv):
+    srcroot = os.path.join('..')
+    subdir = 'atk'
+    gen_atk_filelist(srcroot, subdir, 'atk_list')
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
diff --git a/build/introspection-msvc.mak b/build/introspection-msvc.mak
new file mode 100644 (file)
index 0000000..3670c2f
--- /dev/null
@@ -0,0 +1,79 @@
+# Common Utility NMake Makefile Template
+# Used to Generate Introspection files for various Projects
+
+# Can Override with env vars as needed
+# You will need to have built gobject-introspection for this to work.
+# Change or pass in or set the following to suit your environment
+
+BASEDIR = ..\..\vs$(VSVER)\$(PLAT)
+GIR_SUBDIR = share\gir-1.0
+GIR_SUBDIR = share\gir-1.0
+G_IR_SCANNER = $(BASEDIR)\bin\g-ir-scanner
+G_IR_COMPILER = $(BASEDIR)\bin\g-ir-compiler.exe
+G_IR_INCLUDEDIR = $(BASEDIR)\$(GIR_SUBDIR)
+G_IR_TYPELIBDIR = $(BASEDIR)\$(GIR_SUBDIR)
+
+# Note: The PYTHON2 must be a Python 2.6.x or 2.7.x Interpretor!
+# Either having python.exe from Python 2.6.x/2.7.x in your PATH will work
+# or passing in PYTHON2=<full path to your Python 2.6.x/2.7.x interpretor> will do
+
+# This is required, and gobject-introspection needs to be built
+# before this can be successfully run.
+PYTHON2=python
+
+# Don't change anything following this line!
+VALID_PKG_CONFIG_PATH = FALSE
+VALID_GCC_INSTPATH = FALSE
+
+MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
+MSG_INVALID_MINGWDIR = You must set or specifiy a valid MINGWDIR, where gcc.exe can be found in %MINGWDIR%\bin
+MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files
+
+ERROR_MSG =
+
+BUILD_INTROSPECTION = TRUE
+
+!if ![pkg-config --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x]     \
+       && ![setlocal]  \
+       && ![set file="pkgconfig.x"]    \
+       && ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize]       \
+       && ![del $(ERRNUL) /q/f pkgconfig.x]
+!endif
+
+!include pkgconfig.chksize
+!if "$(PKG_CHECK_SIZE)" == "0"
+VALID_PKG_CONFIG_PATH = TRUE
+!else
+VALID_PKG_CONFIG_PATH = FALSE
+!endif
+
+!if ![IF EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=TRUE > gcccheck.x]
+!endif
+
+!if ![IF NOT EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=FALSE > gcccheck.x]
+!endif
+
+!include gcccheck.x
+
+!if ![del $(ERRNUL) /q/f pkgconfig.chksize gcccheck.x]
+!endif
+
+VALID_CFGSET = FALSE
+!if "$(CFG)" == "release" || "$(CFG)" == "debug"
+VALID_CFGSET = TRUE
+!endif
+
+!if "$(VALID_GCC_INSTPATH)" != "TRUE"
+BUILD_INTROSPECTION = FALSE
+ERROR_MSG = $(MSG_INVALID_MINGWDIR)
+!endif
+
+!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
+BUILD_INTROSPECTION = FALSE
+ERROR_MSG = $(MSG_INVALID_PKGCONFIG)
+!endif
+
+!if "$(VALID_CFGSET)" != "TRUE"
+BUILD_INTROSPECTION = FALSE
+ERROR_MSG = $(MSG_INVALID_CFG)
+!endif
index 4eff83d..e013d16 100644 (file)
@@ -1,7 +1,3 @@
 SUBDIRS =      \
        vs9  \
        vs10
-
-EXTRA_DIST =   \
-       gengir.bat      \
-       gen-file-list-atk.py
diff --git a/build/win32/gen-file-list-atk.py b/build/win32/gen-file-list-atk.py
deleted file mode 100644 (file)
index 8729c90..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/usr/bin/python
-# vim: encoding=utf-8
-# Generate the file lists for processing with g-ir-scanner
-import os
-import sys
-import re
-import string
-import subprocess
-import optparse
-
-def gen_atk_filelist(srcroot, subdir, dest):
-    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
-                             vars = {'top_builddir':'.'},
-                             conds = {'HAVE_INTROSPECTION':True},
-                             filters = ['introspection_sources', 'introspection_generated_sources'])
-
-    files = vars['introspection_sources'].split() + \
-            vars['introspection_generated_sources'].split()
-
-    with open(dest, 'w') as d:
-        for i in files:
-            if (i.startswith('./atk/')):
-                i = i.replace('./atk/','')
-            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
-
-def read_vars_from_AM(path, vars = {}, conds = {}, filters = None):
-    '''
-    path: path to the Makefile.am
-    vars: predefined variables
-    conds: condition variables for Makefile
-    filters: if None, all variables defined are returned,
-             otherwise, it is a list contains that variables should be returned
-    '''
-    cur_vars = vars.copy()
-    RE_AM_VAR_REF = re.compile(r'\$\((\w+?)\)')
-    RE_AM_VAR = re.compile(r'^\s*(\w+)\s*=(.*)$')
-    RE_AM_INCLUDE = re.compile(r'^\s*include\s+(\w+)')
-    RE_AM_CONTINUING = re.compile(r'\\\s*$')
-    RE_AM_IF = re.compile(r'^\s*if\s+(\w+)')
-    RE_AM_ELSE = re.compile(r'^\s*else')
-    RE_AM_ENDIF = re.compile(r'^\s*endif')
-    def am_eval(cont):
-        return RE_AM_VAR_REF.sub(lambda x: cur_vars.get(x.group(1), ''), cont)
-    with open(path, 'r') as f:
-        contents = f.readlines()
-    #combine continuing lines
-    i = 0
-    ncont = []
-    while i < len(contents):
-        line = contents[i]
-        if RE_AM_CONTINUING.search(line):
-            line = RE_AM_CONTINUING.sub('', line)
-            j = i + 1
-            while j < len(contents) and RE_AM_CONTINUING.search(contents[j]):
-                line += RE_AM_CONTINUING.sub('', contents[j])
-                j += 1
-            else:
-                if j < len(contents):
-                    line += contents[j]
-            i = j
-        else:
-            i += 1
-        ncont.append(line)
-
-    #include, var define, var evaluation
-    i = -1
-    skip = False
-    oldskip = []
-    while i < len(ncont) - 1:
-        i += 1
-        line = ncont[i]
-        mo = RE_AM_IF.search(line)
-        if mo:
-            oldskip.append(skip)
-            skip = False if mo.group(1) in conds and conds[mo.group(1)] \
-                         else True
-            continue
-        mo = RE_AM_ELSE.search(line)
-        if mo:
-            skip = not skip
-            continue
-        mo = RE_AM_ENDIF.search(line)
-        if mo:
-            skip = oldskip.pop()
-            continue
-        if not skip:
-            mo = RE_AM_INCLUDE.search(line)
-            if mo:
-                cur_vars.update(read_vars_from_AM(am_eval(mo.group(1)), cur_vars, conds, None))
-                continue
-            mo = RE_AM_VAR.search(line)
-            if mo:
-                cur_vars[mo.group(1)] = am_eval(mo.group(2).strip())
-                continue
-
-    #filter:
-    if filters != None:
-        ret = {}
-        for i in filters:
-            ret[i] = cur_vars.get(i, '')
-        return ret
-    else:
-        return cur_vars
-
-def main(argv):
-    srcroot = '..\\..'
-    subdir = 'atk'
-    gen_atk_filelist(srcroot, subdir, 'atk_list')
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/build/win32/gengir.bat b/build/win32/gengir.bat
deleted file mode 100644 (file)
index b843415..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-@echo off
-
-setlocal EnableDelayedExpansion
-
-rem Needed environmental variables:
-rem PLAT: Windows platform-Win32 (i.e. x86) or x64 (i.e. x86-64)
-rem CONF: Configuration Type, Release or Debug
-rem VSVER: Visual C++ version used
-
-rem Check the environemental variables...
-if /i "%PLAT%" == "Win32" goto PLAT_OK
-if /i "%PLAT%" == "x64" goto PLAT_OK
-if /i "%PLAT%" == "x86" (
-   set PLAT=Win32
-   goto PLAT_OK
-)
-if /i "%PLAT%" == "x86-64" (
-   set PLAT=x64
-   goto PLAT_OK
-)
-goto ERR_PLAT
-
-:PLAT_OK
-if "%VSVER%" == "9" goto VSVER_OK
-if "%VSVER%" == "10" goto VSVER_OK
-if "%VSVER%" == "11" goto VSVER_OK
-goto ERR_VSVER
-:VSVER_OK
-if /i "%CONF%" == "Release" goto CONF_OK
-if /i "%CONF%" == "Debug" goto CONF_OK
-goto ERR_CONF
-:CONF_OK
-if "%BASEDIR%" == "" goto ERR_BASEDIR
-if not exist %BASEDIR% goto ERR_BASEDIR
-
-if "%PKG_CONFIG_PATH%" == "" goto ERR_PKGCONFIG
-if not exist %PKG_CONFIG_PATH%\gobject-2.0.pc goto ERR_PKGCONFIG
-
-if "%MINGWDIR%" == "" goto ERR_MINGWDIR
-if not exist %MINGWDIR%\bin\gcc.exe goto ERR_MINGWDIR
-
-set CC=cl
-set BINDIR=%CD%\vs%VSVER%\%CONF%\%PLAT%\bin
-set INCLUDE=%BASEDIR%\include\glib-2.0;%BASEDIR%\lib\glib-2.0\include;%INCLUDE%
-set LIB=%BINDIR%;%BASEDIR%\lib;%LIB%
-set PATH=%BINDIR%;%BASEDIR%\bin;%PATH%;%MINGWDIR%\bin
-set PYTHONPATH=%BASEDIR%\lib\gobject-introspection;%BINDIR%
-
-echo Create filelist for generating ATK .gir's...
-call python gen-file-list-atk.py
-
-echo Setup .bat for generating ATK .gir's...
-
-rem =================================================================================================
-rem Begin setup of atk_gir.bat to create Atk-1.0.gir
-rem (The ^^ is necessary to span the command to multiple lines on Windows cmd.exe!)
-rem =================================================================================================
-
-echo echo Generating Atk-1.0.gir...> atk_gir.bat
-echo @echo on>> atk_gir.bat
-echo.>> atk_gir.bat
-rem ================================================================
-rem Setup the command line flags to g-ir-scanner for Atk-1.0.gir...
-rem ================================================================
-echo python %BASEDIR%\bin\g-ir-scanner --verbose -I..\.. --add-include-path=..\.. ^^>> atk_gir.bat
-echo --namespace=Atk --nsversion=1.0 --include=GObject-2.0 ^^>> atk_gir.bat
-echo --no-libtool --pkg=glib-2.0 --library=atk-1-vs%VSVER% ^^>> atk_gir.bat
-echo --reparse-validate --add-include-path=%BASEDIR%\share\gir-1.0 ^^>> atk_gir.bat
-echo  --pkg-export atk --warn-all --c-include "atk/atk.h" ^^>> atk_gir.bat
-echo -I..\.. -DATK_DISABLE_DEPRECATED -DATK_COMPILATION -DATK_LOCALEDIR=\"/dummy/share/locale\" ^^>> atk_gir.bat
-echo --filelist=atk_list ^^>> atk_gir.bat
-echo -o Atk-1.0.gir>> atk_gir.bat
-echo.>> atk_gir.bat
-
-echo Completed setup of .bat for generating Atk-1.0.gir.
-echo.>> atk_gir.bat
-
-rem ===================================================
-rem Finish setup of atk_gir.bat to create Atk-1.0.gir
-rem ===================================================
-
-rem =======================
-rem Now generate the .gir's
-rem =======================
-CALL atk_gir.bat
-
-rem Clean up the .bat/filelist for generating the .gir files...
-del atk_gir.bat
-del atk_list
-
-rem Now compile the generated .gir files
-%BASEDIR%\bin\g-ir-compiler --includedir=. --debug --verbose Atk-1.0.gir -o Atk-1.0.typelib
-
-rem Copy the generated .girs and .typelibs to their appropriate places
-
-mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0
-move /y *.gir %BASEDIR%\share\gir-1.0\
-
-mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0
-move /y *.typelib %BASEDIR%\lib\girepository-1.0\
-
-goto DONE
-
-:ERR_PLAT
-echo You need to specify a valid Platform [set PLAT=Win32 or PLAT=x64]
-goto DONE
-:ERR_VSVER
-echo You need to specify your Visual Studio version [set VSVER=9 or VSVER=10 or VSVER=11]
-goto DONE
-:ERR_CONF
-echo You need to specify a valid Configuration [set CONF=Release or CONF=Debug]
-goto DONE
-:ERR_BASEDIR
-echo You need to specify a valid BASEDIR.
-goto DONE
-:ERR_PKGCONFIG
-echo You need to specify a valid PKG_CONFIG_PATH
-goto DONE
-:ERR_MINGWDIR
-echo You need to specify a valid MINGWDIR, where a valid gcc installation can be found.
-goto DONE
-:DONE
-
index 34f1c58..71329c6 100644 (file)
@@ -6,10 +6,8 @@ EXTRA_DIST =   \
        atk.vcxproj.filters     \
        atk.vcxproj.filtersin   \
        install.vcxproj \
-       gengir.vcxproj  \
        atk-build-defines.props \
        atk-gen-src.props       \
-       atk-gengir.props        \
        atk-install.props       \
        atk-install.propsin     \
        atk-version-paths.props
diff --git a/build/win32/vs10/atk-gengir.props b/build/win32/vs10/atk-gengir.props
deleted file mode 100644 (file)
index 34708f0..0000000
+++ /dev/null
@@ -1,26 +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">
-<DoGenGir>
-set VSVER=$(VSVer)
-set CONF=$(Configuration)
-set PLAT=$(Platform)
-set BASEDIR=$(GlibEtcInstallRoot)
-cd ..
-call gengir.bat
-
-cd vs$(VSVer)
-</DoGenGir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>atkgengirprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="DoGenGir">
-      <Value>$(DoGenGir)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
index d439412..55d5531 100644 (file)
@@ -5,8 +5,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk", "atk.vcxproj", "{86EA
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{00702787-1566-484D-991F-3E7E459BB909}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"\r
-EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -31,10 +29,6 @@ Global
                {00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.Build.0 = Release|Win32\r
                {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.ActiveCfg = Release|x64\r
                {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.Build.0 = Release|x64\r
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64\r
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32\r
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
diff --git a/build/win32/vs10/gengir.vcxproj b/build/win32/vs10/gengir.vcxproj
deleted file mode 100644 (file)
index 8cdd305..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B15}</ProjectGuid>
-    <RootNamespace>gengir</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="atk-gengir.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="atk-gengir.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="atk-gengir.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="atk-gengir.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="atk.vcxproj">
-      <Project>{86eacd59-f69f-4aad-854b-aa03d5447360}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
index f7ed4f5..02185a3 100644 (file)
@@ -4,10 +4,8 @@ EXTRA_DIST =   \
        atk.vcproj      \
        atk.vcprojin    \
        install.vcproj  \
-       gengir.vcproj   \
        atk-build-defines.vsprops       \
        atk-gen-src.vsprops     \
-       atk-gengir.vsprops      \
        atk-install.vsprops     \
        atk-install.vspropsin   \
        atk-version-paths.vsprops
diff --git a/build/win32/vs9/atk-gengir.vsprops b/build/win32/vs9/atk-gengir.vsprops
deleted file mode 100644 (file)
index bd61147..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="atkgengirprops"
-       InheritedPropertySheets=".\atk-build-defines.vsprops"
-       >
-       <UserMacro
-               Name="DoGenGir"
-               Value="
-set VSVER=$(VSVer)&#x0D;&#x0A;
-set CONF=$(ConfigurationName)&#x0D;&#x0A;
-set PLAT=$(PlatformName)&#x0D;&#x0A;
-set BASEDIR=$(GLibEtcInstallRoot)&#x0D;&#x0A;
-
-cd ..&#x0D;&#x0A;
-call gengir.bat&#x0D;&#x0A;
-cd vs$(VSVer)&#x0D;&#x0A;
-                     "
-       />
-</VisualStudioPropertySheet>
index 1cc5759..d2c9af7 100644 (file)
@@ -8,11 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
                {86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360}\r
-       EndProjectSection\r
-EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -37,10 +32,6 @@ Global
                {00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.Build.0 = Debug|x64\r
                {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.ActiveCfg = Release|x64\r
                {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.Build.0 = Release|x64\r
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32\r
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64\r
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
diff --git a/build/win32/vs9/gengir.vcproj b/build/win32/vs9/gengir.vcproj
deleted file mode 100644 (file)
index 000f56d..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="9.00"
-       Name="gengir"
-       ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B15}"
-       RootNamespace="gengir"
-       Keyword="Win32Proj"
-       TargetFrameworkVersion="131072"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-               <Platform
-                       Name="x64"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       InheritedPropertySheets=".\atk-gengir.vsprops"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       ConfigurationType="10"
-                       CharacterSet="2"
-                       DeleteExtensionsOnClean=""
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine="$(DoGenGir)"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Debug|x64"
-                       InheritedPropertySheets=".\atk-gengir.vsprops"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       ConfigurationType="10"
-                       CharacterSet="2"
-                       DeleteExtensionsOnClean=""
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine="$(DoGenGir)"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       InheritedPropertySheets=".\atk-gengir.vsprops"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       ConfigurationType="10"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       DeleteExtensionsOnClean=""
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine="$(DoGenGir)"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|x64"
-                       InheritedPropertySheets=".\atk-gengir.vsprops"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       ConfigurationType="10"
-                       CharacterSet="2"
-                       WholeProgramOptimization="1"
-                       DeleteExtensionsOnClean=""
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               CommandLine="$(DoGenGir)"
-                       />
-               </Configuration>
-       </Configurations>
-</VisualStudioProject>