move msvc IDE related files to 'vc' directory tree (beae838e) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

Makefile.am

+117 −3

Original line number	Diff line number	Diff line
		@@ -30,13 +30,38 @@ 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

		VC8LIBPRJ = vc/vc8/lib/vc8libcurl.vcproj
		VC8LIBPRJHEAD = vc/t/lib/vc8_libcurl_prj.head
		VC8LIBPRJFOOT = vc/t/lib/vc8_libcurl_prj.foot

		VC_DIST = \
		vc/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

		VC6LIBDSP_DEPS = $(VC6LIBDSPHEAD) $(VC6LIBDSPFOOT) \
		Makefile.am lib/Makefile.inc

		VC8LIBPRJ_DEPS = $(VC8LIBPRJHEAD) $(VC8LIBPRJFOOT) \
		Makefile.am lib/Makefile.inc

		WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat \
		winbuild/MakefileBuild.vc winbuild/Makefile.vc \
		winbuild/Makefile.msvc.names

		EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \
		RELEASE-NOTES buildconf libcurl.pc.in vc6curl.dsw MacOSX-Framework \
		$(CMAKE_DIST) $(WINBUILD_DIST) lib/libcurl.vers.in
		RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework \
		$(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) lib/libcurl.vers.in

		CLEANFILES = $(VC6LIBDSP) $(VC8LIBPRJ)

		bin_SCRIPTS = curl-config

		@@ -46,6 +71,12 @@ DIST_SUBDIRS = $(SUBDIRS) tests packages docs
		pkgconfigdir = $(libdir)/pkgconfig
		pkgconfig_DATA = libcurl.pc

		# List of libcurl source files required to generate VC IDE dsp and prj files
		include lib/Makefile.inc

		WIN32SOURCES = $(CSOURCES)
		WIN32HEADERS = $(HHEADERS) config-win32.h

		dist-hook:
		rm -rf $(top_builddir)/tests/log
		find $(distdir) -name "*.dist" -exec rm {} \;
		@@ -89,7 +120,7 @@ endif
		examples:
		@(cd docs/examples; $(MAKE) check)

		# This is a hook to have 'make clean' also clean up the dosc and the tests
		# This is a hook to have 'make clean' also clean up the docs and the tests
		# dir. The extra check for the Makefiles being present is necessary because
		# 'make distcheck' will make clean first in these directories _before_ it runs
		# this hook.
		@@ -166,3 +197,86 @@ ca-firefox: lib/firefox-db2pem.sh
		checksrc:
		cd lib && $(MAKE) checksrc
		cd src && $(MAKE) checksrc

		.PHONY: vc6-ide

		vc6-ide:
		$(MAKE) $(VC6LIBDSP)

		$(VC6LIBDSP): $(VC6LIBDSP_DEPS)
		@(echo "generating '$(VC6LIBDSP)'"; \
		\
		for dir in 'vc' 'vc/vc6' 'vc/vc6/lib'; do \
		test -d "$$dir" \|\| mkdir "$$dir" \|\| exit 1; \
		done; \
		\
		dir='..\..\..\lib\'; \
		body='$(VC6LIBDSP)'.body; \
		win32_srcs='$(WIN32SOURCES)'; \
		win32_hdrs='$(WIN32HEADERS)'; \
		sorted_srcs=`for file in $$win32_srcs; do echo $$file; done \| sort`; \
		sorted_hdrs=`for file in $$win32_hdrs; do echo $$file; done \| sort`; \
		\
		echo "# Begin Group \"Source Files\"" > $$body; \
		echo "" >> $$body; \
		echo "# PROP Default_Filter \"\"" >> $$body; \
		for file in $$sorted_srcs; do \
		echo "# Begin Source File" >> $$body; \
		echo "" >> $$body; \
		echo "SOURCE="$$dir$$file >> $$body; \
		echo "# End Source File" >> $$body; \
		done; \
		echo "# End Group" >> $$body; \
		echo "# Begin Group \"Header Files\"" >> $$body; \
		echo "" >> $$body; \
		echo "# PROP Default_Filter \"\"" >> $$body; \
		for file in $$sorted_hdrs; do \
		echo "# Begin Source File" >> $$body; \
		echo "" >> $$body; \
		echo "SOURCE="$$dir$$file >> $$body; \
		echo "# End Source File" >> $$body; \
		done; \
		echo "# End Group" >> $$body; \
		\
		awk '{ printf("%s\r\n", $$0); }' \
		$(srcdir)/$(VC6LIBDSPHEAD) $$body $(srcdir)/$(VC6LIBDSPFOOT) \
		> $(VC6LIBDSP) \|\| { rm -f $$body; exit 1; }; \
		\
		rm -f $$body)

		.PHONY: vc8-ide

		vc8-ide:
		$(MAKE) $(VC8LIBPRJ)

		$(VC8LIBPRJ): $(VC8LIBPRJ_DEPS)
		@(echo "generating '$(VC8LIBPRJ)'"; \
		\
		for dir in 'vc' 'vc/vc8' 'vc/vc8/lib'; do \
		test -d "$$dir" \|\| mkdir "$$dir" \|\| exit 1; \
		done; \
		\
		dir='..\..\..\lib\'; \
		body='$(VC8LIBPRJ)'.body; \
		win32_srcs='$(WIN32SOURCES)'; \
		win32_hdrs='$(WIN32HEADERS)'; \
		sorted_srcs=`for file in $$win32_srcs; do echo $$file; done \| sort`; \
		sorted_hdrs=`for file in $$win32_hdrs; do echo $$file; done \| sort`; \
		\
		echo "%tab%%tab%<Filter Name=\"Source Files\">" > $$body; \
		for file in $$sorted_srcs; do \
		echo "%tab%%tab%%tab%<File RelativePath=\""$$dir$$file"\"></File>" >> $$body; \
		done; \
		echo "%tab%%tab%</Filter>" >> $$body; \
		echo "%tab%%tab%<Filter Name=\"Header Files\">" >> $$body; \
		for file in $$sorted_hdrs; do \
		echo "%tab%%tab%%tab%<File RelativePath=\""$$dir$$file"\"></File>" >> $$body; \
		done; \
		echo "%tab%%tab%</Filter>" >> $$body; \
		\
		awk '{ gsub(/%tab%/, "\t"); printf("%s\r\n", $$0); }' \
		$(srcdir)/$(VC8LIBPRJHEAD) $$body $(srcdir)/$(VC8LIBPRJFOOT) \
		> $(VC8LIBPRJ) \|\| { rm -f $$body; exit 1; }; \
		\
		rm -f $$body)

lib/.gitignore

+0 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,6 @@ TAGS
		Makefile.vc8.dist
		Makefile.vc9.dist
		libcurl.plist.dist
		libcurl.vcproj
		vc6libcurl.dsp
		Makefile.vc10.dist
		libcurl.vers
		*.a

lib/Makefile.am

+7 −65

Original line number	Diff line number	Diff line
		@@ -21,27 +21,21 @@
		###########################################################################
		AUTOMAKE_OPTIONS = foreign nostdinc

		DSP = vc6libcurl.dsp
		VCPROJ = libcurl.vcproj

		DOCS = README.encoding README.memoryleak README.ares README.curlx \
		README.hostip README.multi_socket README.httpauth README.pipelining \
		README.curl_off_t README.pingpong

		CMAKE_DIST = CMakeLists.txt curl_config.h.cmake

		EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP) \
		vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h \
		config-mac.h curl_config.h.in makefile.dj config-dos.h libcurl.plist \
		libcurl.rc config-amigaos.h makefile.amiga Makefile.netware nwlib.c \
		nwos.c msvcproj.head msvcproj.foot config-win32ce.h config-os400.h \
		setup-os400.h config-symbian.h Makefile.Watcom config-tpf.h $(DOCS) \
		$(VCPROJ) mk-ca-bundle.pl mk-ca-bundle.vbs firefox-db2pem.sh \
		$(CMAKE_DIST) config-vxworks.h Makefile.vxworks checksrc.pl \
		EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 config-win32.h \
		config-win32ce.h config-riscos.h config-mac.h curl_config.h.in \
		makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h \
		makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h \
		config-os400.h setup-os400.h config-symbian.h Makefile.Watcom \
		config-tpf.h $(DOCS) mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \
		firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl \
		objnames-test08.sh objnames-test10.sh objnames.inc

		CLEANFILES = $(DSP) $(VCPROJ)

		lib_LTLIBRARIES = libcurl.la
		LIBCURL_LIBS = @LIBCURL_LIBS@

		@@ -162,58 +156,6 @@ include Makefile.inc
		libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS)
		libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS)

		WIN32SOURCES = $(CSOURCES)
		WIN32HEADERS = $(HHEADERS) config-win32.h

		DSPOUT = \| awk '{printf("%s\r\n", $$0)}' >> $(DSP)
		VCPROJOUT = \| awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ)

		$(DSP): msvcproj.head msvcproj.foot Makefile.am
		echo "creating $(DSP)"
		@(cp $(srcdir)/msvcproj.head $(DSP); \
		echo "# Begin Group \"Source Files\"" $(DSPOUT); \
		echo "" $(DSPOUT); \
		echo "# PROP Default_Filter \"\"" $(DSPOUT); \
		win32_srcs='$(WIN32SOURCES)'; \
		sorted_srcs=`for file in $$win32_srcs; do echo $$file; done \| sort`; \
		for file in $$sorted_srcs; do \
		echo "# Begin Source File" $(DSPOUT); \
		echo "" $(DSPOUT); \
		echo "SOURCE=.\\"$$file $(DSPOUT); \
		echo "# End Source File" $(DSPOUT); \
		done; \
		echo "# End Group" $(DSPOUT); \
		echo "# Begin Group \"Header Files\"" $(DSPOUT); \
		echo "" $(DSPOUT); \
		echo "# PROP Default_Filter \"\"" $(DSPOUT); \
		win32_hdrs='$(WIN32HEADERS)'; \
		sorted_hdrs=`for file in $$win32_hdrs; do echo $$file; done \| sort`; \
		for file in $$sorted_hdrs; do \
		echo "# Begin Source File" $(DSPOUT); \
		echo "" $(DSPOUT); \
		echo "SOURCE=.\\"$$file $(DSPOUT); \
		echo "# End Source File" $(DSPOUT); \
		done; \
		echo "# End Group" $(DSPOUT); \
		cat $(srcdir)/msvcproj.foot $(DSPOUT) )

		$(VCPROJ): vc8proj.head vc8proj.foot Makefile.am
		echo "creating $(VCPROJ)"
		@(cp $(srcdir)/vc8proj.head $(VCPROJ); \
		win32_srcs='$(WIN32SOURCES)'; \
		sorted_srcs=`for file in $$win32_srcs; do echo $$file; done \| sort`; \
		for file in $$sorted_srcs; do \
		echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT); \
		done; \
		echo "</Filter><Filter Name=\"Header Files\">" $(VCPROJOUT); \
		win32_hdrs='$(WIN32HEADERS)'; \
		sorted_hdrs=`for file in $$win32_hdrs; do echo $$file; done \| sort`; \
		for file in $$sorted_hdrs; do \
		echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT); \
		done; \
		cat $(srcdir)/vc8proj.foot $(VCPROJOUT) )


		checksrc:
		@@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/lib $(CSOURCES) $(HHEADERS)

src/Makefile.am

+2 −3

Original line number	Diff line number	Diff line
		@@ -75,10 +75,9 @@ NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script

		EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \
		macos/curl.mcp.xml.sit.hqx \
		macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp vc6curlsrc.dsp \
		macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp \
		macos/src/macos_main.cpp makefile.amiga curl.rc \
		Makefile.netware Makefile.inc Makefile.Watcom vc6curlsrc.dsw \
		CMakeLists.txt
		Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt

		MANPAGE=$(top_srcdir)/docs/curl.1
		README=$(top_srcdir)/docs/MANUAL

vc/t/README

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		Note:

		Files located in subdirectory 'vc/t' and below are 'templates' used for
		the generation of msvc IDE workspace and project files, distributed in
		subdirectories 'vc/vc6' and 'vc/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.