GNOME.org
 

[glibmm/master.nmake: 2/5] build: Rename MSVC_Net2017 to MSVC_NMake

commit 9a3cae177062ef1e9cfda9e799f0e4f46fbadf99
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Aug 17 17:22:02 2018 +0800

    build: Rename MSVC_Net2017 to MSVC_NMake
    
    This prepares for the transition to using NMake Makefiles for building
    glibmm, rather than the Visual Studio project files, to ease future
    maintenance.

 {MSVC_Net2017 => MSVC_NMake}/compose.vcxproj               |  0
 {MSVC_Net2017 => MSVC_NMake}/compose.vcxproj.filters       |  0
 {MSVC_Net2017 => MSVC_NMake}/dispatcher.vcxproj            |  0
 {MSVC_Net2017 => MSVC_NMake}/dispatcher.vcxproj.filters    |  0
 {MSVC_Net2017 => MSVC_NMake}/dispatcher2.vcxproj           |  0
 {MSVC_Net2017 => MSVC_NMake}/dispatcher2.vcxproj.filters   |  0
 {MSVC_Net2017 => MSVC_NMake}/filelist.am                   |  0
 {MSVC_Net2017 => MSVC_NMake}/gendef.vcxproj                |  0
 {MSVC_Net2017 => MSVC_NMake}/gendef.vcxproj.filters        |  0
 {MSVC_Net2017 => MSVC_NMake}/gendef/gendef.cc              |  0
 {MSVC_Net2017 => MSVC_NMake}/giomm.vcxproj                 |  0
 {MSVC_Net2017 => MSVC_NMake}/giomm.vcxproj.filters         |  0
 {MSVC_Net2017 => MSVC_NMake}/giomm/giomm.rc.in             |  0
 {MSVC_Net2017 => MSVC_NMake}/giomm_simple.vcxproj          |  0
 {MSVC_Net2017 => MSVC_NMake}/giomm_simple.vcxproj.filters  |  0
 {MSVC_Net2017 => MSVC_NMake}/glibmm-build-defines.props    |  0
 {MSVC_Net2017 => MSVC_NMake}/glibmm-install.props          |  0
 {MSVC_Net2017 => MSVC_NMake}/glibmm-version-paths.props    |  0
 {MSVC_Net2017 => MSVC_NMake}/glibmm.sln                    |  0
 {MSVC_Net2017 => MSVC_NMake}/glibmm.vcxproj                |  0
 {MSVC_Net2017 => MSVC_NMake}/glibmm.vcxproj.filters        |  0
 {MSVC_Net2017 => MSVC_NMake}/glibmm/glibmm.rc.in           |  0
 {MSVC_Net2017 => MSVC_NMake}/glibmm_value.vcxproj          |  0
 {MSVC_Net2017 => MSVC_NMake}/glibmm_value.vcxproj.filters  |  0
 {MSVC_Net2017 => MSVC_NMake}/install.vcxproj               |  0
 {MSVC_Net2017 => MSVC_NMake}/keyfile.vcxproj               |  0
 {MSVC_Net2017 => MSVC_NMake}/keyfile.vcxproj.filters       |  0
 {MSVC_Net2017 => MSVC_NMake}/markup.vcxproj                |  0
 {MSVC_Net2017 => MSVC_NMake}/markup.vcxproj.filters        |  0
 {MSVC_Net2017 => MSVC_NMake}/options.vcxproj               |  0
 {MSVC_Net2017 => MSVC_NMake}/options.vcxproj.filters       |  0
 {MSVC_Net2017 => MSVC_NMake}/properties.vcxproj            |  0
 {MSVC_Net2017 => MSVC_NMake}/properties.vcxproj.filters    |  0
 {MSVC_Net2017 => MSVC_NMake}/regex.vcxproj                 |  0
 {MSVC_Net2017 => MSVC_NMake}/regex.vcxproj.filters         |  0
 {MSVC_Net2017 => MSVC_NMake}/resolver.vcxproj              |  0
 {MSVC_Net2017 => MSVC_NMake}/resolver.vcxproj.filters      |  0
 {MSVC_Net2017 => MSVC_NMake}/socket-client.vcxproj         |  0
 {MSVC_Net2017 => MSVC_NMake}/socket-client.vcxproj.filters |  0
 {MSVC_Net2017 => MSVC_NMake}/socket-server.vcxproj         |  0
 {MSVC_Net2017 => MSVC_NMake}/socket-server.vcxproj.filters |  0
 {MSVC_Net2017 => MSVC_NMake}/thread.vcxproj                |  0
 {MSVC_Net2017 => MSVC_NMake}/thread.vcxproj.filters        |  0
 {MSVC_Net2017 => MSVC_NMake}/threadpool.vcxproj            |  0
 {MSVC_Net2017 => MSVC_NMake}/threadpool.vcxproj.filters    |  0
 Makefile.am                                                |  4 ++--
 README.win32                                               |  2 +-
 configure.ac                                               | 12 ++++++------
 48 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/MSVC_Net2017/compose.vcxproj b/MSVC_NMake/compose.vcxproj
similarity index 100%
rename from MSVC_Net2017/compose.vcxproj
rename to MSVC_NMake/compose.vcxproj
diff --git a/MSVC_Net2017/compose.vcxproj.filters b/MSVC_NMake/compose.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/compose.vcxproj.filters
rename to MSVC_NMake/compose.vcxproj.filters
diff --git a/MSVC_Net2017/dispatcher.vcxproj b/MSVC_NMake/dispatcher.vcxproj
similarity index 100%
rename from MSVC_Net2017/dispatcher.vcxproj
rename to MSVC_NMake/dispatcher.vcxproj
diff --git a/MSVC_Net2017/dispatcher.vcxproj.filters b/MSVC_NMake/dispatcher.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/dispatcher.vcxproj.filters
rename to MSVC_NMake/dispatcher.vcxproj.filters
diff --git a/MSVC_Net2017/dispatcher2.vcxproj b/MSVC_NMake/dispatcher2.vcxproj
similarity index 100%
rename from MSVC_Net2017/dispatcher2.vcxproj
rename to MSVC_NMake/dispatcher2.vcxproj
diff --git a/MSVC_Net2017/dispatcher2.vcxproj.filters b/MSVC_NMake/dispatcher2.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/dispatcher2.vcxproj.filters
rename to MSVC_NMake/dispatcher2.vcxproj.filters
diff --git a/MSVC_Net2017/filelist.am b/MSVC_NMake/filelist.am
similarity index 100%
rename from MSVC_Net2017/filelist.am
rename to MSVC_NMake/filelist.am
diff --git a/MSVC_Net2017/gendef.vcxproj b/MSVC_NMake/gendef.vcxproj
similarity index 100%
rename from MSVC_Net2017/gendef.vcxproj
rename to MSVC_NMake/gendef.vcxproj
diff --git a/MSVC_Net2017/gendef.vcxproj.filters b/MSVC_NMake/gendef.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/gendef.vcxproj.filters
rename to MSVC_NMake/gendef.vcxproj.filters
diff --git a/MSVC_Net2017/gendef/gendef.cc b/MSVC_NMake/gendef/gendef.cc
similarity index 100%
rename from MSVC_Net2017/gendef/gendef.cc
rename to MSVC_NMake/gendef/gendef.cc
diff --git a/MSVC_Net2017/giomm.vcxproj b/MSVC_NMake/giomm.vcxproj
similarity index 100%
rename from MSVC_Net2017/giomm.vcxproj
rename to MSVC_NMake/giomm.vcxproj
diff --git a/MSVC_Net2017/giomm.vcxproj.filters b/MSVC_NMake/giomm.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/giomm.vcxproj.filters
rename to MSVC_NMake/giomm.vcxproj.filters
diff --git a/MSVC_Net2017/giomm/giomm.rc.in b/MSVC_NMake/giomm/giomm.rc.in
similarity index 100%
rename from MSVC_Net2017/giomm/giomm.rc.in
rename to MSVC_NMake/giomm/giomm.rc.in
diff --git a/MSVC_Net2017/giomm_simple.vcxproj b/MSVC_NMake/giomm_simple.vcxproj
similarity index 100%
rename from MSVC_Net2017/giomm_simple.vcxproj
rename to MSVC_NMake/giomm_simple.vcxproj
diff --git a/MSVC_Net2017/giomm_simple.vcxproj.filters b/MSVC_NMake/giomm_simple.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/giomm_simple.vcxproj.filters
rename to MSVC_NMake/giomm_simple.vcxproj.filters
diff --git a/MSVC_Net2017/glibmm-build-defines.props b/MSVC_NMake/glibmm-build-defines.props
similarity index 100%
rename from MSVC_Net2017/glibmm-build-defines.props
rename to MSVC_NMake/glibmm-build-defines.props
diff --git a/MSVC_Net2017/glibmm-install.props b/MSVC_NMake/glibmm-install.props
similarity index 100%
rename from MSVC_Net2017/glibmm-install.props
rename to MSVC_NMake/glibmm-install.props
diff --git a/MSVC_Net2017/glibmm-version-paths.props b/MSVC_NMake/glibmm-version-paths.props
similarity index 100%
rename from MSVC_Net2017/glibmm-version-paths.props
rename to MSVC_NMake/glibmm-version-paths.props
diff --git a/MSVC_Net2017/glibmm.sln b/MSVC_NMake/glibmm.sln
similarity index 100%
rename from MSVC_Net2017/glibmm.sln
rename to MSVC_NMake/glibmm.sln
diff --git a/MSVC_Net2017/glibmm.vcxproj b/MSVC_NMake/glibmm.vcxproj
similarity index 100%
rename from MSVC_Net2017/glibmm.vcxproj
rename to MSVC_NMake/glibmm.vcxproj
diff --git a/MSVC_Net2017/glibmm.vcxproj.filters b/MSVC_NMake/glibmm.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/glibmm.vcxproj.filters
rename to MSVC_NMake/glibmm.vcxproj.filters
diff --git a/MSVC_Net2017/glibmm/glibmm.rc.in b/MSVC_NMake/glibmm/glibmm.rc.in
similarity index 100%
rename from MSVC_Net2017/glibmm/glibmm.rc.in
rename to MSVC_NMake/glibmm/glibmm.rc.in
diff --git a/MSVC_Net2017/glibmm_value.vcxproj b/MSVC_NMake/glibmm_value.vcxproj
similarity index 100%
rename from MSVC_Net2017/glibmm_value.vcxproj
rename to MSVC_NMake/glibmm_value.vcxproj
diff --git a/MSVC_Net2017/glibmm_value.vcxproj.filters b/MSVC_NMake/glibmm_value.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/glibmm_value.vcxproj.filters
rename to MSVC_NMake/glibmm_value.vcxproj.filters
diff --git a/MSVC_Net2017/install.vcxproj b/MSVC_NMake/install.vcxproj
similarity index 100%
rename from MSVC_Net2017/install.vcxproj
rename to MSVC_NMake/install.vcxproj
diff --git a/MSVC_Net2017/keyfile.vcxproj b/MSVC_NMake/keyfile.vcxproj
similarity index 100%
rename from MSVC_Net2017/keyfile.vcxproj
rename to MSVC_NMake/keyfile.vcxproj
diff --git a/MSVC_Net2017/keyfile.vcxproj.filters b/MSVC_NMake/keyfile.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/keyfile.vcxproj.filters
rename to MSVC_NMake/keyfile.vcxproj.filters
diff --git a/MSVC_Net2017/markup.vcxproj b/MSVC_NMake/markup.vcxproj
similarity index 100%
rename from MSVC_Net2017/markup.vcxproj
rename to MSVC_NMake/markup.vcxproj
diff --git a/MSVC_Net2017/markup.vcxproj.filters b/MSVC_NMake/markup.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/markup.vcxproj.filters
rename to MSVC_NMake/markup.vcxproj.filters
diff --git a/MSVC_Net2017/options.vcxproj b/MSVC_NMake/options.vcxproj
similarity index 100%
rename from MSVC_Net2017/options.vcxproj
rename to MSVC_NMake/options.vcxproj
diff --git a/MSVC_Net2017/options.vcxproj.filters b/MSVC_NMake/options.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/options.vcxproj.filters
rename to MSVC_NMake/options.vcxproj.filters
diff --git a/MSVC_Net2017/properties.vcxproj b/MSVC_NMake/properties.vcxproj
similarity index 100%
rename from MSVC_Net2017/properties.vcxproj
rename to MSVC_NMake/properties.vcxproj
diff --git a/MSVC_Net2017/properties.vcxproj.filters b/MSVC_NMake/properties.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/properties.vcxproj.filters
rename to MSVC_NMake/properties.vcxproj.filters
diff --git a/MSVC_Net2017/regex.vcxproj b/MSVC_NMake/regex.vcxproj
similarity index 100%
rename from MSVC_Net2017/regex.vcxproj
rename to MSVC_NMake/regex.vcxproj
diff --git a/MSVC_Net2017/regex.vcxproj.filters b/MSVC_NMake/regex.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/regex.vcxproj.filters
rename to MSVC_NMake/regex.vcxproj.filters
diff --git a/MSVC_Net2017/resolver.vcxproj b/MSVC_NMake/resolver.vcxproj
similarity index 100%
rename from MSVC_Net2017/resolver.vcxproj
rename to MSVC_NMake/resolver.vcxproj
diff --git a/MSVC_Net2017/resolver.vcxproj.filters b/MSVC_NMake/resolver.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/resolver.vcxproj.filters
rename to MSVC_NMake/resolver.vcxproj.filters
diff --git a/MSVC_Net2017/socket-client.vcxproj b/MSVC_NMake/socket-client.vcxproj
similarity index 100%
rename from MSVC_Net2017/socket-client.vcxproj
rename to MSVC_NMake/socket-client.vcxproj
diff --git a/MSVC_Net2017/socket-client.vcxproj.filters b/MSVC_NMake/socket-client.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/socket-client.vcxproj.filters
rename to MSVC_NMake/socket-client.vcxproj.filters
diff --git a/MSVC_Net2017/socket-server.vcxproj b/MSVC_NMake/socket-server.vcxproj
similarity index 100%
rename from MSVC_Net2017/socket-server.vcxproj
rename to MSVC_NMake/socket-server.vcxproj
diff --git a/MSVC_Net2017/socket-server.vcxproj.filters b/MSVC_NMake/socket-server.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/socket-server.vcxproj.filters
rename to MSVC_NMake/socket-server.vcxproj.filters
diff --git a/MSVC_Net2017/thread.vcxproj b/MSVC_NMake/thread.vcxproj
similarity index 100%
rename from MSVC_Net2017/thread.vcxproj
rename to MSVC_NMake/thread.vcxproj
diff --git a/MSVC_Net2017/thread.vcxproj.filters b/MSVC_NMake/thread.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/thread.vcxproj.filters
rename to MSVC_NMake/thread.vcxproj.filters
diff --git a/MSVC_Net2017/threadpool.vcxproj b/MSVC_NMake/threadpool.vcxproj
similarity index 100%
rename from MSVC_Net2017/threadpool.vcxproj
rename to MSVC_NMake/threadpool.vcxproj
diff --git a/MSVC_Net2017/threadpool.vcxproj.filters b/MSVC_NMake/threadpool.vcxproj.filters
similarity index 100%
rename from MSVC_Net2017/threadpool.vcxproj.filters
rename to MSVC_NMake/threadpool.vcxproj.filters
diff --git a/Makefile.am b/Makefile.am
index 7cda466d..f497ffef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,10 +43,10 @@ nodist_giomm_libinclude_HEADERS = gio/giommconfig.h
 pkgconfigdir = $(libdir)/pkgconfig
 nodist_pkgconfig_DATA = glib/$(GLIBMM_MODULE_NAME).pc gio/$(GIOMM_MODULE_NAME).pc
 
-include $(srcdir)/MSVC_Net2017/filelist.am
+include $(srcdir)/MSVC_NMake/filelist.am
 
 text_files = COPYING.tools README.SUN README.win32
-msvc_files = $(addprefix MSVC_Net2017/,$(msvc_net2017_data))
+msvc_files = $(addprefix MSVC_NMake/,$(msvc_net2017_data))
 
 dist_noinst_DATA = $(text_files) $(msvc_files)
 dist_noinst_SCRIPTS = autogen.sh
diff --git a/README.win32 b/README.win32
index 0094f745..d6b8019f 100644
--- a/README.win32
+++ b/README.win32
@@ -46,7 +46,7 @@ make install
 
 2. MS Visual Studio 2017
 
-Open the glibmm.sln solution file in the MSVC_Net2017 directory. In
+Open the glibmm.sln solution file in the MSVC_NMake directory. In
 the Tools/Options panel, add the appropriate GTK+ include and lib
 directories to the Projects and Solutions/VC++ directories, if they
 are not in the locations specified by the property sheets, i.e.
diff --git a/configure.ac b/configure.ac
index 6f435373..e8228bdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,12 +169,12 @@ AC_CONFIG_FILES([Makefile
                  examples/Makefile
                  docs/Makefile
                  docs/reference/Doxyfile
-                 MSVC_Net2017/glibmm/glibmm.rc
-                 MSVC_Net2017/giomm/giomm.rc])
+                 MSVC_NMake/glibmm/glibmm.rc
+                 MSVC_NMake/giomm/giomm.rc])
 
 # Copy the generated configuration headers into the MSVC project directories.
-AC_CONFIG_COMMANDS([MSVC_Net2017/glibmm/glibmmconfig.h],
-                   [cp -f glib/glibmmconfig.h MSVC_Net2017/glibmm/glibmmconfig.h])
-AC_CONFIG_COMMANDS([MSVC_Net2017/giomm/giommconfig.h],
-                   [cp -f gio/giommconfig.h MSVC_Net2017/giomm/giommconfig.h])
+AC_CONFIG_COMMANDS([MSVC_NMake/glibmm/glibmmconfig.h],
+                   [cp -f glib/glibmmconfig.h MSVC_NMake/glibmm/glibmmconfig.h])
+AC_CONFIG_COMMANDS([MSVC_NMake/giomm/giommconfig.h],
+                   [cp -f gio/giommconfig.h MSVC_NMake/giomm/giommconfig.h])
 AC_OUTPUT
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]