GNOME.org
 

dia r4147 - in trunk: . installer/win32

Author: sdteffen
Date: Sun Nov 30 18:11:27 2008
New Revision: 4147
URL: http://svn.gnome.org/viewvc/dia?rev=4147&view=rev

Log:
2008-11-30  Steffen Macke <sdteffen sdteffen de>

	* makefile.msc: Create *.mo files in build/win32
	* installer/win32/dia.nsi: Reflect documentation updates

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	Sun Nov 30 18:11:27 2008
@@ -2340,8 +2340,8 @@
 ${File} "..\..\sheets\UML\" "umlclass_template.png"
 ${File} "..\..\sheets\UML\" "umlclass_template.png"
 ${SetOutPath} "$INSTDIR\help\C"
-${File} "..\..\build\win32\help\C\" "dia-manual.chm"
-${File} "..\..\build\win32\help\C\" "dia-manual.pdf"
+${File} "..\..\build\win32\help\en\" "dia-manual.chm"
+${File} "..\..\build\win32\help\en\" "dia-manual.pdf"
 ${File} "..\..\build\win32\help\C\" "faq.html"
 ${SetOutPath} "$INSTDIR\help\C\faq_files"
 ${File} "..\..\build\win32\help\C\faq_files\" "addbend1.png"
@@ -2359,6 +2359,22 @@
 ${File} "..\..\build\win32\help\C\faq_files\" "zig4.png"
 ${File} "..\..\build\win32\help\C\faq_files\" "zig5.png"
 
+${SetOutPath} "$INSTDIR\help\en"
+${File} "..\..\build\win32\help\en\" "dia-manual.chm"
+${File} "..\..\build\win32\help\en\" "dia-manual.pdf"
+
+${SetOutPath} "$INSTDIR\help\eu"
+${File} "..\..\build\win32\help\eu\" "dia-manual.chm"
+${File} "..\..\build\win32\help\eu\" "dia-manual.pdf"
+
+${SetOutPath} "$INSTDIR\help\fr"
+${File} "..\..\build\win32\help\fr\" "dia-manual.chm"
+${File} "..\..\build\win32\help\fr\" "dia-manual.pdf"
+
+${SetOutPath} "$INSTDIR\help\pl"
+${File} "..\..\build\win32\help\pl\" "dia-manual.chm"
+${File} "..\..\build\win32\help\pl\" "dia-manual.pdf"
+
 ${SetOutPath} "$INSTDIR\samples"
 ${File} "..\..\samples\" "all_objects.dia"
 ${File} "..\..\samples\" "arrows.dia"
@@ -2562,121 +2578,121 @@
 Section $(TRANSLATIONS_SECTION_TITLE) SecTranslations
   SetOverwrite On
   ${SetOutPath} "$INSTDIR\locale\am\LC_MESSAGES"
-  ${File} "..\..\..\locale\am\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\am\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\ar\LC_MESSAGES"
-  ${File} "..\..\..\locale\ar\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\ar\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\az\LC_MESSAGES"
-  ${File} "..\..\..\locale\az\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\az\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\be\LC_MESSAGES"
-  ${File} "..\..\..\locale\be\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\be\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\bg\LC_MESSAGES"
-  ${File} "..\..\..\locale\bg\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\bg\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\bs\LC_MESSAGES"
-  ${File} "..\..\..\locale\bs\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\bs\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\ca\LC_MESSAGES"
-  ${File} "..\..\..\locale\ca\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\ca\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\cs\LC_MESSAGES"
-  ${File} "..\..\..\locale\cs\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\cs\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\da\LC_MESSAGES"
-  ${File} "..\..\..\locale\da\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\da\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\de\LC_MESSAGES"
-  ${File} "..\..\..\locale\de\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\de\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\dz\LC_MESSAGES"
-  ${File} "..\..\..\locale\dz\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\dz\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\el\LC_MESSAGES"
-  ${File} "..\..\..\locale\el\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\el\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\en_CA\LC_MESSAGES"
-  ${File} "..\..\..\locale\en_CA\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\en_CA\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\en_GB\LC_MESSAGES"
-  ${File} "..\..\..\locale\en_GB\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\en_GB\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\es\LC_MESSAGES"
-  ${File} "..\..\..\locale\es\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\es\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\eu\LC_MESSAGES"
-  ${File} "..\..\..\locale\eu\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\eu\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\fi\LC_MESSAGES"
-  ${File} "..\..\..\locale\fi\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\fi\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\fr\LC_MESSAGES"
-  ${File} "..\..\..\locale\fr\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\fr\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\ga\LC_MESSAGES"
-  ${File} "..\..\..\locale\ga\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\ga\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\gl\LC_MESSAGES"
-  ${File} "..\..\..\locale\gl\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\gl\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\gu\LC_MESSAGES"
-  ${File} "..\..\..\locale\gu\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\gu\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\hr\LC_MESSAGES"
-  ${File} "..\..\..\locale\hr\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\hr\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\hu\LC_MESSAGES"
-  ${File} "..\..\..\locale\hu\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\hu\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\id\LC_MESSAGES"
-  ${File} "..\..\..\locale\id\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\id\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\is\LC_MESSAGES"
-  ${File} "..\..\..\locale\is\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\is\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\it\LC_MESSAGES"
-  ${File} "..\..\..\locale\it\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\it\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\ja\LC_MESSAGES"
-  ${File} "..\..\..\locale\ja\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\ja\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\ko\LC_MESSAGES"
-  ${File} "..\..\..\locale\ko\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\ko\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\lt\LC_MESSAGES"
-  ${File} "..\..\..\locale\lt\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\lt\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\lv\LC_MESSAGES"
-  ${File} "..\..\..\locale\lv\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\lv\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\mk\LC_MESSAGES"
-  ${File} "..\..\..\locale\mk\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\mk\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\ml\LC_MESSAGES"
-  ${File} "..\..\..\locale\ml\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\ml\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\mn\LC_MESSAGES"
-  ${File} "..\..\..\locale\mn\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\mn\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\ms\LC_MESSAGES"
-  ${File} "..\..\..\locale\ms\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\ms\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\nb\LC_MESSAGES"
-  ${File} "..\..\..\locale\nb\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\nb\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\ne\LC_MESSAGES"
-  ${File} "..\..\..\locale\ne\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\ne\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\nl\LC_MESSAGES"
-  ${File} "..\..\..\locale\nl\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\nl\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\nn\LC_MESSAGES"
-  ${File} "..\..\..\locale\nn\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\nn\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\pa\LC_MESSAGES"
-  ${File} "..\..\..\locale\pa\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\pa\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\pl\LC_MESSAGES"
-  ${File} "..\..\..\locale\pl\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\pl\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\pt\LC_MESSAGES"
-  ${File} "..\..\..\locale\pt\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\pt\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\pt_BR\LC_MESSAGES"
-  ${File} "..\..\..\locale\pt_BR\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\pt_BR\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\ro\LC_MESSAGES"
-  ${File} "..\..\..\locale\ro\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\ro\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\ru\LC_MESSAGES"
-  ${File} "..\..\..\locale\ru\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\ru\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\rw\LC_MESSAGES"
-  ${File} "..\..\..\locale\rw\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\rw\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\sk\LC_MESSAGES"
-  ${File} "..\..\..\locale\sk\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\sk\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\sl\LC_MESSAGES"
-  ${File} "..\..\..\locale\sl\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\sl\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\sq\LC_MESSAGES"
-  ${File} "..\..\..\locale\sq\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\sq\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\sr\LC_MESSAGES"
-  ${File} "..\..\..\locale\sr\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\sr\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\sr Latn\LC_MESSAGES"
-  ${File} "  \  \  \locale\sr Latn\LC_MESSAGES\" "dia.mo"
+  ${File} "  \  \build\win32\locale\sr Latn\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\sv\LC_MESSAGES"
-  ${File} "..\..\..\locale\sv\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\sv\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\th\LC_MESSAGES"
-  ${File} "..\..\..\locale\th\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\th\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\tr\LC_MESSAGES"
-  ${File} "..\..\..\locale\tr\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\tr\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\uk\LC_MESSAGES"
-  ${File} "..\..\..\locale\uk\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\uk\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\vi\LC_MESSAGES"
-  ${File} "..\..\..\locale\vi\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\vi\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\zh_CN\LC_MESSAGES"
-  ${File} "..\..\..\locale\zh_CN\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\zh_CN\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\zh_HK\LC_MESSAGES"
-  ${File} "..\..\..\locale\zh_HK\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\zh_HK\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\zh_TW\LC_MESSAGES"
-  ${File} "..\..\..\locale\zh_TW\LC_MESSAGES\" "dia.mo"
+  ${File} "..\..\build\win32\locale\zh_TW\LC_MESSAGES\" "dia.mo"
   
   !ifdef DIA_INCLUDE_GTK
 ${SetOutPath} "$INSTDIR\lib\locale\af"
@@ -3389,15 +3405,12 @@
 ${File} "..\..\..\share\locale\zh_TW\LC_MESSAGES\" "gtk20.mo"
   !endif
   
-  ${SetOutPath} "$INSTDIR\help\pl"
-  ${File} "..\..\..\help\pl\" "dia-manual.chm"
-  ${File} "..\..\..\help\pl\" "dia-manual.pdf"
+  CreateDirectory "$SMPROGRAMS\Dia\French"
+  CreateShortCut "$SMPROGRAMS\Dia\French\Dia Manual (CHM).lnk" "$INSTDIR\help\fr\dia-manual.chm"
+  CreateShortCut "$SMPROGRAMS\Dia\French\Dia Manual (PDF).lnk" "$INSTDIR\help\fr\dia-manual.pdf"
   CreateDirectory "$SMPROGRAMS\Dia\Polish"
   CreateShortCut "$SMPROGRAMS\Dia\Polish\Dia Manual (CHM).lnk" "$INSTDIR\help\pl\dia-manual.chm"
   CreateShortCut "$SMPROGRAMS\Dia\Polish\Dia Manual (PDF).lnk" "$INSTDIR\help\pl\dia-manual.pdf"
-  ${SetOutPath} "$INSTDIR\help\eu"
-  ${File} "..\..\..\help\eu\" "dia-manual.chm"
-  ${File} "..\..\..\help\eu\" "dia-manual.pdf"
   CreateDirectory "$SMPROGRAMS\Dia\Basque"
   CreateShortCut "$SMPROGRAMS\Dia\Basque\Dia Manual (CHM).lnk" "$INSTDIR\help\eu\dia-manual.chm"
   CreateShortCut "$SMPROGRAMS\Dia\Basque\Dia Manual (PDF).lnk" "$INSTDIR\help\eu\dia-manual.pdf"
@@ -3518,6 +3531,9 @@
     Delete "$SMPROGRAMS\Dia\Polish\Dia Manual (CHM).lnk"
     Delete "$SMPROGRAMS\Dia\Polish\Dia Manual (PDF).lnk"
     RMDir "$SMPROGRAMS\Dia\Polish"
+	Delete "$SMPROGRAMS\Dia\French\Dia Manual (CHM).lnk"
+    Delete "$SMPROGRAMS\Dia\French\Dia Manual (PDF).lnk"
+    RMDir "$SMPROGRAMS\Dia\French"
     RMDir "$SMPROGRAMS\Dia"
     Delete "$DESKTOP\Dia.lnk"
     

Modified: trunk/makefile.msc
==============================================================================
--- trunk/makefile.msc	(original)
+++ trunk/makefile.msc	Sun Nov 30 18:11:27 2008
@@ -223,9 +223,9 @@
 ALL_LINGUAS = am ar az be bg bs ca cs da de dz el en_CA en_GB es eu fi fr ga gl gu hr hu id is it ja ko lt lv mk ml mn ms nb ne nl nn oc pa pl pt pt_BR ro ru rw sk sl sq sr sr Latn sv th tr uk vi zh_CN zh_HK zh_TW	
 
 po: installer\locale
- 	for %d in ($(ALL_LINGUAS)) do md installer\locale\%d
-	for %d in ($(ALL_LINGUAS)) do md installer\locale\%d\LC_MESSAGES
-	for %d in ($(ALL_LINGUAS)) do msgfmt -o installer\locale\%d\LC_MESSAGES\dia.mo po\%d.po
+ 	for %d in ($(ALL_LINGUAS)) do md build\win32\locale\%d
+	for %d in ($(ALL_LINGUAS)) do md build\win32\locale\%d\LC_MESSAGES
+	for %d in ($(ALL_LINGUAS)) do msgfmt -o build\win32\locale\%d\LC_MESSAGES\dia.mo po\%d.po
 	
 DOCBOOKDIR = c:\program files\docbook-xsl
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]