[GRASS-SVN] r41035 - in grass/branches/develbranch_6: . mswindows

[svn_grass at osgeo.org]

Author: hellik
Date: 2010-02-15 17:42:39 -0500 (Mon, 15 Feb 2010)
New Revision: 41035

Added:
   grass/branches/develbranch_6/mswindows/generic.manifest
Modified:
   grass/branches/develbranch_6/Makefile
Log:
attempt to fix
r.patch non-functional in WinGRASS 6.4 svn on Vista (ticket #759)
by building manifests


Modified: grass/branches/develbranch_6/Makefile
===================================================================
--- grass/branches/develbranch_6/Makefile	2010-02-15 22:37:17 UTC (rev 41034)
+++ grass/branches/develbranch_6/Makefile	2010-02-15 22:42:39 UTC (rev 41035)
@@ -91,6 +91,7 @@
 	for subdir in $$list; do \
 		$(MAKE) -C $$subdir; \
 	done
+	$(MAKE) manifests 
 	if [ ${LOCALE} -eq 1 ] ; then $(MAKE) -C locale; fi
 	-cp -f $(FILES) ${ARCH_DISTDIR}/
 	-cp -f ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} ${ARCH_DISTDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp
@@ -111,6 +112,15 @@
 	@cat $(ERRORLOG)
 	@if [ `cat "$(ERRORLOG)" | wc -l` -gt 8 ] ; then false ; else true ; fi
 
+manifests:
+ifneq ($(strip $(MINGW)),)
+	find $(ARCH_DISTDIR) -type f -name '*.exe' | \
+	while read file ; do \
+	    cmd=`basename "$$file" .exe` ; \
+	    sed "s/@CMD@/$$cmd/" mswindows/generic.manifest > "$$file".manifest ; \
+	done
+endif
+	
 LIBDIRS = \
 	lib/external/shapelib \
 	lib/datetime \

Added: grass/branches/develbranch_6/mswindows/generic.manifest
===================================================================
--- grass/branches/develbranch_6/mswindows/generic.manifest	                        (rev 0)
+++ grass/branches/develbranch_6/mswindows/generic.manifest	2010-02-15 22:42:39 UTC (rev 41035)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+  <assemblyIdentity version="1.0.0.0"
+     processorArchitecture="X86"
+     name="@CMD@"
+     type="win32"/> 
+  <description>GRASS module: @CMD@</description> 
+  <!-- Identify the application security requirements. -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+        </requestedPrivileges>
+       </security>
+  </trustInfo>
+</assembly>