dia r4384 - in trunk: . installer/win32

From: sdteffen svn gnome org
To: svn-commits-list gnome org
Subject: dia r4384 - in trunk: . installer/win32
Date: Wed, 15 Apr 2009 20:40:34 +0000 (UTC)
Author: sdteffen
Date: Wed Apr 15 20:40:34 2009
New Revision: 4384
URL: http://svn.gnome.org/viewvc/dia?rev=4384&view=rev

Log:
2009-04-15  Steffen Macke <sdteffen sdteffen de>

	* makefile.msc: cairo, drs, locale build fixes
	* dia.nsi: Various updates for 0.97-pre3

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	Wed Apr 15 20:40:34 2009
@@ -103,10 +103,10 @@
   
 VIAddVersionKey "ProductName" "Dia for Windows"
 VIAddVersionKey "CompanyName" "The Dia Developers"
-VIAddVersionKey "LegalCopyright" "(c) 2003-2006 Alexander Larsson and others"
+VIAddVersionKey "LegalCopyright" "(c) 2003-2009 Alexander Larsson and others"
 VIAddVersionKey "FileDescription" "Dia for Windows Installer"
-VIAddVersionKey "FileVersion" "0.96.2.0"
-VIProductVersion "0.96.2.0"
+VIAddVersionKey "FileVersion" "0.97.0.3"
+VIProductVersion "0.97.0.3"
 
 ;--------------------------------
 ;Modern UI Configuration
@@ -126,7 +126,9 @@
   !define MUI_ABORTWARNING
 
   ;Finish Page config
-  !define MUI_FINISHPAGE_RUN			"$INSTDIR\bin\diaw.exe"
+  !define MUI_FINISHPAGE_RUN
+  !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchDia"
+
   !define MUI_FINISHPAGE_RUN_NOTCHECKED
   !define MUI_FINISHPAGE_LINK			$(DIA_FINISH_VISIT_WEB_SITE)
   !define MUI_FINISHPAGE_LINK_LOCATION          "http://dia-installer.de/";
@@ -226,7 +228,7 @@
     WriteRegStr HKEY_CLASSES_ROOT ".dia" "Content Type" "application/dia"
     WriteRegStr HKEY_CLASSES_ROOT "diaFile" "" "diaFile"
     WriteRegBin HKEY_CLASSES_ROOT "diaFile" "EditFlags" 00000100
-    WriteRegStr HKEY_CLASSES_ROOT "diaFile\Shell\open\command" "" '"$INSTDIR\bin\dia-win-remote.exe" diaw.exe "%1"'
+    WriteRegStr HKEY_CLASSES_ROOT "diaFile\Shell\open\command" "" '"$INSTDIR\bin\dia-win-remote.exe" diaw.exe --integrated "%1"'
     WriteRegStr HKEY_CLASSES_ROOT "diaFile\DefaultIcon" "" "$INSTDIR\etc\dia-diagram.ico,0"
     WriteRegStr HKEY_CLASSES_ROOT "diaFile\Shell\createcgm" "" "Create CGM image"
     WriteRegStr HKEY_CLASSES_ROOT "diaFile\Shell\createcgm\command" "" '"$INSTDIR\bin\dia.exe" -t cgm "%1"'
@@ -261,7 +263,7 @@
 ; \${File} "$1" "$2"
 ${File} "..\..\build\win32\bin\" "dia.exe"
 ${File} "..\..\build\win32\bin\" "diaw.exe"
-${File} "..\..\..\bin\" "dia-win-remote.exe"
+${File} "..\..\app\" "dia-win-remote.exe"
 ${File} "..\..\build\win32\bin\" "dia-app.dll"
 ${File} "..\..\..\bin\" "libart_lgpl_22.dll"
 ${File} "..\..\..\bin\" "libcairo-2.dll"
@@ -278,6 +280,7 @@
 ${File} "..\..\plug-ins\cgm\" "cgm.dll"
 ${File} "..\..\objects\chronogram\" "chronogram.dll"
 ${File} "..\..\objects\custom\" "custom.dll"
+${File} "..\..\plug-ins\drs\" "drs.dll"
 ${File} "..\..\plug-ins\dxf\" "dxf.dll"
 ${File} "..\..\objects\er\" "er.dll"
 ${File} "..\..\objects\flowchart\" "flowchart.dll"
@@ -287,10 +290,13 @@
 ${File} "..\..\objects\Istar\" "Istar.dll"
 ${File} "..\..\objects\Jackson\" "Jackson.dll"
 ${File} "..\..\objects\KAOS\" "Kaos.dll"
+#TODO: Fix libart plugin/dependencies
+#${File} "..\..\plug-ins\libart\" "libart.dll"
 ${File} "..\..\plug-ins\metapost\" "metapost.dll"
 ${File} "..\..\objects\misc\" "misc.dll"
 ${File} "..\..\objects\network\" "network.dll"
 ${File} "..\..\plug-ins\pixbuf\" "pixbuf.dll"
+${File} "..\..\plug-ins\postscript\" "postscript.dll"
 ${File} "..\..\plug-ins\pstricks\" "pstricks.dll"
 ${File} "..\..\objects\SADT\" "sadt.dll"
 ${File} "..\..\plug-ins\shape\" "shape.dll"
@@ -2424,6 +2430,7 @@
 ${File} "..\..\samples\" "CompositeAction.dia"
 ${File} "..\..\samples\" "dia_logo.png"
 ${File} "..\..\samples\" "ER-demo.dia"
+${File} "..\..\samples\" "font-sizes.dia"
 ${File} "..\..\samples\" "grafcet.dia"
 ${File} "..\..\samples\" "Istar.dia"
 ${File} "..\..\samples\" "Jackson.dia"
@@ -2434,6 +2441,7 @@
 ${File} "..\..\samples\" "TexChars.dia"
 ${File} "..\..\samples\" "UML-demo.dia"
 ${File} "..\..\samples\" "UMLPackages.dia"
+${File} "..\..\samples\" "undo-check.dia"
 
 ${SetOutPath} "$INSTDIR\samples\Fig"
 ${File} "..\..\samples\Fig\" "Foo.fig"
@@ -2441,8 +2449,14 @@
 
 ${SetOutPath} "$INSTDIR\samples\self"
 ${File} "..\..\samples\self\" "dia-core.dia"
+${File} "..\..\samples\self\" "dia-linux-2.dia"
+${File} "..\..\samples\self\" "dia-linux-2.dot"
 ${File} "..\..\samples\self\" "dia-objects.dia"
 ${File} "..\..\samples\self\" "dia-renderer.dia"
+${File} "..\..\samples\self\" "dia-standard-objects.dia"
+${File} "..\..\samples\self\" "dia-win32-2.dia"
+${File} "..\..\samples\self\" "dia-win32-2.dot"
+${File} "..\..\samples\self\" "PyDiaObjects.dia"
 ${File} "..\..\samples\self\" "umlclass.dia"
 
 ${SetOutPath} "$INSTDIR\samples\Visio"
@@ -2604,7 +2618,7 @@
     CreateDirectory "$SMPROGRAMS\Dia"
     ReadRegStr $0 HKU ".DEFAULT\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders" "My Pictures"
     SetOutPath "$0"
-    CreateShortCut "$SMPROGRAMS\Dia\Dia.lnk" "$INSTDIR\bin\diaw.exe"
+    CreateShortCut "$SMPROGRAMS\Dia\Dia.lnk" "$INSTDIR\bin\diaw.exe" "--integrated"
     CreateShortCut "$SMPROGRAMS\Dia\Dia Manual (CHM).lnk" "$INSTDIR\help\C\dia-manual.chm"
     CreateShortCut "$SMPROGRAMS\Dia\Dia Manual (PDF).lnk" "$INSTDIR\help\C\dia-manual.pdf"
     CreateShortCut "$SMPROGRAMS\Dia\FAQ.lnk" "$INSTDIR\help\C\faq.html"
@@ -3472,11 +3486,18 @@
   ${SetOutPath} "$INSTDIR\bin"
   ${File} "..\..\plug-ins\python\" "dia.pyd"
   ${SetOutPath} "$INSTDIR"
+  ${File} "..\..\plug-ins\python\" "allprops.py"
   ${File} "..\..\plug-ins\python\" "aobjects.py"
+  ${File} "..\..\plug-ins\python\" "arrange.py"
+  ${File} "..\..\plug-ins\python\" "autolayoutforce.py"
   ${File} "..\..\plug-ins\python\" "bbox.py"
   ${File} "..\..\plug-ins\python\" "codegen.py"
   ${File} "..\..\plug-ins\python\" "debug_objects.py"
+  ${File} "..\..\plug-ins\python\" "diagx.py"
+  ${File} "..\..\plug-ins\python\" "diastddia.py"
+  ${File} "..\..\plug-ins\python\" "diasvg.py"
   ${File} "..\..\plug-ins\python\" "diasvg_import.py"
+  ${File} "..\..\plug-ins\python\" "dot2dia.py"
   ${File} "..\..\plug-ins\python\" "dot.py"
   ${File} "..\..\plug-ins\python\" "doxrev.py"
   ${File} "..\..\plug-ins\python\" "export-object.py"
@@ -3488,7 +3509,9 @@
   ${File} "..\..\plug-ins\python\" "pydiadoc.py"
   ${File} "..\..\plug-ins\python\" "python-startup.py"
   ${File} "..\..\plug-ins\python\" "scascale.py"
-  ${File} "..\..\plug-ins\python\" "select_by.py" 
+  ${File} "..\..\plug-ins\python\" "select_by.py"
+  ${File} "..\..\plug-ins\python\" "select_empty.py"
+  ${File} "..\..\plug-ins\python\" "wdeps.py"
 SectionEnd
 
 Section -closelogfile
@@ -4085,3 +4108,8 @@
   Pop $R1
   Exch $R0
 FunctionEnd
+
+Function LaunchDia
+  ExecShell "" "$SMPROGRAMS\Dia\Dia.lnk"
+
+FunctionEnd

Modified: trunk/makefile.msc
==============================================================================
--- trunk/makefile.msc	(original)
+++ trunk/makefile.msc	Wed Apr 15 20:40:34 2009
@@ -18,6 +18,7 @@
 #	build\win32\dia\bondgraph.dll \
 	build\win32\dia\chronogram.dll \
 	build\win32\dia\custom.dll \
+	build\win32\dia\drs.dll \
 	build\win32\dia\er.dll \
 	build\win32\dia\flowchart.dll \
 	build\win32\dia\fs.dll \
@@ -30,7 +31,7 @@
 	build\win32\dia\sadt.dll \
 	build\win32\dia\standard.dll \
 	build\win32\dia\uml.dll \
-#	build\win32\dia\cairo.dll \
+	build\win32\dia\cairo.dll \
 	build\win32\dia\cgm.dll \
 	build\win32\dia\dxf.dll \
 	build\win32\dia\hpgl.dll \
@@ -136,6 +137,9 @@
 	
 build\win32\dia\custom.dll: build\win32\dia objects\custom\custom.dll
 	copy objects\custom\custom.dll build\win32\dia
+	
+build\win32\dia\drs.dll: build\win32\dia plug-ins\drs\drs.dll
+	copy plug-ins\drs\drs.dll build\win32\dia
 
 build\win32\dia\er.dll: build\win32\dia objects\ER\er.dll
 	copy objects\ER\er.dll build\win32\dia
@@ -232,7 +236,7 @@
 
 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
+po: build\win32\locale
  	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
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]