[gobject-introspection] MSVC Builds: "Add" Visual Studio 2015 Projects



commit 2a7515dc60c6cd3f360e3158b5913f0641ebe5c6
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Sep 25 15:13:07 2015 +0800

    MSVC Builds: "Add" Visual Studio 2015 Projects
    
    Update the common autotools module that was used to create the
    Visual Studio 2012/2013 projects so that we can create the 2015
    projects as well.  The 2015 projects, like the 2012 and 2013 ones
    are largely similar to the 2010 ones in format, so we just need to
    copy the 2010 projects and replace the items in there as needed.

 build/Makefile-newvs.am      |   24 ++++++++++++++++--------
 build/win32/Makefile.am      |    3 ++-
 build/win32/vs11/Makefile.am |    4 +---
 build/win32/vs12/Makefile.am |    4 +---
 build/win32/vs14/Makefile.am |   32 ++++++++++++++++++++++++++++++++
 configure.ac                 |    3 ++-
 6 files changed, 54 insertions(+), 16 deletions(-)
---
diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am
index e3acd91..97b2459 100644
--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -1,19 +1,27 @@
 # Centralized autotools file
-# Create the Visual Studio 2012/2013 project files
+# 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, and is copied into
+# $(srcroot)/build/.
+
 # Author: Fan, Chun-wei
 # November 05, 2012
 
-# MSVC_SLN: name of root project
-
-MSVC_FORMAT_VER=$(shell echo $$(expr $(MSVC_VER) + 1))
+# 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
 
-$(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln
-       cat $< | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 's/2010/$(MSVC_VER_LONG)/g' > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+%.sln:
+       sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp
+       sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+       rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp
 
-README.txt: $(top_srcdir)/build/win32/vs10/README.txt
-       cat $< | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+%.txt:
+       sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp
+       sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp > 
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+       rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$  tmp
 
 %.vcxproj:
        if test -e $(top_srcdir)/build/win32/vs10/$@; then \
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 31f582f..f30ee9b 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -2,5 +2,6 @@ SUBDIRS =       \
        vs9     \
        vs10    \
        vs11    \
-       vs12
+       vs12    \
+       vs14
 
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index 4789b66..6dd3b65 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -25,10 +25,8 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
-MSVC_SLN = gobject-introspection
-
 MSVC_VER = 11
-
+MSVC_FORMAT_VER = 12
 MSVC_VER_LONG = 2012
 
 include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index c363869..c4b8bc5 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -25,10 +25,8 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
-MSVC_SLN = gobject-introspection
-
 MSVC_VER = 12
-
+MSVC_FORMAT_VER = 12
 MSVC_VER_LONG = 2013
 
 include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
new file mode 100644
index 0000000..f6138f2
--- /dev/null
+++ b/build/win32/vs14/Makefile.am
@@ -0,0 +1,32 @@
+EXTRA_DIST = \
+       gobject-introspection.sln       \
+       gi-build-defines.props  \
+       gi-extra-paths.props    \
+       gi-gen-srcs.props       \
+       gi-install.props        \
+       gi-version-paths.props  \
+       gi-prebuild.vcxproj     \
+       girepository.vcxproj    \
+       girepository.vcxproj.filters    \
+       cmph-bdz-test.vcxproj   \
+       cmph-bdz-test.vcxproj.filters   \
+       cmph.vcxproj    \
+       cmph.vcxproj.filters    \
+       g-ir-compiler.vcxproj   \
+       g-ir-compiler.vcxproj.filters   \
+       g-ir-generate.vcxproj   \
+       g-ir-generate.vcxproj.filters   \
+       glib-print.vcxproj      \
+       glib-print.vcxproj.filters      \
+       _giscanner.vcxproj      \
+       _giscanner.vcxproj.filters      \
+       install.vcxproj \
+       README.txt
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_VER = 14
+MSVC_FORMAT_VER = 12
+MSVC_VER_LONG = 14
+
+include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/configure.ac b/configure.ac
index a41ece1..38bb285 100644
--- a/configure.ac
+++ b/configure.ac
@@ -366,5 +366,6 @@ build/win32/Makefile
 build/win32/vs9/Makefile
 build/win32/vs10/Makefile
 build/win32/vs11/Makefile
-build/win32/vs12/Makefile])
+build/win32/vs12/Makefile
+build/win32/vs14/Makefile])
 AC_OUTPUT


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]