Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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.
  • Loading branch information...
commit cc8fad9a7fa6397d7b16eb52f8d6fa689eceff94 1 parent 72da89a
@yangtse yangtse authored
Showing with 19 additions and 19 deletions.
  1. +13 −13 Makefile.am
  2. +4 −4 docs/INSTALL
  3. 0  {vc → vs}/.gitignore
  4. 0  {vc/vc8/src → vs/t}/.gitattributes
  5. 0  {vc → vs}/t/.gitignore
  6. +2 −2 {vc → vs}/t/README
  7. 0  {vc/vc8 → vs/t}/lib/.gitattributes
  8. 0  {vc/t/src → vs/t/lib}/.gitignore
  9. 0  {vc → vs}/t/lib/vc6_libcurl_dsp.foot
  10. 0  {vc → vs}/t/lib/vc6_libcurl_dsp.head
  11. 0  {vc → vs}/t/lib/vc8_libcurl_prj.foot
  12. 0  {vc → vs}/t/lib/vc8_libcurl_prj.head
  13. 0  {vc/vc8 → vs/t/src}/.gitattributes
  14. 0  {vc/t/lib → vs/t/src}/.gitignore
  15. 0  {vc/vc6/src → vs/vc6}/.gitattributes
  16. 0  {vc → vs}/vc6/.gitignore
  17. 0  {vc → vs}/vc6/lib/.gitattributes
  18. 0  {vc → vs}/vc6/lib/.gitignore
  19. 0  {vc → vs}/vc6/lib/vc6libcurl.dsw
  20. 0  {vc/vc6 → vs/vc6/src}/.gitattributes
  21. 0  {vc → vs}/vc6/src/.gitignore
  22. 0  {vc → vs}/vc6/src/vc6curltool.dsp
  23. 0  {vc → vs}/vc6/src/vc6curltool.dsw
  24. 0  {vc → vs}/vc6/vc6curl.dsw
  25. 0  {vc/t/src → vs/vc8}/.gitattributes
  26. 0  {vc → vs}/vc8/.gitignore
  27. 0  {vc/t → vs/vc8}/lib/.gitattributes
  28. 0  {vc → vs}/vc8/lib/.gitignore
  29. 0  {vc/t → vs/vc8/src}/.gitattributes
  30. 0  {vc → vs}/vc8/src/.gitignore
View
26 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; \
\
View
8 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.
View
0  vc/.gitignore → vs/.gitignore
File renamed without changes
View
0  vc/vc8/src/.gitattributes → vs/t/.gitattributes
File renamed without changes
View
0  vc/t/.gitignore → vs/t/.gitignore
File renamed without changes
View
4 vc/t/README → vs/t/README
@@ -1,8 +1,8 @@
Note:
-Files located in subdirectory 'vc/t' and below are 'templates' used for
+Files located in subdirectory 'vs/t' and below are 'templates' used for
the generation of msvc IDE workspace and project files, distributed in
-subdirectories 'vc/vc6' and 'vc/vc8'.
+subdirectories 'vs/vc6' and 'vs/vc8'.
All these template files use UNIX line endings intentionally, in order
to allow proper file generation. Don't convert these to crlf line-ends.
View
0  vc/vc8/lib/.gitattributes → vs/t/lib/.gitattributes
File renamed without changes
View
0  vc/t/src/.gitignore → vs/t/lib/.gitignore
File renamed without changes
View
0  vc/t/lib/vc6_libcurl_dsp.foot → vs/t/lib/vc6_libcurl_dsp.foot
File renamed without changes
View
0  vc/t/lib/vc6_libcurl_dsp.head → vs/t/lib/vc6_libcurl_dsp.head
File renamed without changes
View
0  vc/t/lib/vc8_libcurl_prj.foot → vs/t/lib/vc8_libcurl_prj.foot
File renamed without changes
View
0  vc/t/lib/vc8_libcurl_prj.head → vs/t/lib/vc8_libcurl_prj.head
File renamed without changes
View
0  vc/vc8/.gitattributes → vs/t/src/.gitattributes
File renamed without changes
View
0  vc/t/lib/.gitignore → vs/t/src/.gitignore
File renamed without changes
View
0  vc/vc6/src/.gitattributes → vs/vc6/.gitattributes
File renamed without changes
View
0  vc/vc6/.gitignore → vs/vc6/.gitignore
File renamed without changes
View
0  vc/vc6/lib/.gitattributes → vs/vc6/lib/.gitattributes
File renamed without changes
View
0  vc/vc6/lib/.gitignore → vs/vc6/lib/.gitignore
File renamed without changes
View
0  vc/vc6/lib/vc6libcurl.dsw → vs/vc6/lib/vc6libcurl.dsw
File renamed without changes
View
0  vc/vc6/.gitattributes → vs/vc6/src/.gitattributes
File renamed without changes
View
0  vc/vc6/src/.gitignore → vs/vc6/src/.gitignore
File renamed without changes
View
0  vc/vc6/src/vc6curltool.dsp → vs/vc6/src/vc6curltool.dsp
File renamed without changes
View
0  vc/vc6/src/vc6curltool.dsw → vs/vc6/src/vc6curltool.dsw
File renamed without changes
View
0  vc/vc6/vc6curl.dsw → vs/vc6/vc6curl.dsw
File renamed without changes
View
0  vc/t/src/.gitattributes → vs/vc8/.gitattributes
File renamed without changes
View
0  vc/vc8/.gitignore → vs/vc8/.gitignore
File renamed without changes
View
0  vc/t/lib/.gitattributes → vs/vc8/lib/.gitattributes
File renamed without changes
View
0  vc/vc8/lib/.gitignore → vs/vc8/lib/.gitignore
File renamed without changes
View
0  vc/t/.gitattributes → vs/vc8/src/.gitattributes
File renamed without changes
View
0  vc/vc8/src/.gitignore → vs/vc8/src/.gitignore
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.