dia r4291 - in trunk: . installer/win32 installer/win32/locale

From: sdteffen svn gnome org
To: svn-commits-list gnome org
Subject: dia r4291 - in trunk: . installer/win32 installer/win32/locale
Date: Mon, 16 Feb 2009 20:41:05 +0000 (UTC)
Author: sdteffen
Date: Mon Feb 16 20:41:05 2009
New Revision: 4291
URL: http://svn.gnome.org/viewvc/dia?rev=4291&view=rev

Log:
	* installer/win32/dia.nsi: Various small updates
	* installer/win32/locale/*.nsh: Use Python 2.3 instead of 2.2 
	* makefile.msc: Consequent use of build/win32

Modified:
   trunk/ChangeLog
   trunk/installer/win32/dia.nsi
   trunk/installer/win32/locale/english.nsh
   trunk/installer/win32/locale/french.nsh
   trunk/installer/win32/locale/german.nsh
   trunk/installer/win32/locale/hungarian.nsh
   trunk/installer/win32/locale/slovak.nsh
   trunk/installer/win32/locale/slovenian.nsh
   trunk/makefile.msc

Modified: trunk/installer/win32/dia.nsi
==============================================================================
--- trunk/installer/win32/dia.nsi	(original)
+++ trunk/installer/win32/dia.nsi	Mon Feb 16 20:41:05 2009
@@ -259,13 +259,13 @@
 ${SetOutPath} "$INSTDIR\bin"
 ; jEdit replacement: (^.*\\)(.*)$ 
 ; \${File} "$1" "$2"
-${File} "..\..\..\bin\" "dia.exe"
-${File} "..\..\..\bin\" "diaw.exe"
+${File} "..\..\build\win32\bin\" "dia.exe"
+${File} "..\..\build\win32\bin\" "diaw.exe"
 ${File} "..\..\..\bin\" "dia-win-remote.exe"
-${File} "..\..\..\bin\" "dia-app.dll"
+${File} "..\..\build\win32\bin\" "dia-app.dll"
 ${File} "..\..\..\bin\" "libart_lgpl_22.dll"
 ${File} "..\..\..\bin\" "libcairo-2.dll"
-${File} "..\..\..\bin\" "libdia.dll"
+${File} "..\..\build\win32\bin\" "libdia.dll"
 ${File} "..\..\..\bin\" "iconv.dll"
 ${File} "..\..\..\bin\" "intl.dll"
 ${File} "..\..\..\bin\" "libxml2.dll"
@@ -462,6 +462,7 @@
 ${File} "..\..\shapes\BPMN\" "Start-Event-Multiple.shape"
 ${File} "..\..\shapes\BPMN\" "Start-Event-Rule.png"
 ${File} "..\..\shapes\BPMN\" "Start-Event-Rule.shape"
+${File} "..\..\shapes\BPMN\" "Start-Event-Timer.shape"
 ${File} "..\..\shapes\BPMN\" "Start-Event-Timer.png"
 ${File} "..\..\shapes\BPMN\" "Start-Event.png"
 ${File} "..\..\shapes\BPMN\" "Start-Event.shape"
@@ -2656,6 +2657,8 @@
   ${File} "..\..\build\win32\locale\nl\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\nn\LC_MESSAGES"
   ${File} "..\..\build\win32\locale\nn\LC_MESSAGES\" "dia.mo"
+  ${SetOutPath} "$INSTDIR\locale\oc\LC_MESSAGES"
+  ${File} "..\..\build\win32\locale\oc\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\pa\LC_MESSAGES"
   ${File} "..\..\build\win32\locale\pa\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\pl\LC_MESSAGES"
@@ -3743,8 +3746,8 @@
   !insertmacro MUI_LANGDLL_DISPLAY
   ClearErrors
   
-  ; Only enable the Python section if python22.dll is in the system path
-  SearchPath $0 "python22.dll"
+  ; Only enable the Python section if python23.dll is in the system path
+  SearchPath $0 "python23.dll"
   IfErrors NoPython HasPython
   HasPython:
   SectionGetFlags ${SecPython} $0  

Modified: trunk/installer/win32/locale/english.nsh
==============================================================================
--- trunk/installer/win32/locale/english.nsh	(original)
+++ trunk/installer/win32/locale/english.nsh	Mon Feb 16 20:41:05 2009
@@ -27,7 +27,7 @@
 !insertmacro DIA_MACRO_DEFAULT_STRING TRANSLATIONS_SECTION_DESCRIPTION  "Optional translations of the Dia user interface"
 !insertmacro DIA_MACRO_DEFAULT_STRING DIA_SECTION_DESCRIPTION		"Core Dia files and dlls"
 !insertmacro DIA_MACRO_DEFAULT_STRING PYTHON_SECTION_TITLE              "Python plug-in"
-!insertmacro DIA_MACRO_DEFAULT_STRING PYTHON_SECTION_DESCRIPTION              "Support for the Python Scripting Language 2.2. Do not select this if Python is not installed."
+!insertmacro DIA_MACRO_DEFAULT_STRING PYTHON_SECTION_DESCRIPTION              "Support for the Python Scripting Language 2.3. Do not select this if Python is not installed."
 
 ; Installer Finish Page
 !insertmacro DIA_MACRO_DEFAULT_STRING DIA_FINISH_VISIT_WEB_SITE		"Visit the Dia for Windows Web Page"

Modified: trunk/installer/win32/locale/french.nsh
==============================================================================
--- trunk/installer/win32/locale/french.nsh	(original)
+++ trunk/installer/win32/locale/french.nsh	Mon Feb 16 20:41:05 2009
@@ -24,7 +24,7 @@
 !define  TRANSLATIONS_SECTION_TITLE		"Translations"
 !define  TRANSLATIONS_SECTION_DESCRIPTION	"Optional translations of the Dia user interface."
 !define  PYTHON_SECTION_TITLE                   "Python plug-in"
-!define PYTHON_SECTION_DESCRIPTION              "Support for the Python Scripting Language 2.2. Do not select this if Python is not installed."
+!define PYTHON_SECTION_DESCRIPTION              "Support for the Python Scripting Language 2.3. Do not select this if Python is not installed."
 
 ; Installer Finish Page
 !define  DIA_FINISH_VISIT_WEB_SITE		"Visiter la page Web de Dia pour Windows"

Modified: trunk/installer/win32/locale/german.nsh
==============================================================================
--- trunk/installer/win32/locale/german.nsh	(original)
+++ trunk/installer/win32/locale/german.nsh	Mon Feb 16 20:41:05 2009
@@ -24,7 +24,7 @@
 !define TRANSLATIONS_SECTION_TITLE		"Üersetzungen"
 !define TRANSLATIONS_SECTION_DESCRIPTION 	"Optional Üersetzungen der Dia-Benutzeroberfläe füschiedene Sprachen"
 !define PYTHON_SECTION_TITLE                    "Python plug-in"
-!define PYTHON_SECTION_DESCRIPTION              "Unterstü fü Skriptsprache Python 2.2. Bitte nur installieren, falls Python vorhanden ist."
+!define PYTHON_SECTION_DESCRIPTION              "Unterstü fü Skriptsprache Python 2.3. Bitte nur installieren, falls Python vorhanden ist."
   
 ; Installer Finish Page
 !define DIA_FINISH_VISIT_WEB_SITE		"Besuchen Sie die Dia füdows Webseite"

Modified: trunk/installer/win32/locale/hungarian.nsh
==============================================================================
--- trunk/installer/win32/locale/hungarian.nsh	(original)
+++ trunk/installer/win32/locale/hungarian.nsh	Mon Feb 16 20:41:05 2009
@@ -29,7 +29,7 @@
 !define TRANSLATIONS_SECTION_DESCRIPTION  "A Dia felhasznái felüek fordísai"
 !define DIA_SECTION_DESCRIPTION		"Alapvetõa fáok éprogramköták"
 !define PYTHON_SECTION_TITLE        "Python bõmé"
-!define PYTHON_SECTION_DESCRIPTION  "A Python parancsnyelv 2.2 váozaták tágatá. Ne vássza ki, ha a Python nincs telepíe."
+!define PYTHON_SECTION_DESCRIPTION  "A Python parancsnyelv 2.3 váozaták tágatá. Ne vássza ki, ha a Python nincs telepíe."
  
 
 ; Installer Finish Page

Modified: trunk/installer/win32/locale/slovak.nsh
==============================================================================
--- trunk/installer/win32/locale/slovak.nsh	(original)
+++ trunk/installer/win32/locale/slovak.nsh	Mon Feb 16 20:41:05 2009
@@ -29,7 +29,7 @@
 !define TRANSLATIONS_SECTION_DESCRIPTION  "Volitelnéreklady použíte¾ské rozhrania Dia"
 !define DIA_SECTION_DESCRIPTION		"Hlavnéú a knižnice Dia"
 !define PYTHON_SECTION_TITLE              "Závnýl Python"
-!define PYTHON_SECTION_DESCRIPTION              "Podpora skriptovacieho jazyka Python 2.2. Nevyberajte túo¾bu, ak nie je Python nainštalovanýdefine PYTHON_SECTION_DESCRIPTION              "Podpora skriptovacieho jazyka Python 2.3. Nevyberajte túo¾bu, ak nie je Python nainštalovaný ; Installer Finish Page
 !define DIA_FINISH_VISIT_WEB_SITE		"Navštíe webstráu Dia pre Windows"

Modified: trunk/installer/win32/locale/slovenian.nsh
==============================================================================
--- trunk/installer/win32/locale/slovenian.nsh	(original)
+++ trunk/installer/win32/locale/slovenian.nsh	Mon Feb 16 20:41:05 2009
@@ -27,7 +27,7 @@
 !define  TRANSLATIONS_SECTION_DESCRIPTION  "Prevodi uporabniškega vmesnika programa Dia"
 !define  DIA_SECTION_DESCRIPTION	"Diashapes - datoteke in dll-ji"
 !define  PYTHON_SECTION_TITLE		"Vtièk za Python"
-!define  PYTHON_SECTION_DESCRIPTION	"Podpora za skriptni jezik Python 2.2. Ne izberite, ènimate namešèega okolja Python."
+!define  PYTHON_SECTION_DESCRIPTION	"Podpora za skriptni jezik Python 2.3. Ne izberite, ènimate namešèega okolja Python."
 
 ; Installer Finish Page
 !define  DIA_FINISH_VISIT_WEB_SITE	"Obišèe spletno stran Dia for Windows"

Modified: trunk/makefile.msc
==============================================================================
--- trunk/makefile.msc	(original)
+++ trunk/makefile.msc	Mon Feb 16 20:41:05 2009
@@ -5,6 +5,7 @@
 	build\win32\
 	build\win32\bin \
 	build\win32\bin\dia.exe \
+	build\win32\bin\dia-app.dll \
 	build\win32\bin\libdia.dll \
 	build\win32\bin\libart_lgpl_22.dll \
 #	build\win32\bin\libfontconfig-1.dll \
@@ -99,6 +100,9 @@
 
 build\win32\bin\dia.exe: build\win32\bin app\dia.exe
 	copy app\dia.exe build\win32\bin\dia.exe
+
+build\win32\bin\dia-app.dll: build\win32\bin app\dia-app.dll
+	copy app\dia.exe build\win32\bin\dia-app.dll
 	
 build\win32\bin\libart_lgpl_22.dll: build\win32\bin ..\bin\libart_lgpl_22.dll
 	copy ..\bin\libart_lgpl_22.dll build\win32\bin
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]