diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-08-17 19:18:03 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-08-17 19:18:03 +0800 |
commit | 40a190520714a4cc91bf387a43f031fe3695bef5 (patch) | |
tree | b8d89ef1f02ab0f5aecd0fe7e2a9ad59a33c1e0d | |
parent | aea7809f55ac520b9d2d5d9c1eea1345fabbd7a7 (diff) | |
download | gtk+-40a190520714a4cc91bf387a43f031fe3695bef5.tar.gz |
Revert "MSVC Introspection Builds: Remove GCC Requirement"
This reverts commit aea7809f55ac520b9d2d5d9c1eea1345fabbd7a7.
-rw-r--r-- | build/gtk-introspection-msvc.mak | 101 | ||||
-rw-r--r-- | build/introspection-msvc.mak | 16 |
2 files changed, 15 insertions, 102 deletions
diff --git a/build/gtk-introspection-msvc.mak b/build/gtk-introspection-msvc.mak deleted file mode 100644 index 75e04bfff1..0000000000 --- a/build/gtk-introspection-msvc.mak +++ /dev/null @@ -1,101 +0,0 @@ -# NMake Makefile to build Introspection Files for GTK+ - -!include detectenv_msvc.mak - -APIVERSION = 3.0 - -CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0 - -built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir -built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib - -!include introspection-msvc.mak - -!if "$(BUILD_INTROSPECTION)" == "TRUE" -all: setgirbuildnev $(built_install_girs) $(built_install_typelibs) - -gdk_list gdkwin32_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) - @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-3.0 \ - --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 $@ - -GdkWin32-$(APIVERSION).gir: gdkwin32_list - @-echo Generating GdkWin32-$(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 \ - --namespace=GdkWin32 --nsversion=3.0 \ - --include=Gio-2.0 --include=GdkPixbuf-2.0 \ - --include=Pango-1.0 --include-uninstalled=./Gdk-$(APIVERSION).gir \ - --no-libtool --library=gdk-3.0 \ - --reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=. \ - --pkg-export gdk-win32-3.0 --warn-all --c-include="gdk/gdkwin32.h" \ - -DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION \ - --filelist=gdkwin32_list -o $@ - -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-3.0 --library=gdk-3.0 \ - --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\" \ - -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\" \ - -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.16.6\" \ - -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 $@ - -$(built_install_typelibs): $(built_install_girs) - @-echo Compiling $*.typelib... - @-$(G_IR_COMPILER) --includedir=. --debug --verbose $*.gir -o $@ - -install-introspection: setgirbuildnev $(built_install_girs) $(built_install_typelibs) - @-copy *.gir $(G_IR_INCLUDEDIR) - @-copy /b *.typelib $(G_IR_TYPELIBDIR) - -!else -all: - @-echo $(ERROR_MSG) -!endif - -clean: - @-del /f/q *.typelib - @-del /f/q *.gir - @-del /f/q gtk_list - @-del /f/q gdkwin32_list - @-del /f/q gdk_list - @-del /f/q *.pyc diff --git a/build/introspection-msvc.mak b/build/introspection-msvc.mak index 55eec4574d..beff817d00 100644 --- a/build/introspection-msvc.mak +++ b/build/introspection-msvc.mak @@ -26,6 +26,7 @@ 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 = @@ -46,7 +47,15 @@ VALID_PKG_CONFIG_PATH = TRUE VALID_PKG_CONFIG_PATH = FALSE !endif -!if ![del $(ERRNUL) /q/f pkgconfig.chksize] +!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 @@ -54,6 +63,11 @@ VALID_CFGSET = FALSE 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) |