[gobject-introspection] Visual Studio builds: Move build files to win32/
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] Visual Studio builds: Move build files to win32/
- Date: Mon, 9 Jan 2017 09:31:08 +0000 (UTC)
commit 4bcad96c5a3f1ab17187e264e0e550fab56a29dc
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jan 9 15:09:53 2017 +0800
Visual Studio builds: Move build files to win32/
As suggested, we don't really need two layers of directories to get to the
projects, so move the project files to be under win32/ rather than
build/win32/.
Makefile-msvcproj.am | 70 +++++-----
Makefile.am | 2 +-
build/Makefile-newvs.am | 47 ------
build/Makefile.am | 3 -
build/Makefile.msvcproj | 154 --------------------
build/win32/vs10/_giscanner.vcxproj.filters | 31 ----
configure.ac | 17 +-
win32/Makefile-newvs.am | 46 ++++++
{build/win32 => win32}/Makefile.am | 8 +-
{build => win32}/Makefile.msvc-introspection | 64 ++++----
win32/Makefile.msvcproj | 153 +++++++++++++++++++
{build/win32 => win32}/detectenv-msvc.mak | 0
{build/win32 => win32}/gen-win32-cairo-gir.py | 2 +-
{build/win32 => win32}/gen-win32-g-ir-tools.py | 2 +-
{build/win32 => win32}/gi-build-common-msvc.mak | 2 +-
{build/win32 => win32}/gi-introspection-msvc.mak | 0
{build/win32 => win32}/gi-setenv-msvc.mak | 0
{build/win32 => win32}/gi-tests-msvc.mak | 2 +-
{build/win32 => win32}/gi_msvc_build_utils.py | 0
{build/win32 => win32}/gipc.py | 0
{build/win32 => win32}/introspection-msvc.mak | 2 +-
{build/win32 => win32}/pc_base.py | 2 +-
{build/win32 => win32}/replace.py | 0
{build/win32 => win32}/vs10/Makefile.am | 10 +-
{build/win32 => win32}/vs10/README.txt | 0
{build/win32 => win32}/vs10/_giscanner.vcxproj | 18 +-
.../vs10/_giscanner.vcxproj.filters | 5 +-
{build/win32 => win32}/vs10/cmph-bdz-test.vcxproj | 12 +-
.../vs10/cmph-bdz-test.vcxproj.filters | 4 +-
{build/win32 => win32}/vs10/cmph.vcxproj.filtersin | 0
{build/win32 => win32}/vs10/cmph.vcxprojin | 0
.../vs10/g-ir-compiler.vcxproj.filtersin | 2 +-
.../win32 => win32}/vs10/g-ir-compiler.vcxprojin | 2 +-
{build/win32 => win32}/vs10/g-ir-generate.vcxproj | 6 +-
.../vs10/g-ir-generate.vcxproj.filters | 6 +-
{build/win32 => win32}/vs10/g-ir-inspect.vcxproj | 2 +-
.../vs10/g-ir-inspect.vcxproj.filters | 2 +-
{build/win32 => win32}/vs10/gi-build-defines.props | 2 +-
{build/win32 => win32}/vs10/gi-gen-srcs.props | 2 +-
{build/win32 => win32}/vs10/gi-install.propsin | 18 +-
{build/win32 => win32}/vs10/gi-install.vcxproj | 38 ++---
.../vs10/gi-install.vcxproj.filters | 2 +-
{build/win32 => win32}/vs10/gi-introspect.vcxproj | 0
{build/win32 => win32}/vs10/gi-prebuild.vcxproj | 47 ++----
.../win32 => win32}/vs10/gi-version-paths.props.in | 4 +-
.../vs10/girepository.vcxproj.filtersin | 0
{build/win32 => win32}/vs10/girepository.vcxprojin | 8 +-
{build/win32 => win32}/vs10/glib-print.vcxproj | 4 +-
.../vs10/glib-print.vcxproj.filters | 4 +-
.../win32 => win32}/vs10/gobject-introspection.sln | 0
{build/win32 => win32}/vs11/Makefile.am | 2 +-
{build/win32 => win32}/vs12/Makefile.am | 2 +-
{build/win32 => win32}/vs14/Makefile.am | 2 +-
{build/win32 => win32}/vs9/Makefile.am | 4 +-
{build/win32 => win32}/vs9/README.txt | 0
{build/win32 => win32}/vs9/_giscanner.vcproj | 16 +-
{build/win32 => win32}/vs9/cmph-bdz-test.vcproj | 10 +-
{build/win32 => win32}/vs9/cmph.vcprojin | 0
{build/win32 => win32}/vs9/g-ir-compiler.vcprojin | 2 +-
{build/win32 => win32}/vs9/g-ir-generate.vcproj | 4 +-
{build/win32 => win32}/vs9/g-ir-inspect.vcproj | 2 +-
.../win32 => win32}/vs9/gi-build-defines.vsprops | 2 +-
{build/win32 => win32}/vs9/gi-gen-srcs.vsprops | 2 +-
{build/win32 => win32}/vs9/gi-install.vcproj | 0
{build/win32 => win32}/vs9/gi-install.vspropsin | 18 +-
{build/win32 => win32}/vs9/gi-introspect.vcproj | 0
{build/win32 => win32}/vs9/gi-prebuild.vcproj | 20 ++--
.../vs9/gi-version-paths.vsprops.in | 4 +-
{build/win32 => win32}/vs9/girepository.vcprojin | 8 +-
{build/win32 => win32}/vs9/glib-print.vcproj | 2 +-
.../win32 => win32}/vs9/gobject-introspection.sln | 0
71 files changed, 420 insertions(+), 485 deletions(-)
---
diff --git a/Makefile-msvcproj.am b/Makefile-msvcproj.am
index 374dc14..bb53e32 100644
--- a/Makefile-msvcproj.am
+++ b/Makefile-msvcproj.am
@@ -15,67 +15,67 @@ girepository_HEADERS_EXCLUDES = gidummy
g_ir_compiler_FILES = $(libgirepository_gthash_la_SOURCES) $(libgirepository_internals_la_SOURCES)
g_ir_compiler_EXCLUDES = gidummy
-$(top_builddir)/build/win32/vs9/giscanner.scripts:
- echo '' >>$(top_builddir)/build/win32/vs9/giscanner.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner
'
$(top_builddir)/build/win32/vs9/giscanner.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections
'
$(top_builddir)/build/win32/vs9/giscanner.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
'
$(top_builddir)/build/win32/vs9/giscanner.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
'
$(top_builddir)/build/win32/vs9/giscanner.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
'
$(top_builddir)/build/win32/vs9/giscanner.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
'
$(top_builddir)/build/win32/vs9/giscanner.scripts
- echo '' >>$(top_builddir)/build/win32/vs9/giscanner.scripts
+$(top_builddir)/win32/vs9/giscanner.scripts:
+ echo '' >>$(top_builddir)/win32/vs9/giscanner.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner
'
$(top_builddir)/win32/vs9/giscanner.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections
'
$(top_builddir)/win32/vs9/giscanner.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
'
$(top_builddir)/win32/vs9/giscanner.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
'
$(top_builddir)/win32/vs9/giscanner.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
'
$(top_builddir)/win32/vs9/giscanner.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
'
$(top_builddir)/win32/vs9/giscanner.scripts
+ echo '' >>$(top_builddir)/win32/vs9/giscanner.scripts
- echo '' >>$(top_builddir)/build/win32/vs10/giscanner.vs10.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner'
$(top_builddir)/build/win32/vs10/giscanner.vs10.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections'
$(top_builddir)/build/win32/vs10/giscanner.vs10.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates'
$(top_builddir)/build/win32/vs10/giscanner.vs10.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C'
$(top_builddir)/build/win32/vs10/giscanner.vs10.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs'
$(top_builddir)/build/win32/vs10/giscanner.vs10.scripts
- echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python'
$(top_builddir)/build/win32/vs10/giscanner.vs10.scripts
+ echo '' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner'
$(top_builddir)/win32/vs10/giscanner.vs10.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections'
$(top_builddir)/win32/vs10/giscanner.vs10.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates'
$(top_builddir)/win32/vs10/giscanner.vs10.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C'
$(top_builddir)/win32/vs10/giscanner.vs10.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs'
$(top_builddir)/win32/vs10/giscanner.vs10.scripts
+ echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python'
$(top_builddir)/win32/vs10/giscanner.vs10.scripts
for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/'
'\\\\'`; do \
case $$F in \
- giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
' \
+ giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
' \
;; \
- giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
' \
+ giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
' \
;; \
- giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
' \
+ giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
' \
;; \
- giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
' \
+ giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
' \
;; \
- giscanner\\collections\\*.py) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\collections
' \
+ giscanner\\collections\\*.py) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\collections
' \
;; \
- giscanner\\*.py) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner
' \
+ giscanner\\*.py) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner
' \
;; \
esac; \
- done >>$(top_builddir)/build/win32/vs9/giscanner.scripts
+ done >>$(top_builddir)/win32/vs9/giscanner.scripts
for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/'
'\\\\'`; do \
case $$F in \
- giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C' \
+ giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C' \
;; \
- giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs' \
+ giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs' \
;; \
- giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python' \
+ giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python' \
;; \
- giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' \
+ giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' \
;; \
- giscanner\\collections\\*.py) echo 'copy ..\..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\collections' \
+ giscanner\\collections\\*.py) echo 'copy ..\..\'$$F'
$$(CopyDir)\lib\gobject-introspection\giscanner\collections' \
;; \
- giscanner\\*.py) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner' \
+ giscanner\\*.py) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner' \
;; \
esac; \
- done >>$(top_builddir)/build/win32/vs10/giscanner.vs10.scripts
+ done >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-include $(top_srcdir)/build/Makefile.msvcproj
+include $(top_srcdir)/win32/Makefile.msvcproj
# Autotools: Why must we do this instead of 'dist-hook'?
MSVCPROJ_GENERATED = \
- $(top_builddir)/build/win32/vs9/cmph.vcproj \
- $(top_builddir)/build/win32/vs9/girepository.vcproj \
- $(top_builddir)/build/win32/vs9/g-ir-compiler.vcproj
+ $(top_builddir)/win32/vs9/cmph.vcproj \
+ $(top_builddir)/win32/vs9/girepository.vcproj \
+ $(top_builddir)/win32/vs9/g-ir-compiler.vcproj
-$(MSVCPROJ_GENERATED): $(top_builddir)/build/win32/vs9/girepository.headers
$(top_builddir)/build/win32/vs9/giscanner.scripts
+$(MSVCPROJ_GENERATED): $(top_builddir)/win32/vs9/girepository.headers
$(top_builddir)/win32/vs9/giscanner.scripts
EXTRA_DIST += $(MSVCPROJ_GENERATED) config.h.win32
diff --git a/Makefile.am b/Makefile.am
index b080a89..dafea38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ include Makefile-msvcproj.am
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = . docs tests build
+SUBDIRS = . docs tests win32
DIST_SUBDIRS = $(SUBDIRS)
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-doctool
diff --git a/configure.ac b/configure.ac
index 6834bd9..bb34da0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,13 +374,12 @@ docs/reference/version.xml
gobject-introspection-1.0.pc
gobject-introspection-no-export-1.0.pc
config.h.win32
-build/Makefile
-build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs9/gi-version-paths.vsprops
-build/win32/vs10/Makefile
-build/win32/vs10/gi-version-paths.props
-build/win32/vs11/Makefile
-build/win32/vs12/Makefile
-build/win32/vs14/Makefile])
+win32/Makefile
+win32/vs9/Makefile
+win32/vs9/gi-version-paths.vsprops
+win32/vs10/Makefile
+win32/vs10/gi-version-paths.props
+win32/vs11/Makefile
+win32/vs12/Makefile
+win32/vs14/Makefile])
AC_OUTPUT
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
new file mode 100644
index 0000000..ecdf3b5
--- /dev/null
+++ b/win32/Makefile-newvs.am
@@ -0,0 +1,46 @@
+# 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 (10 for 2010, 11 for 2012, 12
for 2013, 14 for 2015 and so on)
+# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14 and so on)
+# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on)
+# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
+# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
+
+%.sln:
+ sed 's/11\.00/$(MSVC_FORMAT_VER)\.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_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ >
$(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/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/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' <
$(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
+ else \
+ sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<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/build/win32/Makefile.am b/win32/Makefile.am
similarity index 81%
rename from build/win32/Makefile.am
rename to win32/Makefile.am
index 756df3a..ef3498d 100644
--- a/build/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,11 +1,7 @@
-SUBDIRS = \
- vs9 \
- vs10 \
- vs11 \
- vs12 \
- vs14
+SUBDIRS = vs9 vs10 vs11 vs12 vs14
EXTRA_DIST = \
+ Makefile.msvc-introspection \
detectenv-msvc.mak \
gen-win32-cairo-gir.py \
gen-win32-g-ir-tools.py \
diff --git a/build/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
similarity index 67%
rename from build/Makefile.msvc-introspection
rename to win32/Makefile.msvc-introspection
index 6c90964..28e8b50 100644
--- a/build/Makefile.msvc-introspection
+++ b/win32/Makefile.msvc-introspection
@@ -2,7 +2,7 @@
# Common autotools file for constructing the g-ir-scanner and
# g-ir-compiler command lines for Visual Studio builds.
-# This is copied from $(srcroot)/build from the gobject-introspection
+# 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.
@@ -18,7 +18,7 @@
# is required unless --headers-only is specified in
# YourLib_1_0_gir__MSVC_SCANNERFLAGS)
#
-# include $(top_srcdir)/build/Makefile.msvc-introspection
+# include <this Makefile.msvc-introspection
# 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
@@ -79,47 +79,47 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
$($(_gir_name)_MSVC_PROGRAM)),,
$(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
-$(top_builddir)/build/win32/$(_gir_name)_list:
+$(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)/build/win32/$(_gir_name)_list \
+ echo '..\..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list
\
;; \
esac; \
done
-$(top_builddir)/build/win32/$(1).msvc.introspect:
- -$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect
+$(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)/build/win32/$(1).msvc.introspect
- echo ' @-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --verbose -no-libtool \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR)
\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --cflags-begin \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --cflags-end \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
+ 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 ' --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)/build/win32/$(1).msvc.introspect
- echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' '$(1)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
- echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
+ 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
new file mode 100644
index 0000000..2e96e12
--- /dev/null
+++ b/win32/Makefile.msvcproj
@@ -0,0 +1,153 @@
+# 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 <this 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 = ... # <list of headers to exclude from installation, separated by '|',
wildcards allowed; use random unsed value if none>
+#
+# 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 ' <File RelativePath="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles
&& \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source
Files</Filter></ClCompile>' >>$(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 ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs12.sourcefiles
&& \
+ echo ' <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source
Files</Filter></ClCompile>' >>$(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/build/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak
similarity index 100%
rename from build/win32/detectenv-msvc.mak
rename to win32/detectenv-msvc.mak
diff --git a/build/win32/gen-win32-cairo-gir.py b/win32/gen-win32-cairo-gir.py
similarity index 96%
rename from build/win32/gen-win32-cairo-gir.py
rename to win32/gen-win32-cairo-gir.py
index 09a5a50..f26031b 100644
--- a/build/win32/gen-win32-cairo-gir.py
+++ b/win32/gen-win32-cairo-gir.py
@@ -25,7 +25,7 @@ def main(argv):
args = parser.parse_args()
# Get the srcroot and the path where the bundled .gir files reside in the package
- srcroot = parent_dir(parent_dir(__file__))
+ srcroot = parent_dir(__file__)
preset_gir_path = os.path.join(srcroot, 'gir')
# Set up variables in cairo-1.0.gir.in to produce cairo-1.0.gir
diff --git a/build/win32/gen-win32-g-ir-tools.py b/win32/gen-win32-g-ir-tools.py
similarity index 97%
rename from build/win32/gen-win32-g-ir-tools.py
rename to win32/gen-win32-g-ir-tools.py
index 1336086..444fe80 100644
--- a/build/win32/gen-win32-g-ir-tools.py
+++ b/win32/gen-win32-g-ir-tools.py
@@ -42,7 +42,7 @@ def main(argv):
funcs = ['scanner_main','annotation_main','doc_main']
tools = ['g-ir-scanner','g-ir-annotation-tool','g-ir-doc-tool']
- srcroot = parent_dir(parent_dir(__file__))
+ srcroot = parent_dir(__file__)
preset_tools_path = os.path.join(srcroot, 'tools')
src = os.path.join(preset_tools_path, 'g-ir-tool-template.in')
diff --git a/build/win32/gi-build-common-msvc.mak b/win32/gi-build-common-msvc.mak
similarity index 96%
rename from build/win32/gi-build-common-msvc.mak
rename to win32/gi-build-common-msvc.mak
index e122003..6d36ba8 100644
--- a/build/win32/gi-build-common-msvc.mak
+++ b/win32/gi-build-common-msvc.mak
@@ -12,7 +12,7 @@ CHECK_PACKAGE = gio-$(GLIB_APIVERSION)
!include introspection-msvc.mak
BINDIR = vs$(VSVER)\$(CFG)\$(PLAT)\bin
-TOP_SRCDIR = ..\..
+TOP_SRCDIR = ..
G_IR_SCANNER_CURRENT = $(TOP_SRCDIR)\tools\g-ir-scanner
G_IR_DOC_TOOL_CURRENT = $(TOP_SRCDIR)\tools\g-ir-doc-tool
diff --git a/build/win32/gi-introspection-msvc.mak b/win32/gi-introspection-msvc.mak
similarity index 100%
rename from build/win32/gi-introspection-msvc.mak
rename to win32/gi-introspection-msvc.mak
diff --git a/build/win32/gi-setenv-msvc.mak b/win32/gi-setenv-msvc.mak
similarity index 100%
rename from build/win32/gi-setenv-msvc.mak
rename to win32/gi-setenv-msvc.mak
diff --git a/build/win32/gi-tests-msvc.mak b/win32/gi-tests-msvc.mak
similarity index 99%
rename from build/win32/gi-tests-msvc.mak
rename to win32/gi-tests-msvc.mak
index 5b26c00..0b1f59c 100644
--- a/build/win32/gi-tests-msvc.mak
+++ b/win32/gi-tests-msvc.mak
@@ -250,7 +250,7 @@ warn_tests_log.txt:
@-echo Runinng warn tests...
@-copy GObject-$(GLIB_APIVERSION).gir $(TOP_SRCDIR)\gir
@-copy GLib-$(GLIB_APIVERSION).gir $(TOP_SRCDIR)\gir
- @-set TOP_BUILDDIR=../..
+ @-set TOP_BUILDDIR=..
@-for %a in ($(TOP_SRCDIR)\tests\warn\*.h) do if not "%a" == "$(TOP_SRCDIR)\tests\warn\common.h"
$(PYTHON) $(TOP_SRCDIR)\tests\warn\warningtester.py %a >> $@
@-del $(TOP_SRCDIR)\gir\GObject-$(GLIB_APIVERSION).gir
@-del $(TOP_SRCDIR)\gir\GLib-$(GLIB_APIVERSION).gir
diff --git a/build/win32/gi_msvc_build_utils.py b/win32/gi_msvc_build_utils.py
similarity index 100%
rename from build/win32/gi_msvc_build_utils.py
rename to win32/gi_msvc_build_utils.py
diff --git a/build/win32/gipc.py b/win32/gipc.py
similarity index 100%
rename from build/win32/gipc.py
rename to win32/gipc.py
diff --git a/build/win32/introspection-msvc.mak b/win32/introspection-msvc.mak
similarity index 98%
rename from build/win32/introspection-msvc.mak
rename to win32/introspection-msvc.mak
index 8739844..26501f5 100644
--- a/build/win32/introspection-msvc.mak
+++ b/win32/introspection-msvc.mak
@@ -8,7 +8,7 @@
# Change or pass in or set the following to suit your environment
!if "$(PREFIX)" == ""
-PREFIX = ..\..\..\vs$(VSVER)\$(PLAT)
+PREFIX = ..\..\vs$(VSVER)\$(PLAT)
!endif
!if ![setlocal] && \
diff --git a/build/win32/pc_base.py b/win32/pc_base.py
similarity index 99%
rename from build/win32/pc_base.py
rename to win32/pc_base.py
index 587ba83..285b6cd 100644
--- a/build/win32/pc_base.py
+++ b/win32/pc_base.py
@@ -23,7 +23,7 @@ class BasePCItems:
self.libdir = ''
self.prefix = ''
self.srcdir = os.path.dirname(__file__)
- self.top_srcdir = self.srcdir + '\\..\\..'
+ self.top_srcdir = self.srcdir + '\\..'
self.version = ''
def setup(self, argv, parser=None):
diff --git a/build/win32/replace.py b/win32/replace.py
similarity index 100%
rename from build/win32/replace.py
rename to win32/replace.py
diff --git a/build/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
similarity index 73%
rename from build/win32/vs10/Makefile.am
rename to win32/vs10/Makefile.am
index a686ddb..70d3977 100644
--- a/build/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -36,11 +36,11 @@ EXTRA_DIST = \
README.txt \
$(GENERATED_ITEMS)
-gi-install.props: $(top_srcdir)/build/win32/vs10/gi-install.propsin girepository.vs10.headers
giscanner.vs10.scripts
- -$(RM) $(top_builddir)/build/win32/vs11/gi-install.props
- -$(RM) $(top_builddir)/build/win32/vs12/gi-install.props
- -$(RM) $(top_builddir)/build/win32/vs14/gi-install.props
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gi-install.propsin >$@
+gi-install.props: $(top_srcdir)/win32/vs10/gi-install.propsin girepository.vs10.headers
giscanner.vs10.scripts
+ -$(RM) $(top_builddir)/win32/vs11/gi-install.props
+ -$(RM) $(top_builddir)/win32/vs12/gi-install.props
+ -$(RM) $(top_builddir)/win32/vs14/gi-install.props
+ $(CPP) -P - <$(top_srcdir)/win32/vs10/gi-install.propsin >$@
$(RM) girepository.vs10.headers
$(RM) giscanner.vs10.scripts
diff --git a/build/win32/vs10/README.txt b/win32/vs10/README.txt
similarity index 100%
rename from build/win32/vs10/README.txt
rename to win32/vs10/README.txt
diff --git a/build/win32/vs10/_giscanner.vcxproj b/win32/vs10/_giscanner.vcxproj
similarity index 91%
rename from build/win32/vs10/_giscanner.vcxproj
rename to win32/vs10/_giscanner.vcxproj
index d6894e7..d8cb7f8 100644
--- a/build/win32/vs10/_giscanner.vcxproj
+++ b/win32/vs10/_giscanner.vcxproj
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
@@ -98,7 +98,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
<PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -124,7 +124,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
@@ -150,7 +150,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
<PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -171,10 +171,10 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\giscanner\giscannermodule.c" />
- <ClCompile Include="..\..\..\scannerlexer.c" />
- <ClCompile Include="..\..\..\scannerparser.c" />
- <ClCompile Include="..\..\..\giscanner\sourcescanner.c" />
+ <ClCompile Include="..\..\giscanner\giscannermodule.c" />
+ <ClCompile Include="..\..\scannerlexer.c" />
+ <ClCompile Include="..\..\scannerparser.c" />
+ <ClCompile Include="..\..\giscanner\sourcescanner.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="gi-prebuild.vcxproj">
@@ -185,4 +185,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/g-ir-inspect.vcxproj.filters b/win32/vs10/_giscanner.vcxproj.filters
similarity index 69%
copy from build/win32/vs10/g-ir-inspect.vcxproj.filters
copy to win32/vs10/_giscanner.vcxproj.filters
index 15ffa5c..1ddc9a2 100644
--- a/build/win32/vs10/g-ir-inspect.vcxproj.filters
+++ b/win32/vs10/_giscanner.vcxproj.filters
@@ -15,6 +15,9 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\tools\g-ir-inspect.c"><Filter>Sources</Filter></ClCompile>
+ <ClCompile Include="..\..\giscanner\giscannermodule.c"><Filter>Sources</Filter></ClCompile>
+ <ClCompile Include="..\..\scannerlexer.c"><Filter>Sources</Filter></ClCompile>
+ <ClCompile Include="..\..\scannerparser.c"><Filter>Sources</Filter></ClCompile>
+ <ClCompile Include="..\..\giscanner\sourcescanner.c"><Filter>Sources</Filter></ClCompile>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/cmph-bdz-test.vcxproj b/win32/vs10/cmph-bdz-test.vcxproj
similarity index 93%
rename from build/win32/vs10/cmph-bdz-test.vcxproj
rename to win32/vs10/cmph-bdz-test.vcxproj
index 5ea7323..c465fa5 100644
--- a/build/win32/vs10/cmph-bdz-test.vcxproj
+++ b/win32/vs10/cmph-bdz-test.vcxproj
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -119,7 +119,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -142,7 +142,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -160,7 +160,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\girepository\cmph-bdz-test.c" />
+ <ClCompile Include="..\..\girepository\cmph-bdz-test.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="cmph.vcxproj">
@@ -171,4 +171,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cmph-bdz-test.vcxproj.filters b/win32/vs10/cmph-bdz-test.vcxproj.filters
similarity index 92%
rename from build/win32/vs10/cmph-bdz-test.vcxproj.filters
rename to win32/vs10/cmph-bdz-test.vcxproj.filters
index 40858f2..2720d49 100644
--- a/build/win32/vs10/cmph-bdz-test.vcxproj.filters
+++ b/win32/vs10/cmph-bdz-test.vcxproj.filters
@@ -15,8 +15,8 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\girepository\cmph-bdz-test.c">
+ <ClCompile Include="..\..\girepository\cmph-bdz-test.c">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/cmph.vcxproj.filtersin b/win32/vs10/cmph.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/cmph.vcxproj.filtersin
rename to win32/vs10/cmph.vcxproj.filtersin
diff --git a/build/win32/vs10/cmph.vcxprojin b/win32/vs10/cmph.vcxprojin
similarity index 100%
rename from build/win32/vs10/cmph.vcxprojin
rename to win32/vs10/cmph.vcxprojin
diff --git a/build/win32/vs10/g-ir-compiler.vcxproj.filtersin b/win32/vs10/g-ir-compiler.vcxproj.filtersin
similarity index 90%
rename from build/win32/vs10/g-ir-compiler.vcxproj.filtersin
rename to win32/vs10/g-ir-compiler.vcxproj.filtersin
index 0e1860d..6656d41 100644
--- a/build/win32/vs10/g-ir-compiler.vcxproj.filtersin
+++ b/win32/vs10/g-ir-compiler.vcxproj.filtersin
@@ -16,6 +16,6 @@
</ItemGroup>
<ItemGroup>
#include "g-ir-compiler.vs10.sourcefiles.filters"
- <ClCompile Include="..\..\..\tools\compiler.c"><Filter>Sources</Filter></ClCompile>
+ <ClCompile Include="..\..\tools\compiler.c"><Filter>Sources</Filter></ClCompile>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/g-ir-compiler.vcxprojin b/win32/vs10/g-ir-compiler.vcxprojin
similarity index 99%
rename from build/win32/vs10/g-ir-compiler.vcxprojin
rename to win32/vs10/g-ir-compiler.vcxprojin
index 0f4af14..f7a94f6 100644
--- a/build/win32/vs10/g-ir-compiler.vcxprojin
+++ b/win32/vs10/g-ir-compiler.vcxprojin
@@ -164,7 +164,7 @@
</ItemDefinitionGroup>
<ItemGroup>
#include "g-ir-compiler.vs10.sourcefiles"
- <ClCompile Include="..\..\..\tools\compiler.c" />
+ <ClCompile Include="..\..\tools\compiler.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="cmph.vcxproj">
diff --git a/build/win32/vs10/g-ir-generate.vcxproj b/win32/vs10/g-ir-generate.vcxproj
similarity index 98%
rename from build/win32/vs10/g-ir-generate.vcxproj
rename to win32/vs10/g-ir-generate.vcxproj
index cdbf220..f7ea403 100644
--- a/build/win32/vs10/g-ir-generate.vcxproj
+++ b/win32/vs10/g-ir-generate.vcxproj
@@ -155,8 +155,8 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\tools\generate.c" />
- <ClCompile Include="..\..\..\girepository\girwriter.c" />
+ <ClCompile Include="..\..\tools\generate.c" />
+ <ClCompile Include="..\..\girepository\girwriter.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="girepository.vcxproj">
@@ -167,4 +167,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/g-ir-generate.vcxproj.filters b/win32/vs10/g-ir-generate.vcxproj.filters
similarity index 88%
rename from build/win32/vs10/g-ir-generate.vcxproj.filters
rename to win32/vs10/g-ir-generate.vcxproj.filters
index db77dd1..b3b32ef 100644
--- a/build/win32/vs10/g-ir-generate.vcxproj.filters
+++ b/win32/vs10/g-ir-generate.vcxproj.filters
@@ -15,11 +15,11 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\tools\generate.c">
+ <ClCompile Include="..\..\tools\generate.c">
<Filter>Sources</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\girepository\girwriter.c">
+ <ClCompile Include="..\..\girepository\girwriter.c">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/g-ir-inspect.vcxproj b/win32/vs10/g-ir-inspect.vcxproj
similarity index 99%
rename from build/win32/vs10/g-ir-inspect.vcxproj
rename to win32/vs10/g-ir-inspect.vcxproj
index 3fba232..489a230 100644
--- a/build/win32/vs10/g-ir-inspect.vcxproj
+++ b/win32/vs10/g-ir-inspect.vcxproj
@@ -155,7 +155,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\tools\g-ir-inspect.c" />
+ <ClCompile Include="..\..\tools\g-ir-inspect.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="girepository.vcxproj">
diff --git a/build/win32/vs10/g-ir-inspect.vcxproj.filters b/win32/vs10/g-ir-inspect.vcxproj.filters
similarity index 89%
rename from build/win32/vs10/g-ir-inspect.vcxproj.filters
rename to win32/vs10/g-ir-inspect.vcxproj.filters
index 15ffa5c..371419a 100644
--- a/build/win32/vs10/g-ir-inspect.vcxproj.filters
+++ b/win32/vs10/g-ir-inspect.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\tools\g-ir-inspect.c"><Filter>Sources</Filter></ClCompile>
+ <ClCompile Include="..\..\tools\g-ir-inspect.c"><Filter>Sources</Filter></ClCompile>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gi-build-defines.props b/win32/vs10/gi-build-defines.props
similarity index 88%
rename from build/win32/vs10/gi-build-defines.props
rename to win32/vs10/gi-build-defines.props
index 755a472..0b66dcf 100644
--- a/build/win32/vs10/gi-build-defines.props
+++ b/win32/vs10/gi-build-defines.props
@@ -18,7 +18,7 @@ nmake -f gi-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallR
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..;..\..\..\girepository;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..;..\..\girepository;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/build/win32/vs10/gi-gen-srcs.props b/win32/vs10/gi-gen-srcs.props
similarity index 92%
rename from build/win32/vs10/gi-gen-srcs.props
rename to win32/vs10/gi-gen-srcs.props
index 8f7ab6e..0a5d2c6 100644
--- a/build/win32/vs10/gi-gen-srcs.props
+++ b/win32/vs10/gi-gen-srcs.props
@@ -4,7 +4,7 @@
<Import Project="gi-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
+ <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
<GenToolsScripts>$(PythonDir)\python ..\gen-win32-g-ir-tools.py</GenToolsScripts>
<GenToolsScriptsX64>$(PythonDirX64)\python ..\gen-win32-g-ir-tools.py</GenToolsScriptsX64>
</PropertyGroup>
diff --git a/build/win32/vs10/gi-install.propsin b/win32/vs10/gi-install.propsin
similarity index 87%
rename from build/win32/vs10/gi-install.propsin
rename to win32/vs10/gi-install.propsin
index 373ae95..8b8f431 100644
--- a/build/win32/vs10/gi-install.propsin
+++ b/win32/vs10/gi-install.propsin
@@ -17,9 +17,9 @@ copy $(BinDir)\g-ir-generate.exe $(CopyDir)\bin
copy $(BinDir)\g-ir-generate.pdb $(CopyDir)\bin
copy $(BinDir)\g-ir-inspect.exe $(CopyDir)\bin
copy $(BinDir)\g-ir-inspect.pdb $(CopyDir)\bin
-copy ..\..\..\tools\g-ir-annotation-tool $(CopyDir)\bin
-copy ..\..\..\tools\g-ir-doc-tool $(CopyDir)\bin
-copy ..\..\..\tools\g-ir-scanner $(CopyDir)\bin
+copy ..\..\tools\g-ir-annotation-tool $(CopyDir)\bin
+copy ..\..\tools\g-ir-doc-tool $(CopyDir)\bin
+copy ..\..\tools\g-ir-scanner $(CopyDir)\bin
copy $(BinDir)\glib-print.exe $(CopyDir)\bin
copy $(BinDir)\glib-print.pdb $(CopyDir)\bin
@@ -29,18 +29,18 @@ mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository
#include "giscanner.vs10.scripts"
mkdir $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests
+copy ..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests
+copy ..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests
+copy ..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests
+copy ..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests
+copy ..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests
copy $(BinDir)\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner
copy $(BinDir)\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner
mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-copy ..\..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)
+copy ..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)
mkdir $(CopyDir)\lib
diff --git a/build/win32/vs10/gi-install.vcxproj b/win32/vs10/gi-install.vcxproj
similarity index 73%
rename from build/win32/vs10/gi-install.vcxproj
rename to win32/vs10/gi-install.vcxproj
index 988d992..e9038fc 100644
--- a/build/win32/vs10/gi-install.vcxproj
+++ b/win32/vs10/gi-install.vcxproj
@@ -67,14 +67,10 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
+ <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ItemDefinitionGroup>
@@ -85,23 +81,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</ItemDefinitionGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIDoInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">some_random_file;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIDoInstall)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">some_random_file;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIDoInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">some_random_file;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build
Results...</Message>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIPCFiles)</AdditionalInputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIDoInstall)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">some_random_file;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\config.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
+ <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GIPCFiles)</AdditionalInputs>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GIDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">some_random_file;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
+ <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GIPCFiles)</AdditionalInputs>
+ <Command Condition="'$(Configuration)'=='Release'">$(GIDoInstall)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">some_random_file;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\gipc.py">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
diff --git a/build/win32/vs10/gi-install.vcxproj.filters b/win32/vs10/gi-install.vcxproj.filters
similarity index 84%
rename from build/win32/vs10/gi-install.vcxproj.filters
rename to win32/vs10/gi-install.vcxproj.filters
index 6725a63..590ad10 100644
--- a/build/win32/vs10/gi-install.vcxproj.filters
+++ b/win32/vs10/gi-install.vcxproj.filters
@@ -7,7 +7,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
<CustomBuild Include="..\gipc.py"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
</Project>
diff --git a/build/win32/vs10/gi-introspect.vcxproj b/win32/vs10/gi-introspect.vcxproj
similarity index 100%
rename from build/win32/vs10/gi-introspect.vcxproj
rename to win32/vs10/gi-introspect.vcxproj
diff --git a/build/win32/vs10/gi-prebuild.vcxproj b/win32/vs10/gi-prebuild.vcxproj
similarity index 56%
rename from build/win32/vs10/gi-prebuild.vcxproj
rename to win32/vs10/gi-prebuild.vcxproj
index 19ba7fb..88cea9a 100644
--- a/build/win32/vs10/gi-prebuild.vcxproj
+++ b/win32/vs10/gi-prebuild.vcxproj
@@ -67,10 +67,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
+ <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ItemDefinitionGroup>
@@ -81,33 +79,20 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</ItemDefinitionGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\config.h.win32">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyConfigH)</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\config.h;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from
config.h.win32...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\config.h.win32">
+ <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
+ <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\tools\g-ir-tool-template.in">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Tools
Scripts...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenToolsScripts)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Tools Scripts...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenToolsScriptsX64)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Tools
Scripts...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenToolsScripts)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Tools
Scripts...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenToolsScriptsX64)</Command>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+ <CustomBuild Include="..\..\tools\g-ir-tool-template.in">
+ <Message Condition="'$(Configuration)'=='Debug'">Generating Tools Scripts...</Message>
+ <Command Condition="'$(Configuration)'=='Debug'">$(GenToolsScripts)</Command>
+ <Message Condition="'$(Configuration)'=='Release'">Generating Tools Scripts...</Message>
+ <Command Condition="'$(Configuration)'=='Release'">$(GenToolsScripts)</Command>
+ <Outputs
Condition="'$(Configuration)'=='Release'">..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
@@ -115,4 +100,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gi-version-paths.props.in b/win32/vs10/gi-version-paths.props.in
similarity index 95%
rename from build/win32/vs10/gi-version-paths.props.in
rename to win32/vs10/gi-version-paths.props.in
index bdb0dd9..4936c4e 100644
--- a/build/win32/vs10/gi-version-paths.props.in
+++ b/win32/vs10/gi-version-paths.props.in
@@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup Label="UserMacros">
<VSVer>10</VSVer>
- <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<!-- PythonDir needs to point to a 32-bit/x86 Python 2.7/3.3+ installation -->
<PythonDir>c:\\python34</PythonDir>
@@ -11,7 +11,7 @@
<IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
<IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
<GIVersion>@PACKAGE_VERSION@</GIVersion>
- <BASE_GI_DIR>$(SolutionDir)\..\..\..</BASE_GI_DIR>
+ <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
<ApiVersion>1.0</ApiVersion>
<DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
<LibGILibtoolCompatibleDllPrefix>lib</LibGILibtoolCompatibleDllPrefix>
diff --git a/build/win32/vs10/girepository.vcxproj.filtersin b/win32/vs10/girepository.vcxproj.filtersin
similarity index 100%
rename from build/win32/vs10/girepository.vcxproj.filtersin
rename to win32/vs10/girepository.vcxproj.filtersin
diff --git a/build/win32/vs10/girepository.vcxprojin b/win32/vs10/girepository.vcxprojin
similarity index 95%
rename from build/win32/vs10/girepository.vcxprojin
rename to win32/vs10/girepository.vcxprojin
index 3824bb8..4339f77 100644
--- a/build/win32/vs10/girepository.vcxprojin
+++ b/win32/vs10/girepository.vcxprojin
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -99,7 +99,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -126,7 +126,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -153,7 +153,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<AdditionalIncludeDirectories>..\..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
diff --git a/build/win32/vs10/glib-print.vcxproj b/win32/vs10/glib-print.vcxproj
similarity index 99%
rename from build/win32/vs10/glib-print.vcxproj
rename to win32/vs10/glib-print.vcxproj
index 9c14a13..78fe23e 100644
--- a/build/win32/vs10/glib-print.vcxproj
+++ b/win32/vs10/glib-print.vcxproj
@@ -155,7 +155,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\glib-print.c" />
+ <ClCompile Include="..\..\examples\glib-print.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="girepository.vcxproj">
@@ -166,4 +166,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/glib-print.vcxproj.filters b/win32/vs10/glib-print.vcxproj.filters
similarity index 92%
rename from build/win32/vs10/glib-print.vcxproj.filters
rename to win32/vs10/glib-print.vcxproj.filters
index 124e678..f77043c 100644
--- a/build/win32/vs10/glib-print.vcxproj.filters
+++ b/win32/vs10/glib-print.vcxproj.filters
@@ -15,8 +15,8 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\glib-print.c">
+ <ClCompile Include="..\..\examples\glib-print.c">
<Filter>Sources</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/gobject-introspection.sln b/win32/vs10/gobject-introspection.sln
similarity index 100%
rename from build/win32/vs10/gobject-introspection.sln
rename to win32/vs10/gobject-introspection.sln
diff --git a/build/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
similarity index 94%
rename from build/win32/vs11/Makefile.am
rename to win32/vs11/Makefile.am
index bf9a78f..532f20c 100644
--- a/build/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -34,4 +34,4 @@ MSVC_VER = 11
MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 2012
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
similarity index 94%
rename from build/win32/vs12/Makefile.am
rename to win32/vs12/Makefile.am
index a437993..45e18bd 100644
--- a/build/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -34,4 +34,4 @@ MSVC_VER = 12
MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 2013
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
similarity index 94%
rename from build/win32/vs14/Makefile.am
rename to win32/vs14/Makefile.am
index 1d928a4..4f292ec 100644
--- a/build/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -34,4 +34,4 @@ MSVC_VER = 14
MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 14
-include $(top_srcdir)/build/Makefile-newvs.am
+include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/build/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
similarity index 77%
rename from build/win32/vs9/Makefile.am
rename to win32/vs9/Makefile.am
index 8dc44f4..a92d30c 100644
--- a/build/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -24,8 +24,8 @@ EXTRA_DIST = \
README.txt \
$(GENERATED_ITEMS)
-gi-install.vsprops: $(top_srcdir)/build/win32/vs9/gi-install.vspropsin girepository.headers giscanner.scripts
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gi-install.vspropsin >$@
+gi-install.vsprops: $(top_srcdir)/win32/vs9/gi-install.vspropsin girepository.headers giscanner.scripts
+ $(CPP) -P - <$(top_srcdir)/win32/vs9/gi-install.vspropsin >$@
rm girepository.headers
rm giscanner.scripts
diff --git a/build/win32/vs9/README.txt b/win32/vs9/README.txt
similarity index 100%
rename from build/win32/vs9/README.txt
rename to win32/vs9/README.txt
diff --git a/build/win32/vs9/_giscanner.vcproj b/win32/vs9/_giscanner.vcproj
similarity index 87%
rename from build/win32/vs9/_giscanner.vcproj
rename to win32/vs9/_giscanner.vcproj
index c19faf7..c6f0a3e 100644
--- a/build/win32/vs9/_giscanner.vcproj
+++ b/win32/vs9/_giscanner.vcproj
@@ -28,7 +28,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\giscanner;;$(PythonDir)\include;$(PythonDir)\PC"
+
AdditionalIncludeDirectories="..\..\giscanner;;$(PythonDir)\include;$(PythonDir)\PC"
ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h"
PreprocessorDefinitions="_DEBUG;YY_NO_UNISTD_H"
MinimalRebuild="true"
@@ -59,7 +59,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
-
AdditionalIncludeDirectories="..\..\..\giscanner;;$(PythonDir)\include;$(PythonDir)\PC"
+
AdditionalIncludeDirectories="..\..\giscanner;;$(PythonDir)\include;$(PythonDir)\PC"
ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h"
PreprocessorDefinitions="YY_NO_UNISTD_H"
RuntimeLibrary="2"
@@ -93,7 +93,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\giscanner;;$(PythonDirX64)\include;$(PythonDirX64)\PC"
+
AdditionalIncludeDirectories="..\..\giscanner;;$(PythonDirX64)\include;$(PythonDirX64)\PC"
ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h"
PreprocessorDefinitions="_DEBUG;YY_NO_UNISTD_H"
MinimalRebuild="true"
@@ -128,7 +128,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
-
AdditionalIncludeDirectories="..\..\..\giscanner;;$(PythonDirX64)\include;$(PythonDirX64)\PC"
+
AdditionalIncludeDirectories="..\..\giscanner;;$(PythonDirX64)\include;$(PythonDirX64)\PC"
ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h"
PreprocessorDefinitions="YY_NO_UNISTD_H"
RuntimeLibrary="2"
@@ -158,10 +158,10 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\giscanner\giscannermodule.c" />
- <File RelativePath="..\..\..\scannerlexer.c" />
- <File RelativePath="..\..\..\scannerparser.c" />
- <File RelativePath="..\..\..\giscanner\sourcescanner.c" />
+ <File RelativePath="..\..\giscanner\giscannermodule.c" />
+ <File RelativePath="..\..\scannerlexer.c" />
+ <File RelativePath="..\..\scannerparser.c" />
+ <File RelativePath="..\..\giscanner\sourcescanner.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/cmph-bdz-test.vcproj b/win32/vs9/cmph-bdz-test.vcproj
similarity index 92%
rename from build/win32/vs9/cmph-bdz-test.vcproj
rename to win32/vs9/cmph-bdz-test.vcproj
index d83bcdb..a7d3fb3 100644
--- a/build/win32/vs9/cmph-bdz-test.vcproj
+++ b/win32/vs9/cmph-bdz-test.vcproj
@@ -28,7 +28,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\girepository\cmph"
+ AdditionalIncludeDirectories="..\..\girepository\cmph"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -56,7 +56,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\girepository\cmph"
+ AdditionalIncludeDirectories="..\..\girepository\cmph"
PreprocessorDefinitions=""
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -88,7 +88,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\girepository\cmph"
+ AdditionalIncludeDirectories="..\..\girepository\cmph"
PreprocessorDefinitions="_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -120,7 +120,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\girepository\cmph"
+ AdditionalIncludeDirectories="..\..\girepository\cmph"
PreprocessorDefinitions=""
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -147,7 +147,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\girepository\cmph-bdz-test.c" />
+ <File RelativePath="..\..\girepository\cmph-bdz-test.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/cmph.vcprojin b/win32/vs9/cmph.vcprojin
similarity index 100%
rename from build/win32/vs9/cmph.vcprojin
rename to win32/vs9/cmph.vcprojin
diff --git a/build/win32/vs9/g-ir-compiler.vcprojin b/win32/vs9/g-ir-compiler.vcprojin
similarity index 98%
rename from build/win32/vs9/g-ir-compiler.vcprojin
rename to win32/vs9/g-ir-compiler.vcprojin
index b18648f..d085008 100644
--- a/build/win32/vs9/g-ir-compiler.vcprojin
+++ b/win32/vs9/g-ir-compiler.vcprojin
@@ -153,7 +153,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
#include "g-ir-compiler.sourcefiles"
- <File RelativePath="..\..\..\tools\compiler.c" />
+ <File RelativePath="..\..\tools\compiler.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/g-ir-generate.vcproj b/win32/vs9/g-ir-generate.vcproj
similarity index 96%
rename from build/win32/vs9/g-ir-generate.vcproj
rename to win32/vs9/g-ir-generate.vcproj
index ebd3c2b..5e4ee10 100644
--- a/build/win32/vs9/g-ir-generate.vcproj
+++ b/win32/vs9/g-ir-generate.vcproj
@@ -142,8 +142,8 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\tools\generate.c" />
- <File RelativePath="..\..\..\girepository\girwriter.c" />
+ <File RelativePath="..\..\tools\generate.c" />
+ <File RelativePath="..\..\girepository\girwriter.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/g-ir-inspect.vcproj b/win32/vs9/g-ir-inspect.vcproj
similarity index 98%
rename from build/win32/vs9/g-ir-inspect.vcproj
rename to win32/vs9/g-ir-inspect.vcproj
index 5e37320..b7b444a 100644
--- a/build/win32/vs9/g-ir-inspect.vcproj
+++ b/win32/vs9/g-ir-inspect.vcproj
@@ -142,7 +142,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\tools\g-ir-inspect.c" />
+ <File RelativePath="..\..\tools\g-ir-inspect.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/gi-build-defines.vsprops b/win32/vs9/gi-build-defines.vsprops
similarity index 89%
rename from build/win32/vs9/gi-build-defines.vsprops
rename to win32/vs9/gi-build-defines.vsprops
index 7fbf93e..61e6e5e 100644
--- a/build/win32/vs9/gi-build-defines.vsprops
+++ b/win32/vs9/gi-build-defines.vsprops
@@ -9,7 +9,7 @@
>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..;..\..\..\girepository;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
+
AdditionalIncludeDirectories="..\..;..\..\girepository;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
PreprocessorDefinitions="HAVE_CONFIG_H;WIN32"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
AdditionalOptions="/MP"
diff --git a/build/win32/vs9/gi-gen-srcs.vsprops b/win32/vs9/gi-gen-srcs.vsprops
similarity index 89%
rename from build/win32/vs9/gi-gen-srcs.vsprops
rename to win32/vs9/gi-gen-srcs.vsprops
index 8a24978..124b0d0 100644
--- a/build/win32/vs9/gi-gen-srcs.vsprops
+++ b/win32/vs9/gi-gen-srcs.vsprops
@@ -7,7 +7,7 @@
>
<UserMacro
Name="CopyConfigH"
- Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
+ Value="copy ..\..\config.h.win32 ..\..\config.h"
/>
<UserMacro
Name="GenToolsScripts"
diff --git a/build/win32/vs9/gi-install.vcproj b/win32/vs9/gi-install.vcproj
similarity index 100%
rename from build/win32/vs9/gi-install.vcproj
rename to win32/vs9/gi-install.vcproj
diff --git a/build/win32/vs9/gi-install.vspropsin b/win32/vs9/gi-install.vspropsin
similarity index 87%
rename from build/win32/vs9/gi-install.vspropsin
rename to win32/vs9/gi-install.vspropsin
index 1b5e2d1..1750695 100644
--- a/build/win32/vs9/gi-install.vspropsin
+++ b/win32/vs9/gi-install.vspropsin
@@ -18,9 +18,9 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-generate.exe $(
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-generate.pdb $(CopyDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-inspect.exe $(CopyDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-inspect.pdb $(CopyDir)\bin

-copy ..\..\..\tools\g-ir-annotation-tool $(CopyDir)\bin

-copy ..\..\..\tools\g-ir-doc-tool $(CopyDir)\bin

-copy ..\..\..\tools\g-ir-scanner $(CopyDir)\bin

+copy ..\..\tools\g-ir-annotation-tool $(CopyDir)\bin

+copy ..\..\tools\g-ir-doc-tool $(CopyDir)\bin

+copy ..\..\tools\g-ir-scanner $(CopyDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-print.exe $(CopyDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-print.pdb $(CopyDir)\bin

@@ -30,11 +30,11 @@ mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository

#include "giscanner.scripts"
mkdir $(CopyDir)\share\gobject-introspection-1.0\tests

-copy ..\..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests

-copy ..\..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests

-copy ..\..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests

-copy ..\..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests

-copy ..\..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests

+copy ..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests

+copy ..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests

+copy ..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests

+copy ..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests

+copy ..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pyd
$(CopyDir)\lib\gobject-introspection\giscanner

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pdb
$(CopyDir)\lib\gobject-introspection\giscanner

@@ -42,7 +42,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pdb $(Cop
mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)

-copy ..\..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)

+copy ..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)

mkdir $(CopyDir)\lib

diff --git a/build/win32/vs9/gi-introspect.vcproj b/win32/vs9/gi-introspect.vcproj
similarity index 100%
rename from build/win32/vs9/gi-introspect.vcproj
rename to win32/vs9/gi-introspect.vcproj
diff --git a/build/win32/vs9/gi-prebuild.vcproj b/win32/vs9/gi-prebuild.vcproj
similarity index 82%
rename from build/win32/vs9/gi-prebuild.vcproj
rename to win32/vs9/gi-prebuild.vcproj
index e50e892..b045132 100644
--- a/build/win32/vs9/gi-prebuild.vcproj
+++ b/win32/vs9/gi-prebuild.vcproj
@@ -60,13 +60,13 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File RelativePath="..\..\..\config.h.win32">
+ <File RelativePath="..\..\config.h.win32">
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(CopyConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -74,7 +74,7 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(CopyConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -82,7 +82,7 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(CopyConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -90,17 +90,17 @@
Name="VCCustomBuildTool"
Description="Copying config.h from config.h.win32..."
CommandLine="$(CopyConfigH)"
- Outputs="..\..\..\config.h"
+ Outputs="..\..\config.h"
/>
</FileConfiguration>
</File>
- <File RelativePath="..\..\..\tools\g-ir-tool-template.in">
+ <File RelativePath="..\..\tools\g-ir-tool-template.in">
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating Tools Scripts..."
CommandLine="$(GenToolsScripts)"
-
Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
+
Outputs="..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -108,7 +108,7 @@
Name="VCCustomBuildTool"
Description="Generating Tools Scripts..."
CommandLine="$(GenToolsScripts)"
-
Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
+
Outputs="..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -116,7 +116,7 @@
Name="VCCustomBuildTool"
Description="Generating Tools Scripts..."
CommandLine="$(GenToolsScriptsX64)"
-
Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
+
Outputs="..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -124,7 +124,7 @@
Name="VCCustomBuildTool"
Description="Generating Tools Scripts..."
CommandLine="$(GenToolsScriptsX64)"
-
Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
+
Outputs="..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool"
/>
</FileConfiguration>
</File>
diff --git a/build/win32/vs9/gi-version-paths.vsprops.in b/win32/vs9/gi-version-paths.vsprops.in
similarity index 93%
rename from build/win32/vs9/gi-version-paths.vsprops.in
rename to win32/vs9/gi-version-paths.vsprops.in
index 8e2f858..2375809 100644
--- a/build/win32/vs9/gi-version-paths.vsprops.in
+++ b/win32/vs9/gi-version-paths.vsprops.in
@@ -10,7 +10,7 @@
/>
<UserMacro
Name="GlibEtcInstallRoot"
- Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ Value="$(SolutionDir)\..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
@@ -40,7 +40,7 @@
/>
<UserMacro
Name="BASE_GI_DIR"
- Value="$(SolutionDir)\..\..\.."
+ Value="$(SolutionDir)\..\.."
/>
<UserMacro
Name="ApiVersion"
diff --git a/build/win32/vs9/girepository.vcprojin b/win32/vs9/girepository.vcprojin
similarity index 95%
rename from build/win32/vs9/girepository.vcprojin
rename to win32/vs9/girepository.vcprojin
index b7d4063..681bbe9 100644
--- a/build/win32/vs9/girepository.vcprojin
+++ b/win32/vs9/girepository.vcprojin
@@ -28,7 +28,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\girepository"
+ AdditionalIncludeDirectories="..\..\girepository"
PreprocessorDefinitions="_DEBUG;$(GIRepositoryBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -59,7 +59,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\girepository"
+ AdditionalIncludeDirectories="..\..\girepository"
PreprocessorDefinitions="$(GIRepositoryBuildDefines)"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -93,7 +93,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\girepository"
+ AdditionalIncludeDirectories="..\..\girepository"
PreprocessorDefinitions="_DEBUG;$(GIRepositoryBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -128,7 +128,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\girepository"
+ AdditionalIncludeDirectories="..\..\girepository"
PreprocessorDefinitions="$(GIRepositoryBuildDefines)"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
diff --git a/build/win32/vs9/glib-print.vcproj b/win32/vs9/glib-print.vcproj
similarity index 98%
rename from build/win32/vs9/glib-print.vcproj
rename to win32/vs9/glib-print.vcproj
index f269dca..e6aa2d9 100644
--- a/build/win32/vs9/glib-print.vcproj
+++ b/win32/vs9/glib-print.vcproj
@@ -142,7 +142,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\examples\glib-print.c" />
+ <File RelativePath="..\..\examples\glib-print.c" />
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/gobject-introspection.sln b/win32/vs9/gobject-introspection.sln
similarity index 100%
rename from build/win32/vs9/gobject-introspection.sln
rename to win32/vs9/gobject-introspection.sln
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
