From 4875fa95dadc4e3f0459f4cdb3816f4ca2ed5429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Pi=C3=B1eiro?= Date: Tue, 17 Apr 2018 11:45:57 +0200 Subject: win32: remove specific win32 build configuration files Meson+ninja has been working fine for a while. It would be better to just keep one. v2: remove config.h.win32 too https://bugzilla.gnome.org/show_bug.cgi?id=795315 --- config.h.win32.in | 107 --------------- win32/Makefile-newvs.am | 55 -------- win32/Makefile.am | 37 ----- win32/Makefile.msvc-introspection | 129 ----------------- win32/Makefile.msvcproj | 153 --------------------- win32/atk-introspection-msvc.mak | 33 ----- win32/atkpc.py | 31 ----- win32/detectenv-msvc.mak | 78 ----------- win32/introspection-msvc.mak | 94 ------------- win32/pc_base.py | 124 ----------------- win32/replace.py | 115 ---------------- win32/vs10/.gitignore | 3 - win32/vs10/Makefile.am | 28 ---- win32/vs10/README.txt | 109 --------------- win32/vs10/atk-build-defines.props | 47 ------- win32/vs10/atk-gen-src.props | 39 ------ win32/vs10/atk-install.propsin | 42 ------ win32/vs10/atk-install.vcxproj | 117 ---------------- win32/vs10/atk-install.vcxproj.filters | 13 -- win32/vs10/atk-introspect.vcxproj | 103 -------------- win32/vs10/atk-version-paths.props.in | 79 ----------- win32/vs10/atk.sln | 42 ------ win32/vs10/atk.vcxproj.filtersin | 29 ---- win32/vs10/atk.vcxprojin | 181 ------------------------ win32/vs11/Makefile.am | 23 ---- win32/vs12/Makefile.am | 23 ---- win32/vs14/Makefile.am | 23 ---- win32/vs15/Makefile.am | 24 ---- win32/vs9/.gitignore | 2 - win32/vs9/Makefile.am | 21 --- win32/vs9/README.txt | 109 --------------- win32/vs9/atk-build-defines.vsprops | 34 ----- win32/vs9/atk-gen-src.vsprops | 34 ----- win32/vs9/atk-install.vcproj | 122 ----------------- win32/vs9/atk-install.vspropsin | 34 ----- win32/vs9/atk-introspect.vcproj | 76 ----------- win32/vs9/atk-version-paths.vsprops.in | 77 ----------- win32/vs9/atk.sln | 49 ------- win32/vs9/atk.vcprojin | 243 --------------------------------- 39 files changed, 2682 deletions(-) delete mode 100644 config.h.win32.in delete mode 100644 win32/Makefile-newvs.am delete mode 100644 win32/Makefile.am delete mode 100644 win32/Makefile.msvc-introspection delete mode 100644 win32/Makefile.msvcproj delete mode 100644 win32/atk-introspection-msvc.mak delete mode 100644 win32/atkpc.py delete mode 100644 win32/detectenv-msvc.mak delete mode 100644 win32/introspection-msvc.mak delete mode 100644 win32/pc_base.py delete mode 100644 win32/replace.py delete mode 100644 win32/vs10/.gitignore delete mode 100644 win32/vs10/Makefile.am delete mode 100644 win32/vs10/README.txt delete mode 100644 win32/vs10/atk-build-defines.props delete mode 100644 win32/vs10/atk-gen-src.props delete mode 100644 win32/vs10/atk-install.propsin delete mode 100644 win32/vs10/atk-install.vcxproj delete mode 100644 win32/vs10/atk-install.vcxproj.filters delete mode 100644 win32/vs10/atk-introspect.vcxproj delete mode 100644 win32/vs10/atk-version-paths.props.in delete mode 100644 win32/vs10/atk.sln delete mode 100644 win32/vs10/atk.vcxproj.filtersin delete mode 100644 win32/vs10/atk.vcxprojin delete mode 100644 win32/vs11/Makefile.am delete mode 100644 win32/vs12/Makefile.am delete mode 100644 win32/vs14/Makefile.am delete mode 100644 win32/vs15/Makefile.am delete mode 100644 win32/vs9/.gitignore delete mode 100644 win32/vs9/Makefile.am delete mode 100644 win32/vs9/README.txt delete mode 100644 win32/vs9/atk-build-defines.vsprops delete mode 100644 win32/vs9/atk-gen-src.vsprops delete mode 100644 win32/vs9/atk-install.vcproj delete mode 100644 win32/vs9/atk-install.vspropsin delete mode 100644 win32/vs9/atk-introspect.vcproj delete mode 100644 win32/vs9/atk-version-paths.vsprops.in delete mode 100644 win32/vs9/atk.sln delete mode 100644 win32/vs9/atk.vcprojin diff --git a/config.h.win32.in b/config.h.win32.in deleted file mode 100644 index d815b58..0000000 --- a/config.h.win32.in +++ /dev/null @@ -1,107 +0,0 @@ -/* config.h.win32.in Hand written to suit the MSVC/MinGW compilers */ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* always defined to indicate that i18n is enabled */ -#define ENABLE_NLS 1 - -/* Define the gettext package to be used */ -#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" - -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 - -/* Define to 1 if you have the `dcgettext' function. */ -#define HAVE_DCGETTEXT 1 - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_DLFCN_H*/ - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#define HAVE_GETTEXT 1 - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_INTTYPES_H 1 -#else -/* #undef HAVE_INTTYPES_H */ -#endif - -/* Define if your file defines LC_MESSAGES. */ -/*#undef HAVE_LC_MESSAGES*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -#ifdef _MSC_VER -#if (_MSC_VER >= 1600) -#define HAVE_STDINT_H 1 -#else -/* #undef HAVE_STDINT_H */ -#endif -#else /*not MSVC*/ -#define HAVE_STDINT_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_STRINGS_H*/ - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_UNISTD_H 1 -#else -/* #undef HAVE_UNISTD_H */ -#endif - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "ATK" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=atk" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "atk" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "atk @ATK_MAJOR_VERSION@.@ATK_MINOR_VERSION@.@ATK_MICRO_VERSION@" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "atk" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "http://www.gtk.org/" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "@ATK_MAJOR_VERSION@.@ATK_MINOR_VERSION@.@ATK_MICRO_VERSION@" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -#define VERSION "@ATK_MAJOR_VERSION@.@ATK_MINOR_VERSION@.@ATK_MICRO_VERSION@" - -/* defines how to decorate public symbols while building */ -#ifdef _MSC_VER -#define _ATK_EXTERN __declspec (dllexport) extern -#else -#define _ATK_EXTERN __attribute__((visibility("default"))) __declspec (dllexport) extern -#endif diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am deleted file mode 100644 index 3a91862..0000000 --- a/win32/Makefile-newvs.am +++ /dev/null @@ -1,55 +0,0 @@ -# Centralized autotools file -# Create the Visual Studio 2012/2013/2015 project files -# from the Visual Studio 2010 project files - -# This autotools file, from GLib, can be used in other projects -# that have Visual Studio build support. - -# Author: Fan, Chun-wei -# November 05, 2012 - -# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013) -# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15) -# MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning v$(MSVC_BASE_TOOLSET) -# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on) -# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017) -# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET) - -if MSVC_BASE_NO_TOOLSET_SET -MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0 -endif - -if MSVC_NO_TOOLSET_SET -MSVC_TOOLSET = $(MSVC_VER)0 -endif - -%.sln: - sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - -%.txt: - sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@ - rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp - -%.vcxproj: - if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ - sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - fi - -%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile - if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ - sed 's/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - else \ - sed 's/$(MSVC_BASE_VER)<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - fi - -%.vcxproj.filters: - if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ - cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - else \ - cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ - fi diff --git a/win32/Makefile.am b/win32/Makefile.am deleted file mode 100644 index 7d333d0..0000000 --- a/win32/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -if HAVE_INTROSPECTION -GENERATED_ITEMS = \ - introspection.body.mak \ - Atk_1_0_gir_list - -introspection.body.mak: Atk-1.0.gir.msvc.introspect - -$(RM) introspection.body.mak - for F in `ls *.msvc.introspect`; do \ - case $$F in \ - *) cat $(top_builddir)/win32/$$F >>$@ \ - ;; \ - esac; \ - done - $(RM) Atk-1.0.gir.msvc.introspect - -DISTCLEANFILES = $(GENERATED_ITEMS) - -else -GENERATED_ITEMS = -endif - -SUBDIRS = \ - vs9 \ - vs10 \ - vs11 \ - vs12 \ - vs14 \ - vs15 - -EXTRA_DIST = \ - detectenv-msvc.mak \ - introspection-msvc.mak \ - atk-introspection-msvc.mak \ - atkpc.py \ - pc_base.py \ - replace.py \ - $(GENERATED_ITEMS) diff --git a/win32/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection deleted file mode 100644 index 1a244e0..0000000 --- a/win32/Makefile.msvc-introspection +++ /dev/null @@ -1,129 +0,0 @@ -# Author: Fan, Chun-wei -# Common autotools file for constructing the g-ir-scanner and -# g-ir-compiler command lines for Visual Studio builds. - -# This is copied from $(srcroot)/win32 from the gobject-introspection -# project, which may be included in projects that support both -# Visual Studio builds and introspection. - -# * Input variables: -# -# MSVC_INTROSPECT_GIRS - List of .gir's that should be built -# in the NMake Makefiles -# -# * Simple tutorial -# -# Add this to Makefile.am where your library/program is built: -# (Either YourLib_1_0_gir_MSVC_LIBS or YourLib_1_0_gir_MSVC_PROGRAM -# is required unless --headers-only is specified in -# YourLib_1_0_gir__MSVC_SCANNERFLAGS) -# -# include -# MSVC_INTROSPECT_GIRS = YourLib-1.0.gir -# YourLib_1_0_gir_NAMESPACE = YourLib # This is optional -# YourLib_1_0_gir_VERSION = 1.0 # This is optional -# YourLib_1_0_gir_MSVC_LIBS = yourlib-1.0 -# YourLib_1_0_gir_MSVC_FILES = $(libyourlib_1_0_SOURCES) -# YourLib_1_0_gir_MSVC_PROGRAM = YourProgram -# YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files) -# YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's) -# YourLib_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir) -# YourLib_1_0_gir_MSVC_C_INCLUDES = (List of public C headers which need to be included by -# consumers at compile time to make use of the API) - -# Private functions - -## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable -## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 -_gir_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) - -# Namespace and Version is either fetched from the gir filename -# or the _NAMESPACE/_VERSION variable combo -_gir_namespace_msvc = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1))))) -_gir_version_msvc = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=)))) -_typelib_basename_msvc = $(_gir_namespace_msvc)'-'$(_gir_version_msvc) - -# _PROGRAM is an optional variable which needs its own --program argument -_gir_program_msvc = $(if $($(_gir_name)_MSVC_PROGRAM),--program=$($(_gir_name)_MSVC_PROGRAM)) - -# Deduce the sub-folder from $(srcroot) where the sources reside in -_gir_source_path_raw_msvc:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) -_gir_source_path_msvc=$(subst /,\\,$(_gir_source_path_raw_msvc)) -_gir_source_subdir_int_msvc=$(subst \\\\,\\,\\$(_gir_source_path_msvc)\\) -_gir_source_subdir_msvc=$(subst \\.\\,\\,$(_gir_source_subdir_int_msvc)) - -_gir_files_raw_msvc=$(subst /,\\,$($(_gir_name)_MSVC_FILES)) -_gir_files_msvc=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_gir_source_path_msvc)\\,\\,$(_gir_files_raw_msvc)))) - -# Create a list of items for: -# - Libraries -# - Packages -# - GIRs to include -# - packages to export - -_gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib)) -_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg)) -_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include)) -_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg)) -_gir_c_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_C_INCLUDES),--c-include=$(include)) - -# -# Create NMake Makefile Sections for Building Introspection files -# from autotools files -# $(1) - File Name of the .gir that is to be generated -# - -define gir-nmake-builder - -# Basic sanity check, to make sure required variables are set -$(if $($(_gir_name)_MSVC_FILES),,$(error Need to define $(_gir_name)_MSVC_FILES)) -$(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)), - $($(_gir_name)_MSVC_LIBS), - $($(_gir_name)_MSVC_PROGRAM)),, - $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM)) - -$(top_builddir)/win32/$(_gir_name)_list: - for F in $(_gir_files_msvc); do \ - case $$$$F in \ - *.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \ - echo '..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \ - ;; \ - esac; \ - done - -$(top_builddir)/win32/$(1).msvc.introspect: - -$(RM) $(top_builddir)/win32/$(1).msvc.introspect - -# Assemble the Command to Run g-ir-scanner - echo $(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' @-echo Generating $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --verbose -no-libtool \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(_gir_c_includes_msvc)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --cflags-begin \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --cflags-end \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect - echo '' >>$(top_builddir)/win32/$(1).msvc.introspect - -# Finally Assemble the Command to Compile the generated .gir - echo '$(_typelib_basename_msvc).typelib: '$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' '$(1)' \'>>$(top_builddir)/win32/$(1).msvc.introspect - echo ' -o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect - echo '' >>$(top_builddir)/win32/$(1).msvc.introspect -endef - -$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir)))) diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj deleted file mode 100644 index fe15b8d..0000000 --- a/win32/Makefile.msvcproj +++ /dev/null @@ -1,153 +0,0 @@ -# Author: Fan, Chun-wei -# Common Autotools file used to generate Visual Studio 2008+ -# Projects from their templates - -# This autotools file, from GLib, can be used in other projects -# that have Visual Studio build support. - -# * Input variables: -# -# MSVCPROJS - List of Projects that should be generated -# -# * Simple tutorial -# -# Add this to Makefile.am where your library/program is built: -# include $(top_srcdir)/Makefile.msvcproj -# MSVCPROJS = YourProject (can be multiple projects in a single srcdir) -# YourProject_FILES = $(libyourlib_1_0_SOURCES) -# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none -# (the following 3 lines if headers need to be installed) -# YourProject_HEADERS_DIR = $(libyourlibincludedir) -# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS) -# YourProject_HEADERS_EXCLUDES = ... # -# -# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) -# $(top_builddir)/win32/vs9/YourProject.vcproj \ -# $(top_builddir)/win32/vs9/YourProject.headers # if headers need to be installed -# -# --or, if Visual Studio 2013 or later is required-- -# dist-hook: \ # (or add to it if it is already there, this does -not- call other vs items in the process) -# $(top_builddir)/win32/vs12/YourProject.vcxproj \ -# $(top_builddir)/win32/vs12/YourProject.vs12.headers # if headers need to be installed - -# Private functions - -## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable -## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 -_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) -_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) -_proj_path=$(subst /,\\,$(_proj_path_raw)) -_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\) -_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int)) - -_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES)) -_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw)))) -_proj_filters=$($(_proj_name)_EXCLUDES) - -_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST)) -_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw)))) -_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES) - -_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR)) -_headers_destdir=$(subst /,\\,$(_headers_dest_posix)) - -# -# Creates Visual Studio 2008/2010 projects from items passed in from autotools files -# $(1) - Base Name of the MSVC project files (outputs) -# - -define msvcproj-builder - -$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj -$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj -$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj -$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj - -$(top_builddir)/win32/vs9/$(1).vcproj: Makefile - -$(RM) $(top_builddir)/win32/vs9/$(1).vcproj - -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters - -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters - -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters - -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters - - - for F in $(_proj_files); do \ - case $$$$F in \ - $(_proj_filters)) \ - ;; \ - *.c|*.cpp|*.cc|*.cxx) \ - echo ' ' >>$(1).sourcefiles && \ - echo ' ' >>$(1).vs10.sourcefiles && \ - echo ' Source Files' >>$(1).vs10.sourcefiles.filters \ - ;; \ - esac; \ - done - - - $(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj - $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj - $(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs10/$(1).vcxproj.filters - $(RM) $(1).sourcefiles - $(RM) $(1).vs10.sourcefiles - $(RM) $(1).vs10.sourcefiles.filters - -$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers - -$(top_builddir)/win32/vs9/$(1).headers: Makefile - -$(RM) $(top_builddir)/win32/vs9/$(1).headers - -$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers - - for F in $(_proj_headers); do \ - case $$$$F in \ - $(_proj_headers_excludes)) \ - ;; \ - *.h|*.hpp|*.hh|*.hxx) \ - echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F' ' >>$(top_builddir)/win32/vs9/$(1).headers && \ - echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \ - ;; \ - esac; \ - done - -$(top_builddir)/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/win32/vs12/$(1).vcxproj - -$(top_builddir)/win32/vs12/$(1).vcxproj: Makefile - -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj - -$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters - - for F in $(_proj_files); do \ - case $$$$F in \ - $(_proj_filters)) \ - ;; \ - *.c|*.cpp|*.cc|*.cxx) \ - echo ' ' >>$(1).vs12.sourcefiles && \ - echo ' Source Files' >>$(1).vs12.sourcefiles.filters \ - ;; \ - esac; \ - done - - $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxprojin >$(top_builddir)/win32/vs12/$(1).vcxproj - $(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs12/$(1).vcxproj.filters - $(RM) $(1).vs12.sourcefiles - $(RM) $(1).vs12.sourcefiles.filters - -$(top_builddir)/win32/vs12/$(1).vs12.headers: Makefile - -$(RM) $(top_builddir)/win32/vs12/$(1).vs12.headers - - for F in $(_proj_headers); do \ - case $$$$F in \ - $(_proj_headers_excludes)) \ - ;; \ - *.h|*.hpp|*.hh|*.hxx) \ - echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs12/$(1).vs12.headers \ - ;; \ - esac; \ - done - -endef - -$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff --git a/win32/atk-introspection-msvc.mak b/win32/atk-introspection-msvc.mak deleted file mode 100644 index 6bac289..0000000 --- a/win32/atk-introspection-msvc.mak +++ /dev/null @@ -1,33 +0,0 @@ -# NMake Makefile to build Introspection Files for ATK - -!include detectenv-msvc.mak - -APIVERSION = 1.0 - -CHECK_PACKAGE = gobject-2.0 - -!include introspection-msvc.mak - -!if "$(BUILD_INTROSPECTION)" == "TRUE" -all: setgirbuildenv Atk-$(APIVERSION).gir Atk-$(APIVERSION).typelib - -setgirbuildenv: - @-set PYTHONPATH=$(PREFIX)\lib\gobject-introspection - @-set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH) - @-set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) - @-set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) - -!include introspection.body.mak - -install-introspection: all - @-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 diff --git a/win32/atkpc.py b/win32/atkpc.py deleted file mode 100644 index 3515a45..0000000 --- a/win32/atkpc.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/python -# -# Utility script to generate .pc files for ATK -# for Visual Studio builds, to be used for -# building introspection files - -# Author: Fan, Chun-wei -# Date: April 20, 2016 - -import os -import sys - -from replace import replace_multi -from pc_base import BasePCItems - -def main(argv): - base_pc = BasePCItems() - - base_pc.setup(argv) - pkg_replace_items = {'@GLIB_PACKAGES@': 'gobject-2.0 glib-2.0', - '@ATK_API_VERSION@': '1.0'} - - pkg_replace_items.update(base_pc.base_replace_items) - - # Generate atk.pc - replace_multi(base_pc.top_srcdir + '/atk.pc.in', - base_pc.srcdir + '/atk.pc', - pkg_replace_items) - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak deleted file mode 100644 index 6fd96cc..0000000 --- a/win32/detectenv-msvc.mak +++ /dev/null @@ -1,78 +0,0 @@ -# Common NMake Makefile module for checking the build environment -# This can be copied from $(glib_srcroot)\build\win32 for GNOME items -# that support MSVC builds and introspection under MSVC, and can be used -# for building test programs as well. - -# 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 -!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910 -VSVER = 14 -!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000 -VSVER = 15 -!else -VSVER = 0 -!endif - -!if "$(VSVER)" == "0" -MSG = ^ -This NMake Makefile set supports Visual Studio^ -9 (2008) through 14 (2015). Your Visual Studio^ -version is not supported. -!error $(MSG) -!endif - -VALID_CFGSET = FALSE -!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug" -VALID_CFGSET = TRUE -!endif - -# We want debugging symbols logged for all builds, -# using .pdb files for release builds -CFLAGS_BASE = /Zi - -!if "$(CFG)" == "release" || "$(CFG)" == "Release" -CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE) -!else -CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE) -!endif - -!if "$(PLAT)" == "x64" -LDFLAGS_ARCH = /machine:x64 -!else -LDFLAGS_ARCH = /machine:x86 -!endif diff --git a/win32/introspection-msvc.mak b/win32/introspection-msvc.mak deleted file mode 100644 index 26501f5..0000000 --- a/win32/introspection-msvc.mak +++ /dev/null @@ -1,94 +0,0 @@ -# Common NMake Makefile module for checking the build environment is sane -# for building introspection files under MSVC/NMake. -# This can be copied from $(gi_srcroot)\build\win32 for GNOME items -# that support MSVC builds and introspection under MSVC. - -# 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 - -!if "$(PREFIX)" == "" -PREFIX = ..\..\vs$(VSVER)\$(PLAT) -!endif - -!if ![setlocal] && \ - ![set PFX=$(PREFIX)] && \ - ![for %P in (%PFX%) do @echo PREFIX_FULL=%~dpnfP > pfx.x] -!endif -!include pfx.x - -!if "$(PKG_CONFIG_PATH)" == "" -PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig -!else -PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig;$(PKG_CONFIG_PATH) -!endif - -!if ![del $(ERRNUL) /q/f pfx.x] -!endif - -# Note: The PYTHON must be the Python release series that was used to build -# the GObject-introspection scanner Python module! -# Either having python.exe your PATH will work or passing in -# PYTHON= will do - -# This is required, and gobject-introspection needs to be built -# before this can be successfully run. -!if "$(PYTHON)" == "" -PYTHON=python -!endif - -# Path to the pkg-config tool, if not already in the PATH -!if "$(PKG_CONFIG)" == "" -PKG_CONFIG=pkg-config -!endif - -# Don't change anything following this line! - -GIR_SUBDIR = share\gir-1.0 -GIR_TYPELIBDIR = lib\girepository-1.0 -G_IR_SCANNER = $(PREFIX)\bin\g-ir-scanner -G_IR_COMPILER = $(PREFIX)\bin\g-ir-compiler.exe -G_IR_INCLUDEDIR = $(PREFIX)\$(GIR_SUBDIR) -G_IR_TYPELIBDIR = $(PREFIX)\$(GIR_TYPELIBDIR) - -VALID_PKG_CONFIG_PATH = FALSE - -MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH -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 ![set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)] \ - && ![$(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 ![del $(ERRNUL) /q/f pkgconfig.chksize] -!endif - -VALID_CFGSET = FALSE -!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug" -VALID_CFGSET = TRUE -!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/win32/pc_base.py b/win32/pc_base.py deleted file mode 100644 index 285b6cd..0000000 --- a/win32/pc_base.py +++ /dev/null @@ -1,124 +0,0 @@ -#!/usr/bin/python -# -# Simple utility script to generate the basic info -# needed in a .pc (pkg-config) file, used especially -# for introspection purposes - -# This can be used in various projects where -# there is the need to generate .pc files, -# and is copied from GLib's $(srcroot)/build/win32 - -# Author: Fan, Chun-wei -# Date: March 10, 2016 - -import os -import sys -import argparse - -class BasePCItems: - def __init__(self): - self.base_replace_items = {} - self.exec_prefix = '' - self.includedir = '' - self.libdir = '' - self.prefix = '' - self.srcdir = os.path.dirname(__file__) - self.top_srcdir = self.srcdir + '\\..' - self.version = '' - - def setup(self, argv, parser=None): - if parser is None: - parser = argparse.ArgumentParser(description='Setup basic .pc file info') - parser.add_argument('--prefix', help='prefix of the installed library', - required=True) - parser.add_argument('--exec-prefix', - help='prefix of the installed programs, \ - if different from the prefix') - parser.add_argument('--includedir', - help='includedir of the installed library, \ - if different from ${prefix}/include') - parser.add_argument('--libdir', - help='libdir of the installed library, \ - if different from ${prefix}/lib') - parser.add_argument('--version', help='Version of the package', - required=True) - args = parser.parse_args() - - self.version = args.version - - # check whether the prefix and exec_prefix are valid - if not os.path.exists(args.prefix): - raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix) - - # use absolute paths for prefix - self.prefix = os.path.abspath(args.prefix).replace('\\','/') - - # check and setup the exec_prefix - if getattr(args, 'exec_prefix', None) is None: - exec_prefix_use_shorthand = True - self.exec_prefix = '${prefix}' - else: - if args.exec_prefix.startswith('${prefix}'): - exec_prefix_use_shorthand = True - input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):] - else: - exec_prefix_use_shorthand = False - input_exec_prefix = args.exec_prefix - if not os.path.exists(input_exec_prefix): - raise SystemExit('Specified exec_prefix \'%s\' is invalid' % - args.exec_prefix) - if exec_prefix_use_shorthand is True: - self.exec_prefix = args.exec_prefix.replace('\\','/') - else: - self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/') - - # check and setup the includedir - if getattr(args, 'includedir', None) is None: - self.includedir = '${prefix}/include' - else: - if args.includedir.startswith('${prefix}'): - includedir_use_shorthand = True - input_includedir = args.prefix + args.includedir[len('${prefix}'):] - else: - if args.includedir.startswith('${exec_prefix}'): - includedir_use_shorthand = True - input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):] - else: - includedir_use_shorthand = False - input_includedir = args.includedir - if not os.path.exists(input_includedir): - raise SystemExit('Specified includedir \'%s\' is invalid' % - args.includedir) - if includedir_use_shorthand is True: - self.includedir = args.includedir.replace('\\','/') - else: - self.includedir = os.path.abspath(input_includedir).replace('\\','/') - - # check and setup the libdir - if getattr(args, 'libdir', None) is None: - self.libdir = '${prefix}/lib' - else: - if args.libdir.startswith('${prefix}'): - libdir_use_shorthand = True - input_libdir = args.prefix + args.libdir[len('${prefix}'):] - else: - if args.libdir.startswith('${exec_prefix}'): - libdir_use_shorthand = True - input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):] - else: - libdir_use_shorthand = False - input_libdir = args.libdir - if not os.path.exists(input_libdir): - raise SystemExit('Specified libdir \'%s\' is invalid' % - args.libdir) - if libdir_use_shorthand is True: - self.libdir = args.libdir.replace('\\','/') - else: - self.libdir = os.path.abspath(input_libdir).replace('\\','/') - - # setup dictionary for replacing items in *.pc.in - self.base_replace_items.update({'@VERSION@': self.version}) - self.base_replace_items.update({'@prefix@': self.prefix}) - self.base_replace_items.update({'@exec_prefix@': self.exec_prefix}) - self.base_replace_items.update({'@libdir@': self.libdir}) - self.base_replace_items.update({'@includedir@': self.includedir}) diff --git a/win32/replace.py b/win32/replace.py deleted file mode 100644 index f215cce..0000000 --- a/win32/replace.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/python -# -# Simple utility script to manipulate -# certain types of strings in a file - -# This can be used in various projects where -# there is the need to replace strings in files, -# and is copied from GLib's $(srcroot)/build/win32 - -# Author: Fan, Chun-wei -# Date: September 03, 2014 - -import os -import sys -import re -import string -import argparse - -valid_actions = ['remove-prefix', - 'replace-var', - 'replace-str', - 'remove-str'] - -def open_file(filename, mode): - if sys.version_info[0] < 3: - return open(filename, mode=mode) - else: - return open(filename, mode=mode, encoding='utf-8') - -def replace_multi(src, dest, replace_items): - with open_file(src, 'r') as s: - with open_file(dest, 'w') as d: - for line in s: - replace_dict = dict((re.escape(key), value) \ - for key, value in replace_items.items()) - replace_pattern = re.compile("|".join(replace_dict.keys())) - d.write(replace_pattern.sub(lambda m: \ - replace_dict[re.escape(m.group(0))], line)) - -def replace(src, dest, instring, outstring): - replace_item = {instring: outstring} - replace_multi(src, dest, replace_item) - -def check_required_args(args, params): - for param in params: - if getattr(args, param, None) is None: - raise SystemExit('%s: error: --%s argument is required' % (__file__, param)) - -def warn_ignored_args(args, params): - for param in params: - if getattr(args, param, None) is not None: - print('%s: warning: --%s argument is ignored' % (__file__, param)) - -def main(argv): - - parser = argparse.ArgumentParser(description='Process strings in a file.') - parser.add_argument('-a', - '--action', - help='Action to carry out. Can be one of:\n' - 'remove-prefix\n' - 'replace-var\n' - 'replace-str\n' - 'remove-str', - choices=valid_actions) - parser.add_argument('-i', '--input', help='Input file') - parser.add_argument('-o', '--output', help='Output file') - parser.add_argument('--instring', help='String to replace or remove') - parser.add_argument('--var', help='Autotools variable name to replace') - parser.add_argument('--outstring', - help='New String to replace specified string or variable') - parser.add_argument('--removeprefix', help='Prefix of string to remove') - - args = parser.parse_args() - - input_string = '' - output_string = '' - - # We must have action, input, output for all operations - check_required_args(args, ['action','input','output']) - - # Build the arguments by the operation that is to be done, - # to be fed into replace() - - # Get rid of prefixes from a string - if args.action == 'remove-prefix': - check_required_args(args, ['instring','removeprefix']) - warn_ignored_args(args, ['outstring','var']) - input_string = args.removeprefix + args.instring - output_string = args.instring - - # Replace an m4-style variable (those surrounded by @...@) - if args.action == 'replace-var': - check_required_args(args, ['var','outstring']) - warn_ignored_args(args, ['instring','removeprefix']) - input_string = '@' + args.var + '@' - output_string = args.outstring - - # Replace a string - if args.action == 'replace-str': - check_required_args(args, ['instring','outstring']) - warn_ignored_args(args, ['var','removeprefix']) - input_string = args.instring - output_string = args.outstring - - # Remove a string - if args.action == 'remove-str': - check_required_args(args, ['instring']) - warn_ignored_args(args, ['var','outstring','removeprefix']) - input_string = args.instring - output_string = '' - - replace(args.input, args.output, input_string, output_string) - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/win32/vs10/.gitignore b/win32/vs10/.gitignore deleted file mode 100644 index 0231580..0000000 --- a/win32/vs10/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -atk.vcxproj -atk.vcxproj.filters -atk-install.props diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am deleted file mode 100644 index 846c43d..0000000 --- a/win32/vs10/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -GENERATED_ITEMS = \ - atk.vcxproj \ - atk.vcxproj.filters \ - atk-install.props - -EXTRA_DIST = \ - README.txt \ - atk.sln \ - atk.vcxprojin \ - atk.vcxproj.filtersin \ - atk-install.vcxproj \ - atk-install.vcxproj.filters \ - atk-introspect.vcxproj \ - atk-build-defines.props \ - atk-gen-src.props \ - atk-install.propsin \ - atk-version-paths.props \ - $(GENERATED_ITEMS) - -atk-install.props: $(top_srcdir)/win32/vs10/atk-install.propsin atk.vs10.headers - -$(RM) $(top_builddir)/win32/vs11/atk-install.props - -$(RM) $(top_builddir)/win32/vs12/atk-install.props - -$(RM) $(top_builddir)/win32/vs14/atk-install.props - -$(RM) $(top_builddir)/win32/vs15/atk-install.props - $(CPP) -P - <$(top_srcdir)/win32/vs10/atk-install.propsin >$@ - rm atk.vs10.headers - -DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/win32/vs10/README.txt b/win32/vs10/README.txt deleted file mode 100644 index 40f8a7d..0000000 --- a/win32/vs10/README.txt +++ /dev/null @@ -1,109 +0,0 @@ -Please do not build this package in a path that contains spaces to avoid -possible problems during the build or during the usage of the library. - -Please refer to the following GNOME Live! page for more detailed -instructions on building ATK and its dependencies with Visual C++: - -https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack - -This VS10 solution and the projects it includes are intented to be used -in a ATK source tree unpacked from a tarball. In a git checkout you -first need to use some Unix-like environment or manual work to expand -the .in files needed, mainly config.h.win32.in into config.h.win32. -You will also need to expand atk.vcxprojin and atk.vcxproj.filtersin here -into atk.vcxproj and atk.vcxproj.filters respectively. - -The dependencies for this package are gettext-runtime (libintl), GLib* -and ZLib. - -You will also need a Python 2.7.x or 3.x installation, as Python will be -used to run glib-genmarshal, which was converted into a Python script from -a compiled C program, in addition to generating the atk.pc pkg-config -file for the build. See PythonDir (32-bit builds) or PythonDirX64 (x64 -builds) in atk-version-paths.props to see that they point to the correct paths. - -a) look for all of the dependencies (except GLib*) under - - http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32-bit) -OR- - http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64-bit) - - Please use the latest versions of these libraries that are available there, - these are packaged by Tor Lillqvist, which are built with MinGW/GCC. - Please see b) below regarding the build of GLib* - --OR- - -b) Build them yourself with VS10 (but you may most probably wish to get - gettext-runtime from the URL(s) mentioned in a)). Use the latest - stable versions for them (you may need to get the latest unstable version of - GLib if you are using an unstable version of ATK): - - GLib*: Grab the latest sources from http://www.gtk.org under "Download" - (stable only-please make a search for the latest unstable versions) - ZLib: http://www.zlib.net - - The above 2 packages all have supported mechanisms (Makefiles and/or Project - Files) for building under VS10 (upgrade the Project Files from earlier VS - versions will do for these, when applicable) - -* This GLib refers to a build that is built by VS10 - -Set up the source tree as follows under some arbitrary top -folder : - -\atk\ -\vs10\ - -*this* file you are now reading is thus located at -\atk\\win32\vs10\README. - - is either Win32 or x64, as in VS10 project files. - -You should unpack the -dev and (runtime) -into \vs10\, if you download any of the packages from - -http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32-bit) -OR- -http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64-bit) - -so that for instance libintl.h end up at -\vs10\\include\libintl.h. - -If you build any of the dependencies yourselves, copy the: --DLLs and EXEs into \vs10\\bin --headers into \vs10\\include\ --LIBs into \vs10\\lib - -If you have not built GLib with VS10 and placed the LIBs and headers in a -place where VS10 can find them automatically, you should also uncompress -your GLib sources in \ and build it from there, following the -instructions in \glib<-version>\win32\vs10, so that the required -headers, EXEs, DLLs and LIBs will end up in -\vs10\\include\glib-2.0 (headers) -\vs10\\lib (LIBs, also glib-2.0/include/glibconfig.h) -\vs10\\bin (EXEs/DLLs) -respectively. - -Building introspection files is now integrated in the solution files, but this is -not built by default. 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 \vs10\\bin, and the - other Python items needs to be under \vs10\\lib\gobject-introspection. - --Use the rebuild command on this project, atk-introspect, to re-build or build for other - configurations. - -After the build of ATK, the "install" project will copy build results -and headers into their appropriate location under \vs10\. -For instance, built DLLs go into \vs10\\bin, built LIBs into -\vs10\\lib and atk headers into -\vs10\\include\atk-1.0. This is then from where -project files higher in the stack are supposed to look for them, not -from a specific ATK source tree. - ---Chun-wei Fan ---(adapted from the GLib VS9 README.txt file originally written by Tor Lillqvist) diff --git a/win32/vs10/atk-build-defines.props b/win32/vs10/atk-build-defines.props deleted file mode 100644 index 1b16038..0000000 --- a/win32/vs10/atk-build-defines.props +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - ATK_COMPILATION;DLL_EXPORT;ATK_LOCALEDIR="/dummy/share/locale" - cd .. -set VCInstallDir=$(VCInstallDir) -nmake -f atk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot) - $(SolutionDir)\..\Atk-1.0.gir;$(SolutionDir)\..\Atk-1.0.typelib - - - <_PropertySheetDisplayName>atkbuilddefinesprops - $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - - - - ..\..;..\..\atk;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include;$(GLibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) - HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - true - /d2Zi+ %(AdditionalOptions) - - - glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;intl.lib;%(AdditionalDependencies) - $(GLibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) - $(OutDir)$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).pdb - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - /HIGHENTROPYVA %(AdditionalOptions) - - - - - $(AtkDefines) - - - $(AtkIntrospectNMakeCmd) - - - $(AtkIntrospectBuiltFiles) - - - diff --git a/win32/vs10/atk-gen-src.props b/win32/vs10/atk-gen-src.props deleted file mode 100644 index 76f0dfa..0000000 --- a/win32/vs10/atk-gen-src.props +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - if not exist ..\..\config.h copy ..\..\config.h.win32 ..\..\config.h - -cd ..\..\atk -$(PythonDir)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --header --output=atkmarshal.h atkmarshal.list 2>nul & set ERRORLEVEL=0 -if not exist atkmarshal.h $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --header > atkmarshal.h -$(PythonDir)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --body --output=atkmarshal.c atkmarshal.list 2>nul & set ERRORLEVEL=0 -if not exist atkmarshal.c $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --body > atkmarshal.c -cd $(SolutionDir) - - -cd ..\..\atk -$(PythonDirX64)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --header --output=atkmarshal.h atkmarshal.list 2>nul & set ERRORLEVEL=0 -if not exist atkmarshal.h $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --header --output=atkmarshal.h -$(PythonDirX64)\python $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal --quiet --body --output=atkmarshal.c atkmarshal.list 2>nul & set ERRORLEVEL=0 -if not exist atkmarshal.c $(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --body > atkmarshal.c -cd $(SolutionDir) - - - - <_PropertySheetDisplayName>atkgensrcprops - - - - $(GenConfigH) - - - $(GenMarshalSrc) - - - $(GenMarshalSrcX64) - - - diff --git a/win32/vs10/atk-install.propsin b/win32/vs10/atk-install.propsin deleted file mode 100644 index 6f71d14..0000000 --- a/win32/vs10/atk-install.propsin +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - $(SolutionDir)$(Configuration)\$(Platform)\bin - $(BinDir)\$(AtkDllPrefix)atk(AtkDllSuffix).dll - -mkdir $(CopyDir)\bin - -copy $(BinDir)\$(AtkDllPrefix)atk$(AtkDllSuffix).dll $(CopyDir)\bin -copy $(BinDir)\$(AtkDllPrefix)atk$(AtkDllSuffix).pdb $(CopyDir)\bin - -mkdir $(CopyDir)\lib -copy $(BinDir)\atk-$(ApiVersion).lib $(CopyDir)\lib - -mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk -#include "atk.vs10.headers" - -mkdir $(CopyDir)\lib\pkgconfig -copy ..\atk.pc $(CopyDir)\lib\pkgconfig - - $(PythonDir)\python.exe ..\atkpc.py --prefix=$(CopyDir) --version=$(AtkMajorVersion).$(AtkMinorVersion).$(AtkMicroVersion) - $(PythonDirX64)\python.exe ..\atkpc.py --prefix=$(CopyDir) --version=$(AtkMajorVersion).$(AtkMinorVersion).$(AtkMicroVersion) - ..\atk.pc - - - - $(BinDir) - - - $(InstalledDlls) - - - $(AtkDoInstall) - - - $(AtkPCFiles) - - - diff --git a/win32/vs10/atk-install.vcxproj b/win32/vs10/atk-install.vcxproj deleted file mode 100644 index 2b36db2..0000000 --- a/win32/vs10/atk-install.vcxproj +++ /dev/null @@ -1,117 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {00702787-1566-484D-991F-3E7E459BB909} - atkinstall - - - - Utility - MultiByte - true - v100 - - - Utility - MultiByte - true - v100 - - - Utility - MultiByte - v100 - - - Utility - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - $(GLibEtcInstallRoot)\ - $(Configuration)\ - $(GLibEtcInstallRoot)\ - $(Configuration)\ - - - - - - - - - - - - Installing Build Results... - $(AtkPCFiles) - $(AtkDoInstall) - $(InstalledDlls);%(Outputs) - Installing Build Results... - $(AtkPCFiles) - $(AtkDoInstall) - $(InstalledDlls);%(Outputs) - - - Generating atk.pc... - $(AtkGenPC) - $(AtkPCFiles);%(Outputs) - Generating atk.pc... - $(AtkGenPCX64) - $(AtkPCFiles);%(Outputs) - Generating atk.pc... - $(AtkGenPC) - $(AtkPCFiles);%(Outputs) - Generating atk.pc... - $(AtkGenPCX64) - $(AtkPCFiles);%(Outputs) - - - - - {86eacd59-f69f-4aad-854b-aa03d5447360} - false - - - - - - diff --git a/win32/vs10/atk-install.vcxproj.filters b/win32/vs10/atk-install.vcxproj.filters deleted file mode 100644 index c004f98..0000000 --- a/win32/vs10/atk-install.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - Resource Files - Resource Files - - diff --git a/win32/vs10/atk-introspect.vcxproj b/win32/vs10/atk-introspect.vcxproj deleted file mode 100644 index 965d636..0000000 --- a/win32/vs10/atk-introspect.vcxproj +++ /dev/null @@ -1,103 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A} - atkintrospect - - - - Makefile - true - MultiByte - v100 - - - Makefile - false - true - MultiByte - v100 - - - Makefile - MultiByte - v100 - - - Makefile - MultiByte - true - v100 - - - - - - - - - - - - - - - - - - - - - - - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean - $(AtkIntrospectBuiltFiles) - - - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean - $(AtkIntrospectBuiltFiles) - - - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean - $(AtkIntrospectBuiltFiles) - - - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection - $(AtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean - $(AtkIntrospectBuiltFiles) - - - - {00702787-1566-484d-991f-3e7e459bb909} - false - - - - - - \ No newline at end of file diff --git a/win32/vs10/atk-version-paths.props.in b/win32/vs10/atk-version-paths.props.in deleted file mode 100644 index 52e7f41..0000000 --- a/win32/vs10/atk-version-paths.props.in +++ /dev/null @@ -1,79 +0,0 @@ - - - - 10 - 1.0 - @ATK_MAJOR_VERSION@ - @ATK_MINOR_VERSION@ - @ATK_MICRO_VERSION@ - $(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform) - $(GLibEtcInstallRoot) - lib - -$(ApiVersion)-0 - - -1-vs$(VSVer) - $(AtkSeparateVSDllPrefix) - $(AtkSeparateVSDllSuffix) - c:\\python34 - c:\\python34 - c:\\python34 - c:\\python36 - c:\\python36 - $(PythonDir).x64 - PYTHON=$(PythonDir)\python.exe - PYTHON=$(PythonDirX64)\python.exe - - - <_PropertySheetDisplayName>atkversionpathsprops - - - - $(ApiVersion) - - - $(AtkMajorVersion) - - - $(AtkMinorVersion) - - - $(AtkMicroVersion) - - - $(GLibEtcInstallRoot) - - - $(CopyDir) - - - $(AtkLibtoolCompatibleDllPrefix) - - - $(AtkLibtoolCompatibleDllSuffix) - - - $(AtkSeparateVSDllPrefix) - - - $(AtkSeparateVSDllSuffix) - - - $(AtkDllPrefix) - - - $(AtkDllSuffix) - - - $(PythonDir) - - - $(PythonDirX64) - - - $(IntrospectPythonParam) - - - $(IntrospectPythonParamX64) - - - diff --git a/win32/vs10/atk.sln b/win32/vs10/atk.sln deleted file mode 100644 index f5f2905..0000000 --- a/win32/vs10/atk.sln +++ /dev/null @@ -1,42 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk", "atk.vcxproj", "{86EACD59-F69F-4AAD-854B-AA03D5447360}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-install", "atk-install.vcxproj", "{00702787-1566-484D-991F-3E7E459BB909}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atk-introspect", "atk-introspect.vcxproj", "{7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|Win32.ActiveCfg = Debug|Win32 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|Win32.Build.0 = Debug|Win32 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|x64.ActiveCfg = Debug|x64 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|x64.Build.0 = Debug|x64 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|Win32.ActiveCfg = Release|Win32 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|Win32.Build.0 = Release|Win32 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|x64.ActiveCfg = Release|x64 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.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}.Debug|x64.ActiveCfg = Debug|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.Build.0 = Debug|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.ActiveCfg = Release|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.Build.0 = Release|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.ActiveCfg = Release|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.Build.0 = Release|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/vs10/atk.vcxproj.filtersin b/win32/vs10/atk.vcxproj.filtersin deleted file mode 100644 index 0e5ec63..0000000 --- a/win32/vs10/atk.vcxproj.filtersin +++ /dev/null @@ -1,29 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - -#include "atk.vs10.sourcefiles.filters" - - - Resource Files - Resource Files - - - - Resource Files - - - diff --git a/win32/vs10/atk.vcxprojin b/win32/vs10/atk.vcxprojin deleted file mode 100644 index b1c79d2..0000000 --- a/win32/vs10/atk.vcxprojin +++ /dev/null @@ -1,181 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {86EACD59-F69F-4AAD-854B-AA03D5447360} - atk - Win32Proj - - - - DynamicLibrary - MultiByte - true - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - DynamicLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - true - false - - - - Disabled - _DEBUG;$(AtkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - $(OutDir)$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll - %(IgnoreSpecificDefaultLibraries) - true - Windows - $(OutDir)$(ProjectName)-$(ApiVersion).lib - MachineX86 - - - - - MaxSpeed - true - $(AtkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - $(OutDir)$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll - %(IgnoreSpecificDefaultLibraries) - true - Windows - true - true - $(OutDir)$(ProjectName)-$(ApiVersion).lib - MachineX86 - - - - - Disabled - _DEBUG;$(AtkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll - true - Windows - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - MachineX64 - - - - - $(AtkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - %(AdditionalDependencies) - $(OutDir)$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll - true - Windows - true - true - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - MachineX64 - - - -#include "atk.vs10.sourcefiles" - - - - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\config.h;%(Outputs) - - - Generating Marshalling Sources... - $(GenMarshalSrc) - ..\..\atk\atkmarshal.h;..\..\atk\atkmarshal.c;%(Outputs) - Generating Marshalling Sources... - $(GenMarshalSrcX64) - ..\..\atk\atkmarshal.h;..\..\atk\atkmarshal.c;%(Outputs) - - - - - - - - - diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am deleted file mode 100644 index 5551c66..0000000 --- a/win32/vs11/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -EXTRA_DIST = \ - README.txt \ - atk.sln \ - atk.vcxproj \ - atk.vcxproj.filters \ - atk-install.vcxproj \ - atk-install.vcxproj.filters \ - atk-introspect.vcxproj \ - atk-build-defines.props \ - atk-install.props \ - atk-version-paths.props \ - atk-gen-src.props - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_SLN = atk - -MSVC_BASE_VER = 10 -MSVC_BASE_VER_LONG = 2010 -MSVC_VER = 11 -MSVC_VER_LONG = 2012 - -include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am deleted file mode 100644 index 91e5be7..0000000 --- a/win32/vs12/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -EXTRA_DIST = \ - README.txt \ - atk.sln \ - atk.vcxproj \ - atk.vcxproj.filters \ - atk-install.vcxproj \ - atk-install.vcxproj.filters \ - atk-introspect.vcxproj \ - atk-build-defines.props \ - atk-install.props \ - atk-version-paths.props \ - atk-gen-src.props - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_SLN = atk - -MSVC_BASE_VER = 10 -MSVC_BASE_VER_LONG = 2010 -MSVC_VER = 12 -MSVC_VER_LONG = 2013 - -include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am deleted file mode 100644 index b1b9fe8..0000000 --- a/win32/vs14/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -EXTRA_DIST = \ - README.txt \ - atk.sln \ - atk.vcxproj \ - atk.vcxproj.filters \ - atk-install.vcxproj \ - atk-install.vcxproj.filters \ - atk-introspect.vcxproj \ - atk-build-defines.props \ - atk-install.props \ - atk-version-paths.props \ - atk-gen-src.props - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_SLN = atk - -MSVC_BASE_VER = 10 -MSVC_BASE_VER_LONG = 2010 -MSVC_VER = 14 -MSVC_VER_LONG = 14 - -include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am deleted file mode 100644 index 63d101d..0000000 --- a/win32/vs15/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -EXTRA_DIST = \ - README.txt \ - atk.sln \ - atk.vcxproj \ - atk.vcxproj.filters \ - atk-install.vcxproj \ - atk-install.vcxproj.filters \ - atk-introspect.vcxproj \ - atk-build-defines.props \ - atk-install.props \ - atk-version-paths.props \ - atk-gen-src.props - -DISTCLEANFILES = $(EXTRA_DIST) - -MSVC_SLN = atk - -MSVC_BASE_VER = 10 -MSVC_BASE_VER_LONG = 2010 -MSVC_VER = 15 -MSVC_VER_LONG = 15 -MSVC_TOOLSET = 141 - -include $(top_srcdir)/win32/Makefile-newvs.am diff --git a/win32/vs9/.gitignore b/win32/vs9/.gitignore deleted file mode 100644 index 0e18109..0000000 --- a/win32/vs9/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -atk.vcproj -atk-install.vsprops diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am deleted file mode 100644 index 48dcdc1..0000000 --- a/win32/vs9/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -GENERATED_ITEMS = \ - atk.vcproj \ - atk-install.vsprops - -EXTRA_DIST = \ - README.txt \ - atk.sln \ - atk.vcprojin \ - atk-install.vcproj \ - atk-introspect.vcproj \ - atk-build-defines.vsprops \ - atk-gen-src.vsprops \ - atk-install.vspropsin \ - atk-version-paths.vsprops \ - $(GENERATED_ITEMS) - -atk-install.vsprops: $(top_srcdir)/win32/vs9/atk-install.vspropsin atk.headers - $(CPP) -P - <$(top_srcdir)/win32/vs9/atk-install.vspropsin >$@ - rm atk.headers - -DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt deleted file mode 100644 index b517104..0000000 --- a/win32/vs9/README.txt +++ /dev/null @@ -1,109 +0,0 @@ -Please do not build this package in a path that contains spaces to avoid -possible problems during the build or during the usage of the library. - -Please refer to the following GNOME Live! page for more detailed -instructions on building ATK and its dependencies with Visual C++: - -https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack - -This VS9 solution and the projects it includes are intented to be used -in a ATK source tree unpacked from a tarball. In a git checkout you -first need to use some Unix-like environment or manual work to expand -the .in files needed, mainly config.h.win32.in into config.h.win32. -You will also need to expand atk.vcprojin here into -atk.vcproj. - -The dependencies for this package are gettext-runtime (libintl), GLib* -and ZLib. - -You will also need a Python 2.7.x or 3.x installation, as Python will be -used to run glib-genmarshal, which was converted into a Python script from -a compiled C program, in addition to generating the atk.pc pkg-config -file for the build. See PythonDir (32-bit builds) or PythonDirX64 (x64 -builds) in atk-version-paths.vsprops to see that they point to the correct paths. - -a) look for all of the dependencies (except GLib*) under - - http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32-bit) -OR- - http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64-bit) - - Please use the latest versions of these libraries that are available there, - these are packaged by Tor Lillqvist, which are built with MinGW/GCC. - Please see b) below regarding the build of GLib* - --OR- - -b) Build them yourself with VS9 (but you may most probably wish to get - gettext-runtime from the URL(s) mentioned in a)). Use the latest - stable versions for them (you may need to get the latest unstable version of - GLib if you are using an unstable version of ATK): - - GLib*: Grab the latest sources from http://www.gtk.org under "Download" - (stable only-please make a search for the latest unstable versions) - ZLib: http://www.zlib.net - - The above 2 packages all have supported mechanisms (Makefiles and/or Project - Files) for building under VS9 (upgrade the Project Files from earlier VS - versions will do for these, when applicable) - -* This GLib refers to a build that is built by VS9 - -Set up the source tree as follows under some arbitrary top -folder : - -\atk\ -\vs9\ - -*this* file you are now reading is thus located at -\atk\\win32\vs9\README. - - is either Win32 or x64, as in VS9 project files. - -You should unpack the -dev and (runtime) -into \vs9\, if you download any of the packages from - -http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32-bit) -OR- -http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64-bit) - -so that for instance libintl.h end up at -\vs9\\include\libintl.h. - -If you build any of the dependencies yourselves, copy the: --DLLs and EXEs into \vs9\\bin --headers into \vs9\\include\ --LIBs into \vs9\\lib - -If you have not built GLib with VS9 and placed the LIBs and headers in a -place where VS9 can find them automatically, you should also uncompress -your GLib sources in \ and build it from there, following the -instructions in \glib<-version>\win32\vs9, so that the required -headers, EXEs, DLLs and LIBs will end up in -\vs9\\include\glib-2.0 (headers) -\vs9\\lib (LIBs, also glib-2.0/include/glibconfig.h) -\vs9\\bin (EXEs/DLLs) -respectively. - -Building introspection files is now integrated in the solution files, but this is -not built by default. In order for this to work, ensure that PythonDir (32-bit builds) -and/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 \vs9\\bin, and the - other Python items needs to be under \vs9\\lib\gobject-introspection. - --Use the rebuild command on this project, atk-introspect, to re-build or build for other - configurations. - -After the build of ATK, the "install" project will copy build results -and headers into their appropriate location under \vs9\. -For instance, built DLLs go into \vs9\\bin, built LIBs into -\vs9\\lib and atk headers into -\vs9\\include\atk-1.0. This is then from where -project files higher in the stack are supposed to look for them, not -from a specific ATK source tree. - ---Chun-wei Fan ---(adapted from the GLib VS9 README.txt file originally written by Tor Lillqvist) diff --git a/win32/vs9/atk-build-defines.vsprops b/win32/vs9/atk-build-defines.vsprops deleted file mode 100644 index e363626..0000000 --- a/win32/vs9/atk-build-defines.vsprops +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - diff --git a/win32/vs9/atk-gen-src.vsprops b/win32/vs9/atk-gen-src.vsprops deleted file mode 100644 index 8468687..0000000 --- a/win32/vs9/atk-gen-src.vsprops +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - diff --git a/win32/vs9/atk-install.vcproj b/win32/vs9/atk-install.vcproj deleted file mode 100644 index ff970ce..0000000 --- a/win32/vs9/atk-install.vcproj +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/atk-install.vspropsin b/win32/vs9/atk-install.vspropsin deleted file mode 100644 index dcb22d4..0000000 --- a/win32/vs9/atk-install.vspropsin +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - diff --git a/win32/vs9/atk-introspect.vcproj b/win32/vs9/atk-introspect.vcproj deleted file mode 100644 index 49805d7..0000000 --- a/win32/vs9/atk-introspect.vcproj +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/atk-version-paths.vsprops.in b/win32/vs9/atk-version-paths.vsprops.in deleted file mode 100644 index 9d9973a..0000000 --- a/win32/vs9/atk-version-paths.vsprops.in +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs9/atk.sln b/win32/vs9/atk.sln deleted file mode 100644 index 06ed938..0000000 --- a/win32/vs9/atk.sln +++ /dev/null @@ -1,49 +0,0 @@ - -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-install", "atk-install.vcproj", "{00702787-1566-484D-991F-3E7E459BB909}" - ProjectSection(ProjectDependencies) = postProject - {86EACD59-F69F-4AAD-854B-AA03D5447360} = {86EACD59-F69F-4AAD-854B-AA03D5447360} - EndProjectSection -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} - {00702787-1566-484D-991F-3E7E459BB909} = {00702787-1566-484D-991F-3E7E459BB909} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|Win32.ActiveCfg = Debug|Win32 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|Win32.Build.0 = Debug|Win32 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|Win32.ActiveCfg = Release|Win32 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Release|Win32.Build.0 = Release|Win32 - {86EACD59-F69F-4AAD-854B-AA03D5447360}.Debug|x64.ActiveCfg = Debug|x64 - {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 - {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 - {00702787-1566-484D-991F-3E7E459BB909}.Release|Win32.Build.0 = Release|Win32 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.ActiveCfg = Debug|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Debug|x64.Build.0 = Debug|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.ActiveCfg = Release|x64 - {00702787-1566-484D-991F-3E7E459BB909}.Release|x64.Build.0 = Release|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|Win32.ActiveCfg = Release|Win32 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Debug|x64.ActiveCfg = Debug|x64 - {7034D75B-2AC9-4EA6-97A2-DB4F8526EC5A}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win32/vs9/atk.vcprojin b/win32/vs9/atk.vcprojin deleted file mode 100644 index a51a747..0000000 --- a/win32/vs9/atk.vcprojin +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#include "atk.sourcefiles" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1