[cpp-msbuild] branch master updated: Add SED variable to build.

Scott Cantor cantor.2 at osu.edu
Mon Nov 27 13:22:10 EST 2017


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=f591a550902d8f74416ec8dfdd054b066df85a4d

The following commit(s) were added to refs/heads/master by this push:
       new  f591a55   Add SED variable to build.
f591a55 is described below

commit f591a550902d8f74416ec8dfdd054b066df85a4d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 27 13:22:07 2017 -0500

    Add SED variable to build.
---
 dependencies/config.bat      | 2 ++
 dependencies/dependency.make | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dependencies/config.bat b/dependencies/config.bat
index 7d512ed..974fcbb 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -3,10 +3,12 @@ rem GOTTA HAVE TRAILING SLASH
 Rod...
 rem set ROOT_DIR=H:\Perforce\VS2017\
 rem set VS_DIR=d:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\
+rem set SED=sed
 
 Scott...
 set ROOT_DIR=C:\Users\cantor.2\Shibboleth\
 set VS_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+set SED=C:\cygwin64\bin\sed.exe
 
 set ZLIB_DIR=zlib-1.2.11
 set ZLIB_IMPLIB=zlib1
diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index 0a105d5..db43a6a 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -85,6 +85,7 @@ help:
 	@echo "			XERCES_DIR
 	@echo "			LIBCURL_DIR
 	@echo "			XSEC_DIR
+	@echo "			SED
 	@echo "
 	@echo "
 	@echo " See also https://wiki.shibboleth.net/confluence/display/SP3/WindowsBuild
@@ -135,14 +136,14 @@ $(ROOT_DIR)\$(ZLIB_DIR)\win32\makefile.shib: $(ROOT_DIR)\$(ZLIB_DIR)\zlib1.sed \
 	$(ROOT_DIR)\$(ZLIB_DIR)\zlib3.sed \
 	$(ROOT_DIR)\$(ZLIB_DIR)\zlib4.sed
 	cd $(ROOT_DIR)\$(ZLIB_DIR)
-	sed win32\makefile.msc -f zlib1.sed -f zlib2.sed  > $@
+	$(SED) win32\makefile.msc -f zlib1.sed -f zlib2.sed  > $@
 
 $(ROOT_DIR)\$(ZLIB_DIR)\win32\makefile.shib.debug: $(ROOT_DIR)\$(ZLIB_DIR)\zlib1d.sed \
 	$(ROOT_DIR)\$(ZLIB_DIR)\zlib2d.sed \
 	$(ROOT_DIR)\$(ZLIB_DIR)\zlib3.sed \
 	$(ROOT_DIR)\$(ZLIB_DIR)\zlib4.sed
 	cd $(ROOT_DIR)\$(ZLIB_DIR)
-	sed win32\makefile.msc -f zlib1d.sed -f zlib2d.sed -f zlib3.sed -f zlib4.sed > $@
+	$(SED) win32\makefile.msc -f zlib1d.sed -f zlib2d.sed -f zlib3.sed -f zlib4.sed > $@
 
 $(ROOT_DIR)\$(ZLIB_DIR)\zlib1.sed:
 	echo s/SHAREDLIB =.*$$/SHAREDLIB=$(ZLIB_SHAREDLIB).dll/ > $@

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list