Bug 641630. r=ted, a=respin
authorBenoit Jacob <bjacob@mozilla.com>
Thu, 17 Mar 2011 15:07:16 -0400
changeset 63434 e6ce7ec66a236aa12677f6d424942de8b7106982
parent 63433 4c66d8ddc98905d2a9d0cc0b14e20aa655584525
child 63435 b853c6efa929735b8ee1927becd469726752a50d
push id1
push userroot
push dateTue, 10 Dec 2013 15:46:25 +0000
reviewersted, respin
bugs641630
milestone2.0b13pre
Bug 641630. r=ted, a=respin
gfx/angle/Makefile.in
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -167,16 +167,24 @@ libGLESv2.dll: libEGL.dll
 
 libEGL.dll: $(GLOBAL_DEPS) $(ANGLE_DEPS)
 	@(echo "=== Building ANGLE via devenv.exe ===" \
 	&& rm -rf angle-build && mkdir angle-build \
 	&& cp -r $(srcdir)/src $(srcdir)/include angle-build \
 	&& cd angle-build/src \
 	&& echo "Upgrading solution..." \
 	&& devenv angle.sln //upgrade \
+	&& echo "Tweaking project files to use ASLR and DEP..." \
+	&& ( find . -name '*proj' | xargs \
+	     perl -i.bak -p \
+	          -e 'BEGIN{undef $/;} s/<RandomizedBaseAddress>([^<^>])*<\/RandomizedBaseAddress>/<RandomizedBaseAddress>true<\/RandomizedBaseAddress>/sgmi;' \
+	          -e 'BEGIN{undef $/;} s/<DataExecutionPrevention>([^<^>])*<\/DataExecutionPrevention>/<DataExecutionPrevention>true<\/DataExecutionPrevention>/sgmi;' \
+		  -e 's/RandomizedBaseAddress\=\"0\"/RandomizedBaseAddress\=\"1\"/g;' \
+		  -e 's/DataExecutionPrevention\=\"0\"/DataExecutionPrevention\=\"1\"/g;' \
+	   ) \
 	&& echo "Building solution, target $(ANGLE_DIR)|Win32..." \
 	&& ( devenv angle.sln //useenv //build "$(ANGLE_DIR)|Win32" //out ../../angle-build-log.txt \
 	       || (cat ../../angle-build-log.txt && exit 1) \
 	   ) \
 	&& echo "Copying dlls..." \
 	&& cp $(ANGLE_DIR)/*.dll ../.. \
 	&& cd ../.. \
 	&& echo "Extracting dlls from cab file..." \