move msvc IDE related files to 'vs' directory tree

Use 'vs' directory tree given that 'vc' intended one clashes
with an already existing build target in file Makefile.dist.

diff --git a/Makefile.am b/Makefile.am
index 6c582c7..608bd11 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,22 +30,22 @@ CMake/CurlTests.c CMake/FindOpenSSL.cmake CMake/FindZLIB.cmake              \
 CMake/OtherTests.cmake CMake/Platforms/WindowsCache.cmake              \
 CMake/Utilities.cmake include/curl/curlbuild.h.cmake
 
-VC6LIBDSP = vc/vc6/lib/vc6libcurl.dsp
-VC6LIBDSPHEAD = vc/t/lib/vc6_libcurl_dsp.head
-VC6LIBDSPFOOT = vc/t/lib/vc6_libcurl_dsp.foot
+VC6LIBDSP = vs/vc6/lib/vc6libcurl.dsp
+VC6LIBDSPHEAD = vs/t/lib/vc6_libcurl_dsp.head
+VC6LIBDSPFOOT = vs/t/lib/vc6_libcurl_dsp.foot
 
-VC8LIBPRJ = vc/vc8/lib/vc8libcurl.vcproj
-VC8LIBPRJHEAD = vc/t/lib/vc8_libcurl_prj.head
-VC8LIBPRJFOOT = vc/t/lib/vc8_libcurl_prj.foot
+VC8LIBPRJ = vs/vc8/lib/vc8libcurl.vcproj
+VC8LIBPRJHEAD = vs/t/lib/vc8_libcurl_prj.head
+VC8LIBPRJFOOT = vs/t/lib/vc8_libcurl_prj.foot
 
 VC_DIST = \
- vc/t/README \
+ vs/t/README \
  $(VC6LIBDSP) $(VC6LIBDSPHEAD) $(VC6LIBDSPFOOT) \
  $(VC8LIBPRJ) $(VC8LIBPRJHEAD) $(VC8LIBPRJFOOT) \
- vc/vc6/vc6curl.dsw \
- vc/vc6/lib/vc6libcurl.dsw \
- vc/vc6/src/vc6curltool.dsw \
- vc/vc6/src/vc6curltool.dsp
+ vs/vc6/vc6curl.dsw \
+ vs/vc6/lib/vc6libcurl.dsw \
+ vs/vc6/src/vc6curltool.dsw \
+ vs/vc6/src/vc6curltool.dsp
 
 VC6LIBDSP_DEPS = $(VC6LIBDSPHEAD) $(VC6LIBDSPFOOT) \
  Makefile.am lib/Makefile.inc
@@ -206,7 +206,7 @@ vc6-ide:
 $(VC6LIBDSP): $(VC6LIBDSP_DEPS)
        @(echo "generating '$(VC6LIBDSP)'"; \
        \
-       for dir in 'vc' 'vc/vc6' 'vc/vc6/lib'; do \
+       for dir in 'vs' 'vs/vc6' 'vs/vc6/lib'; do \
          test -d "$$dir" || mkdir "$$dir" || exit 1; \
        done; \
        \
@@ -252,7 +252,7 @@ vc8-ide:
 $(VC8LIBPRJ): $(VC8LIBPRJ_DEPS)
        @(echo "generating '$(VC8LIBPRJ)'"; \
        \
-       for dir in 'vc' 'vc/vc8' 'vc/vc8/lib'; do \
+       for dir in 'vs' 'vs/vc8' 'vs/vc8/lib'; do \
          test -d "$$dir" || mkdir "$$dir" || exit 1; \
        done; \
        \

diff --git a/docs/INSTALL b/docs/INSTALL
index 9e3c226..737128b 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -359,7 +359,7 @@ Win32
    source distribution archive to allow proper building of the two included
    projects, the libcurl library and the curl tool.
 
-   1) Open the vc6curl.dsw workspace with MSVC6's IDE.
+   1) Open the vs/vc6/vc6curl.dsw workspace with MSVC6's IDE.
    2) Select 'Build' from top menu.
    3) Select 'Batch Build' from dropdown menu.
    4) Make sure that the eight project configurations are 'checked'.
@@ -367,12 +367,12 @@ Win32
    6) Once the eight project configurations are built you are done.
 
    Dynamic and static libcurl libraries are built in debug and release flavours,
-   and can be located each one in its own subdirectory, DLL-Debug, DLL-Release,
-   LIB-Debug and LIB-Release, all of them below the 'lib' subdirectory.
+   and can be located each one in its own subdirectory, dll-debug, dll-release,
+   lib-debug and lib-release, all of them below the 'vs/vc6/lib' subdirectory.
 
    In the same way four curl executables are created, each using its respective
    library. The resulting curl executables are located in its own subdirectory,
-   DLL-Debug, DLL-Release, LIB-Debug and LIB-Release, below the 'src' subdir.
+   dll-debug, dll-release, lib-debug and lib-release, below 'vs/vc6/src' subdir.
 
    These reference VC++ 6.0 configurations are generated using the dynamic CRT.
 

diff --git a/vc/.gitignore b/vs/.gitignore
similarity index 100%
rename from vc/.gitignore
rename to vs/.gitignore

diff --git a/vc/vc8/src/.gitattributes b/vs/t/.gitattributes
similarity index 100%
rename from vc/vc8/src/.gitattributes
rename to vs/t/.gitattributes

diff --git a/vc/t/.gitignore b/vs/t/.gitignore
similarity index 100%
rename from vc/t/.gitignore
rename to vs/t/.gitignore

diff --git a/vc/t/README b/vs/t/README
similarity index 67%
rename from vc/t/README
rename to vs/t/README
index 75b0478..69ebd27 100644 (file)
--- a/vc/t/README
+++ b/vs/t/README
@@ -1,8 +1,8 @@
 Note:\r
 \r
-Files located in subdirectory 'vc/t' and below are 'templates' used for\r
+Files located in subdirectory 'vs/t' and below are 'templates' used for\r
 the generation of msvc IDE workspace and project files, distributed in\r
-subdirectories 'vc/vc6' and 'vc/vc8'.\r
+subdirectories 'vs/vc6' and 'vs/vc8'.\r
 \r
 All these template files use UNIX line endings intentionally, in order\r
 to allow proper file generation. Don't convert these to crlf line-ends.\r

diff --git a/vc/vc8/lib/.gitattributes b/vs/t/lib/.gitattributes
similarity index 100%
rename from vc/vc8/lib/.gitattributes
rename to vs/t/lib/.gitattributes

diff --git a/vc/t/src/.gitignore b/vs/t/lib/.gitignore
similarity index 100%
rename from vc/t/src/.gitignore
rename to vs/t/lib/.gitignore

diff --git a/vc/t/lib/vc6_libcurl_dsp.foot b/vs/t/lib/vc6_libcurl_dsp.foot
similarity index 100%
rename from vc/t/lib/vc6_libcurl_dsp.foot
rename to vs/t/lib/vc6_libcurl_dsp.foot

diff --git a/vc/t/lib/vc6_libcurl_dsp.head b/vs/t/lib/vc6_libcurl_dsp.head
similarity index 100%
rename from vc/t/lib/vc6_libcurl_dsp.head
rename to vs/t/lib/vc6_libcurl_dsp.head

diff --git a/vc/t/lib/vc8_libcurl_prj.foot b/vs/t/lib/vc8_libcurl_prj.foot
similarity index 100%
rename from vc/t/lib/vc8_libcurl_prj.foot
rename to vs/t/lib/vc8_libcurl_prj.foot

diff --git a/vc/t/lib/vc8_libcurl_prj.head b/vs/t/lib/vc8_libcurl_prj.head
similarity index 100%
rename from vc/t/lib/vc8_libcurl_prj.head
rename to vs/t/lib/vc8_libcurl_prj.head

diff --git a/vc/vc8/.gitattributes b/vs/t/src/.gitattributes
similarity index 100%
rename from vc/vc8/.gitattributes
rename to vs/t/src/.gitattributes

diff --git a/vc/t/lib/.gitignore b/vs/t/src/.gitignore
similarity index 100%
rename from vc/t/lib/.gitignore
rename to vs/t/src/.gitignore

diff --git a/vc/vc6/src/.gitattributes b/vs/vc6/.gitattributes
similarity index 100%
rename from vc/vc6/src/.gitattributes
rename to vs/vc6/.gitattributes

diff --git a/vc/vc6/.gitignore b/vs/vc6/.gitignore
similarity index 100%
rename from vc/vc6/.gitignore
rename to vs/vc6/.gitignore

diff --git a/vc/vc6/lib/.gitattributes b/vs/vc6/lib/.gitattributes
similarity index 100%
rename from vc/vc6/lib/.gitattributes
rename to vs/vc6/lib/.gitattributes

diff --git a/vc/vc6/lib/.gitignore b/vs/vc6/lib/.gitignore
similarity index 100%
rename from vc/vc6/lib/.gitignore
rename to vs/vc6/lib/.gitignore

diff --git a/vc/vc6/lib/vc6libcurl.dsw b/vs/vc6/lib/vc6libcurl.dsw
similarity index 100%
rename from vc/vc6/lib/vc6libcurl.dsw
rename to vs/vc6/lib/vc6libcurl.dsw

diff --git a/vc/vc6/.gitattributes b/vs/vc6/src/.gitattributes
similarity index 100%
rename from vc/vc6/.gitattributes
rename to vs/vc6/src/.gitattributes

diff --git a/vc/vc6/src/.gitignore b/vs/vc6/src/.gitignore
similarity index 100%
rename from vc/vc6/src/.gitignore
rename to vs/vc6/src/.gitignore

diff --git a/vc/vc6/src/vc6curltool.dsp b/vs/vc6/src/vc6curltool.dsp
similarity index 100%
rename from vc/vc6/src/vc6curltool.dsp
rename to vs/vc6/src/vc6curltool.dsp

diff --git a/vc/vc6/src/vc6curltool.dsw b/vs/vc6/src/vc6curltool.dsw
similarity index 100%
rename from vc/vc6/src/vc6curltool.dsw
rename to vs/vc6/src/vc6curltool.dsw

diff --git a/vc/vc6/vc6curl.dsw b/vs/vc6/vc6curl.dsw
similarity index 100%
rename from vc/vc6/vc6curl.dsw
rename to vs/vc6/vc6curl.dsw

diff --git a/vc/t/src/.gitattributes b/vs/vc8/.gitattributes
similarity index 100%
rename from vc/t/src/.gitattributes
rename to vs/vc8/.gitattributes

diff --git a/vc/vc8/.gitignore b/vs/vc8/.gitignore
similarity index 100%
rename from vc/vc8/.gitignore
rename to vs/vc8/.gitignore

diff --git a/vc/t/lib/.gitattributes b/vs/vc8/lib/.gitattributes
similarity index 100%
rename from vc/t/lib/.gitattributes
rename to vs/vc8/lib/.gitattributes

diff --git a/vc/vc8/lib/.gitignore b/vs/vc8/lib/.gitignore
similarity index 100%
rename from vc/vc8/lib/.gitignore
rename to vs/vc8/lib/.gitignore

diff --git a/vc/t/.gitattributes b/vs/vc8/src/.gitattributes
similarity index 100%
rename from vc/t/.gitattributes
rename to vs/vc8/src/.gitattributes

diff --git a/vc/vc8/src/.gitignore b/vs/vc8/src/.gitignore
similarity index 100%
rename from vc/vc8/src/.gitignore
rename to vs/vc8/src/.gitignore