builds: Move MSVC build files up one level

Put all the Visual Studio build files into win32/, not build/win32,
to simplify things, as the old build/win32 notion is a thing of the
past.

15 files changed, 46 insertions, 50 deletions

diff --git a/Makefile.am b/Makefile.am
index 96e6f6c..00c2de3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = headers schemas po build
+SUBDIRS = headers schemas po win32
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
diff --git a/build/Makefile.am b/build/Makefile.am
deleted file mode 100644
index 73e7a6f..0000000
--- a/build/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = win32
-
--include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 66ac67b..e02bfd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,8 @@ IT_PROG_INTLTOOL([0.50.1])
 AC_OUTPUT([
 Makefile
 gsettings-desktop-schemas.pc
-build/Makefile
-build/win32/Makefile
-build/win32/gsettings-desktop-schemas-msvc.mak
+win32/Makefile
+win32/gsettings-desktop-schemas-msvc.mak
 headers/Makefile
 schemas/Makefile
 po/Makefile.in
diff --git a/headers/Makefile.am b/headers/Makefile.am
index 530a488..6b2318d 100644
--- a/headers/Makefile.am
+++ b/headers/Makefile.am
@@ -27,8 +27,8 @@ CLEANFILES += $(gir_DATA) $(typelib_DATA)
 MSVC_INTROSPECT_GIRS = $(INTROSPECTION_GIRS)
 
 INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/build/win32/GDesktopEnums-3.0.gir.msvc.introspect	\
-	$(top_builddir)/build/win32/GDesktopEnums_3_0_gir_list
+	$(top_builddir)/win32/GDesktopEnums-3.0.gir.msvc.introspect	\
+	$(top_builddir)/win32/GDesktopEnums_3_0_gir_list
 
 GDesktopEnums_3_0_gir_MSVC_FILES = \
     $(GDesktopEnums_3_0_gir_FILES)
@@ -37,7 +37,7 @@ GDesktopEnums_3_0_gir_MSVC_SCANNERFLAGS = $(GDesktopEnums_3_0_gir_SCANNERFLAGS)
 
 GDesktopEnums_3_0_gir_MSVC_CFLAGS = -I..\\headers
 
-include $(top_srcdir)/build/Makefile.msvc-introspection
+include $(top_srcdir)/win32/Makefile.msvc-introspection
 
 dist-hook: $(INTROSPECTION_INTERMEDIATE_ITEMS)
 # --------------------------------------------------------------------
diff --git a/build/win32/Makefile.am b/win32/Makefile.am
index 22b6b2d..22b6b2d 100644
--- a/build/win32/Makefile.am
+++ b/win32/Makefile.am
diff --git a/build/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
index 6c90964..c1ed459 100644
--- a/build/Makefile.msvc-introspection
+++ b/win32/Makefile.msvc-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 $(top_srcdir)/win32/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/build/win32/README.txt b/win32/README.txt
index 26ef824..26ef824 100644
--- a/build/win32/README.txt
+++ b/win32/README.txt
diff --git a/build/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak
index 6fd96cc..6fd96cc 100644
--- a/build/win32/detectenv-msvc.mak
+++ b/win32/detectenv-msvc.mak
diff --git a/build/win32/genpc.py b/win32/genpc.py
index 61438e0..61438e0 100644
--- a/build/win32/genpc.py
+++ b/win32/genpc.py
diff --git a/build/win32/genschema.py b/win32/genschema.py
index 31b690e..31b690e 100644
--- a/build/win32/genschema.py
+++ b/win32/genschema.py
diff --git a/build/win32/gsettings-desktop-schemas-msvc.mak.in b/win32/gsettings-desktop-schemas-msvc.mak.in
index 5bc95dc..706c1d1 100644
--- a/build/win32/gsettings-desktop-schemas-msvc.mak.in
+++ b/win32/gsettings-desktop-schemas-msvc.mak.in
@@ -17,7 +17,7 @@ PYTHON=python
 # if needed.  glib-compile-schemas.exe and glib-mkenums need to be found
 # in $(PREFIX)\bin
 !IF "$(PREFIX)" == ""
-PREFIX=..\..\..\vs$(VSVER)\$(PLAT)
+PREFIX=..\..\vs$(VSVER)\$(PLAT)
 !ENDIF
 
 !include introspection-msvc.mak
@@ -41,7 +41,7 @@ _HASH=^#
 !if ![del $(ERRNUL) /q/f uri.x]
 !endif
 
-!include ..\..\schemas\Makefile-schemas.include
+!include ..\schemas\Makefile-schemas.include
 
 !if ![@echo gschemas = ^\> schemas.files] \
 &&  ![for %f in ($(desktop_gschemas_in)) do @echo.  %~nf ^\>> schemas.files]
@@ -56,15 +56,15 @@ all: $(gschemas) org.gnome.desktop.enums.xml
 
 .SUFFIXES: .xml.in .xml
 
-{..\..\schemas\}.xml.in{}.xml:
+{..\schemas\}.xml.in{}.xml:
 	$(PYTHON) genschema.py --input=$< --output=$@ --package=@GETTEXT_PACKAGE@ --prefix=$(PREFIX_POSIX)
 
-org.gnome.desktop.enums.xml:
+org.gnome.desktop.enums.xml: ..\headers\gdesktop-enums.h
 	$(PERL) $(PREFIX)\bin\glib-mkenums --comments "<!-- @comment@ -->"	\
 	--fhead "<schemalist>"	\
 	--vhead "  <@type@ id='org.gnome.desktop.@EnumName@'>"	\
 	--vprod "    <value nick='@valuenick@' value='@valuenum@'/>"	\
-	--vtail "  </@type@>" --ftail "</schemalist>" ..\..\headers\gdesktop-enums.h	\
+	--vtail "  </@type@>" --ftail "</schemalist>" ..\headers\gdesktop-enums.h	\
 	> $@
 
 introspection: setgirbuildenv GDesktopEnums-3.0.gir GDesktopEnums-3.0.typelib
@@ -76,7 +76,7 @@ setgirbuildenv:
 
 !include introspection.body.mak
 
-gsettings-desktop-schemas.pc: ..\..\gsettings-desktop-schemas.pc.in
+gsettings-desktop-schemas.pc: ..\gsettings-desktop-schemas.pc.in
 	@echo Generating gsettings-desktop-schemas.pc...
 	$(PYTHON) genpc.py --prefix=$(PREFIX) --version=@PACKAGE_VERSION@
 
@@ -85,7 +85,7 @@ install: $(gschemas) org.gnome.desktop.enums.xml gsettings-desktop-schemas.pc
 	@-copy *.gschema.xml $(PREFIX)\share\glib-2.0\schemas
 	@-copy org.gnome.desktop.enums.xml $(PREFIX)\share\glib-2.0\schemas
 	@-if not exist $(PREFIX)\include\gsettings-desktop-schemas mkdir $(PREFIX)\include\gsettings-desktop-schemas
-	@-copy ..\..\headers\gdesktop-enums.h $(PREFIX)\include\gsettings-desktop-schemas
+	@-copy ..\headers\gdesktop-enums.h $(PREFIX)\include\gsettings-desktop-schemas
 	@-if exist *.gir @copy *.gir $(PREFIX)\share\gir-1.0
 	@-if exist *.typelib @copy *.typelib $(PREFIX)\lib\girepository-1.0
 	$(PREFIX)\bin\glib-compile-schemas.exe $(PREFIX)\share\glib-2.0\schemas
diff --git a/build/win32/introspection-msvc.mak b/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
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
index f215cce..f215cce 100644
--- a/build/win32/replace.py
+++ b/win32/replace.py
diff --git a/build/win32/uri.py b/win32/uri.py
index ec6d600..ec6d600 100644
--- a/build/win32/uri.py
+++ b/win32/uri.py