[gtk+] MSVC Builds: Rework Introspection Build
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] MSVC Builds: Rework Introspection Build
- Date: Mon, 13 Jan 2014 08:05:42 +0000 (UTC)
commit 7115ccd3b04f1c7fe905327f8cbf02add2c2768c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jan 13 16:05:00 2014 +0800
MSVC Builds: Rework Introspection Build
The current approach of building the introspection files for GTK 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.
build/Makefile.am | 7 +
build/gen-file-list-gtk.py | 67 +++++++++
build/gtk-introspection-msvc.mak | 102 ++++++++++++++
build/introspection-msvc.mak | 79 +++++++++++
build/msvcfiles.py | 261 ++++++++++++++++++++++++++++++++++++
build/testsrules_msvc.mak | 72 ++++++++++
build/win32/Makefile.am | 4 -
build/win32/gen-file-list-gtk.py | 140 -------------------
build/win32/gengir_gtk.bat | 180 -------------------------
build/win32/vs10/Makefile.am | 2 -
build/win32/vs10/gengir.vcxproj | 112 ---------------
build/win32/vs10/gtk+.sln | 10 --
build/win32/vs10/gtk-gengir.props | 33 -----
build/win32/vs9/Makefile.am | 2 -
build/win32/vs9/gengir.vcproj | 77 -----------
build/win32/vs9/gtk+.sln | 14 --
build/win32/vs9/gtk-gengir.vsprops | 21 ---
17 files changed, 588 insertions(+), 595 deletions(-)
---
diff --git a/build/Makefile.am b/build/Makefile.am
index 283dce2..817a9d7 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -3,4 +3,11 @@ include $(top_srcdir)/Makefile.decl
SUBDIRS = \
win32
+EXTRA_DIST += \
+ msvcfiles.py \
+ gen-file-list-gtk.py \
+ testsrules_msvc.mak \
+ introspection-msvc.mak \
+ gtk-introspection-msvc.mak
+
-include $(top_srcdir)/git.mk
diff --git a/build/gen-file-list-gtk.py b/build/gen-file-list-gtk.py
new file mode 100644
index 0000000..34a46fd
--- /dev/null
+++ b/build/gen-file-list-gtk.py
@@ -0,0 +1,67 @@
+#!/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_gdk_filelist(srcroot, subdir, dest):
+ vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
+ vars = {},
+ conds = {},
+ filters = ['gdk_public_h_sources', 'gdk_c_sources'])
+
+ vars['gdk_enums'] = 'gdkenumtypes.c gdkenumtypes.h'
+
+ files = vars['gdk_public_h_sources'].split() + \
+ vars['gdk_c_sources'].split() + \
+ vars['gdk_enums'].split()
+
+ sources = [i for i in files if (i != 'gdkkeysyms-compat.h')]
+
+ with open(dest, 'w') as d:
+ for i in sources:
+ d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def gen_filelist_gtk(srcroot, subdir, dest):
+ vars = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'Makefile.am'),
+ vars = {},
+ conds = {'USE_WIN32':True,
+ 'USE_QUARTZ': False,
+ 'USE_X11': False,
+ 'USE_EXTERNAL_ICON_CACHE': False},
+ filters = ['gtkinclude_HEADERS',
+ 'deprecatedinclude_HEADERS',
+ 'gtk_base_c_sources',
+ 'gtk_clipboard_dnd_c_sources'])
+
+ vars['gtk_other_src'] = 'gtkprintoperation-win32.c gtktypebuiltins.h gtktypebuiltins.c'
+
+ files = vars['gtkinclude_HEADERS'].split() + \
+ vars['deprecatedinclude_HEADERS'].split() + \
+ vars['gtk_base_c_sources'].split() + \
+ vars['gtk_clipboard_dnd_c_sources'].split() + \
+ vars['gtk_other_src'].split()
+
+ sources = [i for i in files if not (i.endswith('private.h')) and i != 'gtktextdisplay.h' and i !=
'gtktextlayout.h']
+
+ with open(dest, 'w') as d:
+ for i in sources:
+ d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
+
+def main(argv):
+ srcroot = '..'
+ subdir_gdk = 'gdk'
+ subdir_gtk = 'gtk'
+
+ gen_gdk_filelist(srcroot, subdir_gdk, 'gdk_list')
+ gen_filelist_gtk(srcroot, subdir_gtk, 'gtk_list')
+ return 0
+
+if __name__ == '__main__':
+ sys.exit(main(sys.argv))
diff --git a/build/gtk-introspection-msvc.mak b/build/gtk-introspection-msvc.mak
new file mode 100644
index 0000000..f1b22fd
--- /dev/null
+++ b/build/gtk-introspection-msvc.mak
@@ -0,0 +1,102 @@
+# NMake Makefile to build Introspection Files for ATK
+
+# Change or pass in as a variable/env var if needed
+GDK_DLLNAME = gdk-3-vs$(VSVER)
+GTK_DLLNAME = gtk-3-vs$(VSVER)
+
+# Please do not change anything after this line
+
+!include testsrules_msvc.mak
+
+APIVERSION = 3.0
+
+CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
+
+!if "$(PLAT)" == "x64"
+TIME_T_DEFINE = -Dtime_t=long long
+!else
+TIME_T_DEFINE = -Dtime_t=long
+!endif
+
+!include introspection-msvc.mak
+
+!if "$(BUILD_INTROSPECTION)" == "TRUE"
+all: setgirbuildnev Gdk-$(APIVERSION).gir Gdk-$(APIVERSION).typelib Gtk-$(APIVERSION).gir
Gtk-$(APIVERSION).typelib
+
+gdk_list gtk_list:
+ @-echo Generating Filelist to Introspect for GDK/GTK...
+ $(PYTHON2) gen-file-list-gtk.py
+
+setgirbuildnev:
+ @set CC=$(CC)
+ @set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection
+ @set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\bin;$(PATH);$(MINGWDIR)\bin
+ @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
+ @set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
+
+Gdk-$(APIVERSION).gir: gdk_list
+ @-echo Generating Gdk-$(APIVERSION).gir...
+ $(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk \
+ -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \
+ -I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0 \
+ -I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include \
+ $(TIME_T_DEFINE) --namespace=Gdk --nsversion=3.0 \
+ --include=Gio-2.0 --include=GdkPixbuf-2.0 \
+ --include=Pango-1.0 --include=cairo-1.0 \
+ --no-libtool --library=$(GDK_DLLNAME) \
+ --reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=. \
+ --pkg-export gdk-3.0 --warn-all --c-include="gdk/gdk.h" \
+ -DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION \
+ --filelist=gdk_list -o Gdk-3.0.gir
+
+Gtk-$(APIVERSION).gir: gtk_list
+ $(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gtk -I..\gdk \
+ -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \
+ -I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0 \
+ -I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include \
+ --namespace=Gtk --nsversion=3.0 \
+ --include=Atk-1.0 \
+ --include-uninstalled=./Gdk-$(APIVERSION).gir \
+ --no-libtool --library=$(GTK_DLLNAME) \
+ --reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=. \
+ --pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h" \
+ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\" \
+ $(TIME_T_DEFINE) -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\" \
+ -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.11.4\" \
+ -DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\" \
+ -DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\" \
+ -DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\" \
+ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
+ -DINCLUDE_IM_am_et -DINCLUDE_IM_cedilla -DINCLUDE_IM_cyrillic_translit \
+ -DINCLUDE_IM_ime -DINCLUDE_IM_inuktitut -DINCLUDE_IM_ipa \
+ -DINCLUDE_IM_multipress -DINCLUDE_IM_thai -DINCLUDE_IM_ti_er \
+ -DINCLUDE_IM_ti_et -DINCLUDE_IM_viqr --filelist=gtk_list \
+ -o Gtk-3.0.gir
+
+Gdk-$(APIVERSION).typelib: Gdk-$(APIVERSION).gir
+ @-echo Compiling Gdk-$(APIVERSION).typelib...
+ $(G_IR_COMPILER) --includedir=. --debug --verbose Gdk-$(APIVERSION).gir -o Gdk-$(APIVERSION).typelib
+
+Gtk-$(APIVERSION).typelib: Gtk-$(APIVERSION).gir Gdk-$(APIVERSION).typelib
+ @-echo Compiling Gtk-$(APIVERSION).typelib...
+ $(G_IR_COMPILER) --includedir=. --debug --verbose Gtk-$(APIVERSION).gir -o Gtk-$(APIVERSION).typelib
+
+install-introspection: setgirbuildnev Gdk-$(APIVERSION).gir Gdk-$(APIVERSION).typelib Gtk-$(APIVERSION).gir
Gtk-$(APIVERSION).typelib
+ @-copy Gdk-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
+ @-copy /b Gdk-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
+ @-copy Gtk-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
+ @-copy /b Gtk-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
+
+!else
+all:
+ @-echo $(ERROR_MSG)
+!endif
+
+clean:
+ @-del /f/q Gtk-$(APIVERSION).typelib
+ @-del /f/q Gtk-$(APIVERSION).gir
+ @-del /f/q Gdk-$(APIVERSION).typelib
+ @-del /f/q Gdk-$(APIVERSION).gir
+ @-del /f/q gtk_list
+ @-del /f/q gdk_list
+ @-del /f/q *.pyc
diff --git a/build/introspection-msvc.mak b/build/introspection-msvc.mak
new file mode 100644
index 0000000..beff817
--- /dev/null
+++ b/build/introspection-msvc.mak
@@ -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_TYPELIBDIR = lib\girepository-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_TYPELIBDIR)
+
+# 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
diff --git a/build/msvcfiles.py b/build/msvcfiles.py
new file mode 100644
index 0000000..ca5653d
--- /dev/null
+++ b/build/msvcfiles.py
@@ -0,0 +1,261 @@
+#!/usr/bin/python
+# vim: encoding=utf-8
+#expand *.in files
+import os
+import sys
+import re
+import optparse
+
+def parent_dir(path):
+ if not os.path.isabs(path):
+ path = os.path.abspath(path)
+ if os.path.isfile(path):
+ path = os.path.dirname(path)
+ return os.path.split(path)[0]
+
+def check_output_type (btype):
+ print_bad_type = False
+ output_type = -1
+ if (btype is None):
+ output_type = -1
+ print_bad_type = False
+ elif (btype == "vs9"):
+ output_type = 1
+ elif (btype == "vs10"):
+ output_type = 2
+ elif (btype == "nmake-exe"):
+ output_type = 3
+ else:
+ output_type = -1
+ print_bad_type = True
+ if (output_type == -1):
+ if (print_bad_type is True):
+ print ("The entered output build file type '%s' is not valid" % btype)
+ else:
+ print ("Output build file type is not specified.\nUse -t <type> to specify the output build file
type.")
+ print ("Valid output build file types are: nmake-exe, vs9 , vs10")
+ return output_type
+
+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_VAR_ADD = re.compile(r'^\s*(\w+)\s*\+=(.*)$')
+ RE_AM_CONTINUING = re.compile(r'\\\s*$')
+ RE_AM_IF = re.compile(r'^\s*if\s+(\w+)')
+ RE_AM_IFNOT = 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_IFNOT.search(line)
+ if mo:
+ oldskip.append(skip)
+ skip = False if mo.group(1) not 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:
+ if oldskip:
+ 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
+ mo = RE_AM_VAR_ADD.search(line)
+ if mo:
+ try:
+ cur_vars[mo.group(1)] += ' '
+ except KeyError:
+ cur_vars[mo.group(1)] = ''
+ 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 process_include(src, dest, includes):
+ RE_INCLUDE = re.compile(r'^\s*#include\s+"(.*)"')
+ with open(src, 'r') as s:
+ with open(dest, 'w') as d:
+ for i in s:
+ mo = RE_INCLUDE.search(i)
+ if mo:
+ target = ''
+ for j in includes:
+ #print "searching in ", j
+ if mo.group(1) in os.listdir(j):
+ target = os.path.join(j, mo.group(1))
+ break
+ if not target:
+ raise Exception("Couldn't find include file %s" % mo.group(1))
+ else:
+ with open(target, 'r') as t:
+ for inc in t.readlines():
+ d.write(inc)
+ else:
+ d.write(i)
+
+#Generate the source files listing that is used
+def generate_src_list (srcroot, srcdir, filters_src, filter_conds, filter_c, mk_am_file):
+ mkfile = ''
+ if mk_am_file is None or mk_am_file == '':
+ mkfile = 'Makefile.am'
+ else:
+ mkfile = mk_am_file
+ vars = read_vars_from_AM(os.path.join(srcdir, mkfile),
+ vars = {'top_srcdir': srcroot},
+ conds = filter_conds,
+ filters = filters_src)
+ files = []
+ for src_filters_item in filters_src:
+ files += vars[src_filters_item].split()
+ if filter_c is True:
+ sources = [i for i in files if i.endswith('.c') ]
+ return sources
+ else:
+ return files
+
+# Generate the Visual Studio 2008 Project Files from the templates
+def gen_vs9_project (projname, srcroot, srcdir_name, sources_list):
+ vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
+
+ with open (os.path.join (vs_file_list_dir,
+ projname + '.sourcefiles'), 'w') as vs9srclist:
+ for i in sources_list:
+ vs9srclist.write ('\t\t\t<File RelativePath="..\\..\\..\\' + srcdir_name + '\\' + i.replace('/',
'\\') + '" />\n')
+
+ process_include (os.path.join(srcroot, 'build', 'win32', 'vs9', projname + '.vcprojin'),
+ os.path.join(srcroot, 'build', 'win32', 'vs9', projname + '.vcproj'),
+ includes = [vs_file_list_dir])
+
+ os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.sourcefiles'))
+
+# Generate the Visual Studio 2010 Project Files from the templates
+def gen_vs10_project (projname, srcroot, srcdir_name, sources_list):
+ vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
+
+ with open (os.path.join (vs_file_list_dir,
+ projname + '.vs10.sourcefiles'), 'w') as vs10srclist:
+ for j in sources_list:
+ vs10srclist.write (' <ClCompile Include="..\\..\\..\\' + srcdir_name + '\\' + j.replace('/',
'\\') + '" />\n')
+
+ with open (os.path.join (vs_file_list_dir,
+ projname + '.vs10.sourcefiles.filters'), 'w') as vs10srclist_filter:
+ for k in sources_list:
+ vs10srclist_filter.write (' <ClCompile Include="..\\..\\..\\' + srcdir_name + '\\' +
k.replace('/', '\\') + '"><Filter>Source Files</Filter></ClCompile>\n')
+
+ process_include (os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxprojin'),
+ os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj'),
+ includes = [vs_file_list_dir])
+ process_include (os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj.filtersin'),
+ os.path.join(srcroot, 'build', 'win32', 'vs10', projname + '.vcxproj.filters'),
+ includes = [vs_file_list_dir])
+
+ os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.vs10.sourcefiles'))
+ os.unlink(os.path.join(srcroot, 'build', 'win32', projname + '.vs10.sourcefiles.filters'))
+
+def gen_vs_inst_list (projname, srcroot, srcdirs, inst_lists, destdir_names, isVS9):
+ vs_file_list_dir = os.path.join (srcroot, 'build', 'win32')
+ vsver = ''
+ vsprops_line_ending = ''
+ vsprops_file_ext = ''
+ if isVS9 is True:
+ vsver = '9'
+ vsprops_line_ending = '
\n'
+ vsprops_file_ext = '.vsprops'
+ else:
+ vsver = '10'
+ vsprops_line_ending = '\n\n'
+ vsprops_file_ext = '.props'
+
+ with open (os.path.join (vs_file_list_dir,
+ projname + '.vs' + vsver + 'instfiles'), 'w') as vsinstlist:
+
+ for file_list, srcdir, dir_name in zip (inst_lists, srcdirs, destdir_names):
+ for i in file_list:
+ vsinstlist.write ('copy ..\\..\\..\\' +
+ srcdir + '\\' +
+ i.replace ('/', '\\') +
+ ' $(CopyDir)\\' +
+ dir_name +
+ vsprops_line_ending)
+ process_include (os.path.join(srcroot, 'build', 'win32', 'vs' + vsver, projname + '-install' +
vsprops_file_ext + 'in'),
+ os.path.join(srcroot, 'build', 'win32', 'vs' + vsver, projname + '-install' +
vsprops_file_ext),
+ includes = [vs_file_list_dir])
+
+ os.unlink(os.path.join (vs_file_list_dir, projname + '.vs' + vsver + 'instfiles'))
+
+def generate_nmake_makefiles(srcroot, srcdir, base_name, makefile_name, progs_list):
+ file_list_dir = os.path.join (srcroot, 'build', 'win32')
+
+ with open (os.path.join (file_list_dir,
+ base_name + '_progs'), 'w') as proglist:
+ for i in progs_list:
+ proglist.write ('\t' + i + '$(EXEEXT)\t\\\n')
+
+
+ process_include (os.path.join(srcdir, makefile_name + 'in'),
+ os.path.join(srcdir, makefile_name),
+ includes = [file_list_dir])
+
+ os.unlink(os.path.join (file_list_dir, base_name + '_progs'))
+
diff --git a/build/testsrules_msvc.mak b/build/testsrules_msvc.mak
new file mode 100644
index 0000000..06c908e
--- /dev/null
+++ b/build/testsrules_msvc.mak
@@ -0,0 +1,72 @@
+# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
+# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
+!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR)
+MSG = ^
+This Makefile is only for Visual Studio 2008 and later.^
+You need to ensure that the Visual Studio Environment is properly set up^
+before running this Makefile.
+!error $(MSG)
+!endif
+
+ERRNUL = 2>NUL
+_HASH=^#
+
+!if ![echo VCVERSION=_MSC_VER > vercl.x] \
+ && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \
+ && ![echo PLAT=Win32 >> vercl.x] \
+ && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
+ && ![echo PLAT=x64 >> vercl.x] \
+ && ![echo $(_HASH)endif >> vercl.x] \
+ && ![cl -nologo -TC -P vercl.x $(ERRNUL)]
+!include vercl.i
+!if ![echo VCVER= ^\> vercl.vc] \
+ && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
+!include vercl.vc
+!endif
+!endif
+!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
+!endif
+
+!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600
+VSVER = 9
+!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700
+VSVER = 10
+!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800
+VSVER = 11
+!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
+VSVER = 12
+!else
+VSVER = 0
+!endif
+
+!if "$(VSVER)" == "0"
+MSG = ^
+This NMake Makefile set supports Visual Studio^
+9 (2008) through 12 (2013). Your Visual Studio^
+version is not supported.
+!error $(MSG)
+!endif
+
+VALID_CFGSET = FALSE
+!if "$(CFG)" == "release" || "$(CFG)" == "debug"
+VALID_CFGSET = TRUE
+!endif
+
+!if "$(CFG)" == "release"
+CFLAGS_ADD = /MD /O2
+!else
+CFLAGS_ADD = /MDd /Od /Zi
+!endif
+
+!if "$(PLAT)" == "x64"
+LDFLAGS_ARCH = /machine:x64
+!else
+LDFLAGS_ARCH = /machine:x86
+!endif
+
+LD = link.exe
+LD_CFLAGS = /link
+EXEEXT = .exe
+GLIB_LIBS = gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib
+
+ATK_API_VERSION = 1.0
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index a61119f..0cc71e8 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -5,8 +5,4 @@ SUBDIRS = \
vs9 \
vs10
-EXTRA_DIST += \
- gen-file-list-gtk.py \
- gengir_gtk.bat
-
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 4aa7593..6f0c383 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_DIST += \
gtka11y.vcxproj.filtersin \
gailutil.vcxproj \
gailutil.vcxproj.filters \
- gengir.vcxproj \
install.vcxproj \
broadwayd.vcxproj \
broadwayd.vcxproj.filters \
@@ -33,7 +32,6 @@ EXTRA_DIST += \
gtk-build-defines.props \
gtk-copy-gdk-broadway.props \
gtk-gen-srcs.props \
- gtk-gengir.props \
gtk-ignore-broadway.props \
gtk-install.props \
gtk-version-paths.props
diff --git a/build/win32/vs10/gtk+.sln b/build/win32/vs10/gtk+.sln
index 41d48f9..505c6a3 100644
--- a/build/win32/vs10/gtk+.sln
+++ b/build/win32/vs10/gtk+.sln
@@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxpro
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj",
"{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcxproj",
"{2093D218-190E-4194-9421-3BA7CBF33B15}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -204,14 +202,6 @@ Global
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.Build.0 = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|x64.ActiveCfg = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|Win32.ActiveCfg = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|x64.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 482a72c..47eb506 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -14,14 +14,12 @@ EXTRA_DIST += \
gtka11y.vcproj \
gtka11y.vcprojin \
gailutil.vcproj \
- gengir.vcproj \
install.vcproj \
broadwayd.vcproj \
gdk-broadway.vcproj \
gtk-build-defines.vsprops \
gtk-copy-gdk-broadway.vsprops \
gtk-gen-srcs.vsprops \
- gtk-gengir.vsprops \
gtk-ignore-broadway.vsprops \
gtk-install.vsprops \
gtk-version-paths.vsprops
diff --git a/build/win32/vs9/gtk+.sln b/build/win32/vs9/gtk+.sln
index daf09a9..164b76d 100644
--- a/build/win32/vs9/gtk+.sln
+++ b/build/win32/vs9/gtk+.sln
@@ -62,12 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
{3281202A-CD26-4C67-B892-EB34BDBC6130} = {3281202A-CD26-4C67-B892-EB34BDBC6130}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcproj",
"{2093D218-190E-4194-9421-3BA7CBF33B15}"
- ProjectSection(ProjectDependencies) = postProject
- {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
- {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -240,14 +234,6 @@ Global
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.Build.0 = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_Broadway|x64.ActiveCfg = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|Win32.ActiveCfg = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_Broadway|x64.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
