dia r4139 - in trunk: . installer/win32



Author: sdteffen
Date: Sat Nov 15 11:46:57 2008
New Revision: 4139
URL: http://svn.gnome.org/viewvc/dia?rev=4139&view=rev

Log:
	* makefile.msc:
	* installer/win32/dia.nsi:
	* installer/win32/wikifaq2installerfaq.sed: Small script to generate the
	installer FAQ file from the Wiki

Added:
   trunk/installer/win32/wikifaq2installerfaq.sed
Modified:
   trunk/ChangeLog
   trunk/installer/win32/dia.nsi
   trunk/makefile.msc

Modified: trunk/installer/win32/dia.nsi
==============================================================================
--- trunk/installer/win32/dia.nsi	(original)
+++ trunk/installer/win32/dia.nsi	Sat Nov 15 11:46:57 2008
@@ -2340,23 +2340,24 @@
 ${File} "..\..\sheets\UML\" "umlclass_template.png"
 ${File} "..\..\sheets\UML\" "umlclass_template.png"
 ${SetOutPath} "$INSTDIR\help\C"
-${File} "..\..\..\help\C\" "dia-manual.chm"
-${File} "..\..\..\help\C\" "dia-manual.pdf"
-${File} "..\..\..\dia-web\" "faq.html"
+${File} "..\..\build\win32\help\C\" "dia-manual.chm"
+${File} "..\..\build\win32\help\C\" "dia-manual.pdf"
+${File} "..\..\build\win32\help\C\" "faq.html"
 ${SetOutPath} "$INSTDIR\help\C\faq_files"
-${File} "..\..\..\dia-web\faq_files\" "addbend1.png"
-${File} "..\..\..\dia-web\faq_files\" "addbend2.png"
-${File} "..\..\..\dia-web\faq_files\" "addbend3.png"
-${File} "..\..\..\dia-web\faq_files\" "common.css"
-${File} "..\..\..\dia-web\faq_files\" "print.css"
-${File} "..\..\..\dia-web\faq_files\" "projection.css"
-${File} "..\..\..\dia-web\faq_files\" "screen.css"
-${File} "..\..\..\dia-web\faq_files\" "smile.png"
-${File} "..\..\..\dia-web\faq_files\" "spacer.png"
-${File} "..\..\..\dia-web\faq_files\" "zig1.png"
-${File} "..\..\..\dia-web\faq_files\" "zig2.png"
-${File} "..\..\..\dia-web\faq_files\" "zig4.png"
-${File} "..\..\..\dia-web\faq_files\" "zig5.png"
+${File} "..\..\build\win32\help\C\faq_files\" "addbend1.png"
+${File} "..\..\build\win32\help\C\faq_files\" "addbend2.png"
+${File} "..\..\build\win32\help\C\faq_files\" "addbend3.png"
+${File} "..\..\build\win32\help\C\faq_files\" "common.css"
+${File} "..\..\build\win32\help\C\faq_files\" "layout.css"
+${File} "..\..\build\win32\help\C\faq_files\" "print.css"
+${File} "..\..\build\win32\help\C\faq_files\" "projection.css"
+${File} "..\..\build\win32\help\C\faq_files\" "screen.css"
+${File} "..\..\build\win32\help\C\faq_files\" "smile.png"
+${File} "..\..\build\win32\help\C\faq_files\" "spacer.png"
+${File} "..\..\build\win32\help\C\faq_files\" "zig1.png"
+${File} "..\..\build\win32\help\C\faq_files\" "zig2.png"
+${File} "..\..\build\win32\help\C\faq_files\" "zig4.png"
+${File} "..\..\build\win32\help\C\faq_files\" "zig5.png"
 
 ${SetOutPath} "$INSTDIR\samples"
 ${File} "..\..\samples\" "all_objects.dia"

Added: trunk/installer/win32/wikifaq2installerfaq.sed
==============================================================================
--- (empty file)
+++ trunk/installer/win32/wikifaq2installerfaq.sed	Sat Nov 15 11:46:57 2008
@@ -0,0 +1,19 @@
+1,/bottom_Include_Dia\/SiteMenu/c\
+<html>\
+<head>\
+<title>Dia FAQ</title>\
+<link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="faq_files/layout.css">\
+<link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="faq_files/common.css">\
+<link rel="stylesheet" type="text/css" charset="utf-8" media="screen" href="faq_files/screen.css">\
+<link rel="stylesheet" type="text/css" charset="utf-8" media="print" href="faq_files/print.css">\
+<link rel="stylesheet" type="text/css" charset="utf-8" media="projection" href="faq_files/projection.css">\
+<!--[if IE]>\
+<link rel="stylesheet" type="text/css" charset="utf-8" media="all" href="faq_files/msie.css">\
+<![endif]-->\
+</head>\
+<body>\
+<h1>1. Dia FAQ (Frequently Asked Questions)</h1>\
+<table style="display: none"><tbody><tr><td>&nbsp;</td>
+/<div id="pagebottom">/,100000 c\
+</body></html>
+s/http:\/\/www.gnome.org\/projects\/dia\/images/faq_files/g
\ No newline at end of file

Modified: trunk/makefile.msc
==============================================================================
--- trunk/makefile.msc	(original)
+++ trunk/makefile.msc	Sat Nov 15 11:46:57 2008
@@ -229,12 +229,16 @@
 	
 DOCBOOKDIR = c:\program files\docbook-xsl
 
-XSLTPROC = "c:\program files\libxslt\bin\xsltproc.exe"
+XSLTPROC = "c:\gtk\bin\xsltproc.exe"
 
 FOP = "c:\program files\fop\fop.bat"
 
 HHC = "c:\program files\HTML Help Workshop\hhc.exe"
 
+WGET = "c:\gtk\bin\wget.exe"
+
+SED = "c:\gtk\bin\sed.exe"
+
 .IGNORE:
 doc: doc\en\dia.xml
 	cd doc\en
@@ -251,3 +255,10 @@
 	$(FOP) dia-manual.fo dia-manual.pdf
 	copy htmlhelp.chm ..\..\build\win32\help\pl\dia-manual.chm
 	copy dia-manual.pdf ..\..\build\win32\help\pl\dia-manual.pdf
+
+faq:
+	cd build\win32\help\C
+	DEL faqwiki.html
+	$(WGET) -O faqwiki.html http://live.gnome.org/Dia/Faq
+	$(SED) -f ..\..\..\..\installer\win32\wikifaq2installerfaq.sed faqwiki.html > faq.html
+	DEL faqwiki.html



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]