[GRASS-SVN] r41333 - in grass/branches/releasebranch_6_4: general/g.dirseps general/g.mkfontcap mswindows

[svn_grass at osgeo.org]

Author: hellik
Date: 2010-03-07 12:11:45 -0500 (Sun, 07 Mar 2010)
New Revision: 41333

Modified:
   grass/branches/releasebranch_6_4/general/g.dirseps/main.c
   grass/branches/releasebranch_6_4/general/g.mkfontcap/main.c
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
Log:
wingrass-installer improvements - part 3:
run g.mkfontcap outside a grass-session
invoking g.mkfontcap by the wingrass-installer

Modified: grass/branches/releasebranch_6_4/general/g.dirseps/main.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.dirseps/main.c	2010-03-07 17:00:15 UTC (rev 41332)
+++ grass/branches/releasebranch_6_4/general/g.dirseps/main.c	2010-03-07 17:11:45 UTC (rev 41333)
@@ -28,6 +28,7 @@
 
     G_set_program_name(argv[0]);
     G_no_gisinit();
+    G_set_gisrc_mode(G_GISRC_MODE_MEMORY);
 
     module = G_define_module();
     module->keywords = "general";

Modified: grass/branches/releasebranch_6_4/general/g.mkfontcap/main.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.mkfontcap/main.c	2010-03-07 17:00:15 UTC (rev 41332)
+++ grass/branches/releasebranch_6_4/general/g.mkfontcap/main.c	2010-03-07 17:11:45 UTC (rev 41333)
@@ -59,6 +59,7 @@
 
     G_set_program_name(argv[0]);
     G_no_gisinit();
+    G_set_gisrc_mode(G_GISRC_MODE_MEMORY);
 
     module = G_define_module();
     module->keywords = "general";

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-03-07 17:00:15 UTC (rev 41332)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-03-07 17:11:45 UTC (rev 41333)
@@ -432,7 +432,64 @@
 	;add GRASS files
 	SetOutPath "$INSTALL_DIR"
 	File /r ${PACKAGE_FOLDER}\*.*
+
+	;create run_gmkfontcap.bat
+	ClearErrors
+	FileOpen $0 $INSTALL_DIR\etc\run_gmkfontcap.bat w
+	IfErrors done_create_run_gmkfontcap.bat
+	FileWrite $0 '@echo off$\r$\n'
+	FileWrite $0 'rem #########################################################################$\r$\n'
+	FileWrite $0 'rem #$\r$\n'
+	FileWrite $0 'rem # Run g.mkfontcap outside a grass session during installation$\r$\n'
+	FileWrite $0 'rem #$\r$\n'
+	FileWrite $0 'rem #########################################################################$\r$\n'
+	FileWrite $0 'echo Setup of WinGRASS-${VERSION_NUMBER}$\r$\n'
+	FileWrite $0 'echo Generating the font configuration file by scanning various directories for fonts.$\r$\n'
+	FileWrite $0 'echo Please wait. Console window will close automatically ....$\r$\n'
+	FileWrite $0 '$\r$\n'
+	FileWrite $0 'rem set gisbase$\r$\n'
+	FileWrite $0 'set GISBASE=$INSTALL_DIR$\r$\n'
+	FileWrite $0 '$\r$\n'
+	FileWrite $0 'rem set path to freetype dll$\r$\n'
+	FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib$\r$\n'
+	FileWrite $0 '$\r$\n'
+	FileWrite $0 'rem set dependecies path$\r$\n'
+	FileWrite $0 'set PATH=%FREETYPEBASE%;%PATH%$\r$\n'
+	FileWrite $0 '$\r$\n'
+	FileWrite $0 'rem run g.mkfontcap outside a grass session$\r$\n'
+	FileWrite $0 '"%GISBASE%\bin\g.mkfontcap.exe"$\r$\n'
+	FileWrite $0 'exit$\r$\n'
+	FileClose $0
+	done_create_run_gmkfontcap.bat:
+
+	;create run_gmkfontcap.bat.manifest
+	ClearErrors
+	FileOpen $0 $INSTALL_DIR\etc\run_gmkfontcap.bat.manifest w
+	IfErrors done_create_run_gmkfontcap.bat.manifest
+	FileWrite $0 '	<?xml version="1.0" encoding="UTF-8" standalone="yes"?>$\r$\n'
+	FileWrite $0 '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">$\r$\n' 
+	FileWrite $0 '  <assemblyIdentity version="1.0.0.0"$\r$\n'
+	FileWrite $0 '     processorArchitecture="X86"$\r$\n'
+	FileWrite $0 '     name="run_gmkfontcap"$\r$\n'
+	FileWrite $0 '     type="win32"/>$\r$\n' 
+	FileWrite $0 '  <description>GRASS help script:run_gmkfontcap<description>$\r$\n' 
+	FileWrite $0 '  <!-- Identify the application security requirements. -->$\r$\n'
+	FileWrite $0 '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">$\r$\n'
+	FileWrite $0 '    <security>$\r$\n'
+	FileWrite $0 '      <requestedPrivileges>$\r$\n'
+	FileWrite $0 '        <requestedExecutionLevel$\r$\n'
+	FileWrite $0 '          level="asInvoker"$\r$\n'
+	FileWrite $0 '          uiAccess="false"/>$\r$\n'
+	FileWrite $0 '        </requestedPrivileges>$\r$\n'
+	FileWrite $0 '       </security>$\r$\n'
+	FileWrite $0 '  </trustInfo>$\r$\n'
+	FileWrite $0 '</assembly>$\r$\n'
+	FileClose $0
+	done_create_run_gmkfontcap.bat.manifest:
 	
+	;Run g.mkfontcap outside a grass session during installation to catch all fonts
+	ExecWait '"$INSTALL_DIR\etc\run_gmkfontcap.bat"'
+	
 	;Install demolocation into the GIS_DATABASE directory
 	SetOutPath "$GIS_DATABASE\demolocation"
 	File /r ${DEMOLOCATION_PATH}\*.*