GNOME.org
 

planner r943 - in trunk: . installer installer/languages src

Author: mvdpot
Date: Mon Dec 29 21:44:34 2008
New Revision: 943
URL: http://svn.gnome.org/viewvc/planner?rev=943&view=rev

Log:
2008-12-29  Maurice van der Pot  <griffon26 kfk4ever com>

	* README: Brought up to date.

	* Makefile.win32: 
	* installer/english.nsh: 
	* installer/langmacros.nsh:
	* installer/planner-installer.nsi:
	* src/Makefile.win32: 
	- Moved installer languages to separate directory.
	- Removed traces of libgnomeprint
	- Decreased verbosity of Windows installer build



Added:
   trunk/installer/languages/
   trunk/installer/languages/ChangeLog
   trunk/installer/languages/dutch.nsh
   trunk/installer/languages/english.nsh   (contents, props changed)
      - copied, changed from r942, /trunk/installer/english.nsh
Removed:
   trunk/installer/english.nsh
Modified:
   trunk/ChangeLog
   trunk/Makefile.win32
   trunk/README
   trunk/installer/langmacros.nsh
   trunk/installer/planner-installer.nsi
   trunk/src/Makefile.win32

Modified: trunk/Makefile.win32
==============================================================================
--- trunk/Makefile.win32	(original)
+++ trunk/Makefile.win32	Mon Dec 29 21:44:34 2008
@@ -145,8 +145,6 @@
 	libglib-2.0-0.dll		\
 	libgmodule-2.0-0.dll		\
 	libgnomecanvas-2-0.dll		\
-	libgnomeprint-2-2-0.dll		\
-	libgnomeprintui-2-2-0.dll	\
 	libgobject-2.0-0.dll		\
 	libgtk-win32-2.0-0.dll		\
 	libpango-1.0-0.dll		\
@@ -193,9 +191,6 @@
 	         $${LOADERSPATH} \
 	         /etc/gtk-2.0/gtkrc \
 	         /etc/fonts \
-	         /lib/libgnomeprint \
-	         /share/libgnomeprint \
-	         /share/libgnomeprintui \
 	         $(addprefix /bin/,$(GTK_BINFILES)) \
 	         $${LIBPNG} \
 	         $(addprefix /share/icons/gnome/,$(GTK_ICONFILES)) \
@@ -210,7 +205,7 @@
 		mkdir -p $(INSTALLERTMP)/planner/$$(dirname $${file}); \
 		cp -r $(PREFIX)/$${file} $(INSTALLERTMP)/planner/$$(dirname $${file})/; \
 	done
-	/c/Program\ Files/NSIS/makensis -DPLANNER_VERSION=$(VERSION) -DSTAGING_DIR=.\\tmp\\planner installer/planner-installer.nsi
+	/c/Program\ Files/NSIS/makensis -v3 -DPLANNER_VERSION=$(VERSION) -DSTAGING_DIR=.\\tmp\\planner installer/planner-installer.nsi
 
 install: install-recursive
 install-am:

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Mon Dec 29 21:44:34 2008
@@ -22,20 +22,27 @@
     * Calendars with working/non-working time
     * Gantt chart and resource usage overview
     * HTML export of project plans
-    * Translated to nearly 20 languages, e.g. French, Spanish and Swedish 
+    * Translated to over 50 languages
 
 
 Available Platforms
 ===================
 
-Planner is available on Linux/UNIX platforms, and included in most Linux distributions. It's also available in a (currently experimental) Windows version at http://winplanner.sourceforge.net/
+Planner is available on Linux/UNIX platforms, and included in most Linux
+distributions. It's also available in a Windows version at
+http://live.gnome.org/Planner/Downloads.
 
 Resources
 =========
 
-Please check out Planner FAQ which is a list of frequently asked questions before posting a question to any of the mailing lists. You can read the archives and subscribe to the user and mailing lists at Imendio lists (http://lists.imendio.com/mailman/listinfo). Note that you must be subscribed to the list to be able to post to it.
+Please check out Planner FAQ which is a list of frequently asked questions
+before posting a question to any of the mailing lists. You can read the
+archives and subscribe to the user and developer mailing lists at the Gnome
+mailing lists page (http://mail.gnome.org/mailman/listinfo). 
+Note that you must be subscribed to the list to be able to post to it.
 
-If you find a bug or missing feature, you can let us know by filing a report in the GNOME Bugzilla (http://bugzilla.gnome.org/enter_bug.cgi?product=planner). 
+If you find a bug or missing feature, you can let us know by filing a report in
+the GNOME Bugzilla (http://bugzilla.gnome.org/enter_bug.cgi?product=planner). 
 
 See http://live.gnome.org/Planner for more information.
 
@@ -54,7 +61,6 @@
 LIBGNOMECANVAS 2.10.0
 LIBGNOMEUI 2.10.0
 LIBGLADE 2.3.0
-LIBGNOMEPRINTUI 2.10.0
 GNOME_VFS 2.10.0
 GCONF 2.10.0
 LIBXML 2.6.27

Modified: trunk/installer/langmacros.nsh
==============================================================================
--- trunk/installer/langmacros.nsh	(original)
+++ trunk/installer/langmacros.nsh	Mon Dec 29 21:44:34 2008
@@ -2,11 +2,17 @@
 ;; Windows Planner NSIS installer language macros
 ;;
 
-!macro PLANNER_MACRO_DEFAULT_STRING LABEL VALUE
+!macro PLANNER_MACRO_ADD_LANGUAGE LANGUAGE
+  !ifndef INSERT_DEFAULT
+    !insertmacro MUI_LANGUAGE ${LANGUAGE}
+  !endif
+!macroend
+
+!macro PLANNER_MACRO_DEFINE_STRING LABEL VALUE
   !ifndef "${LABEL}"
     !define "${LABEL}" "${VALUE}"
     !ifdef INSERT_DEFAULT
-      !warning "${LANG} lang file mising ${LABEL}, using default.."
+      !warning "${LANG} lang file missing ${LABEL}, using default.."
     !endif
   !endif
 !macroend

Added: trunk/installer/languages/dutch.nsh
==============================================================================
--- (empty file)
+++ trunk/installer/languages/dutch.nsh	Mon Dec 29 21:44:34 2008
@@ -0,0 +1,36 @@
+;;
+;;  Language strings for the Windows Planner NSIS installer.
+;;  Windows Code page: 1252
+;;
+
+; Make sure to update the PLANNER_MACRO_LANGUAGEFILE_END macro in
+; langmacros.nsh when adding new strings to this file
+
+!insertmacro PLANNER_MACRO_ADD_LANGUAGE "Dutch"
+
+; Startup Checks
+!insertmacro PLANNER_MACRO_DEFINE_STRING INSTALLER_IS_RUNNING			"Er is al een installatie actief."
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_IS_RUNNING			"Planner wordt op dit moment uitgevoerd. Sluit Planner af en start de installatie opnieuw."
+!insertmacro PLANNER_MACRO_DEFINE_STRING GTK_INSTALLER_NEEDED			"De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_MIN_VERSION} of nieuwer van de GTK+ runtime-omgeving."
+
+; License Page
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_LICENSE_BUTTON			"Volgende >"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_LICENSE_BOTTOM_TEXT		"$(^Name) wordt uitgegeven onder de GPL licentie. Deze licentie wordt hier slechts ter informatie aangeboden. $_CLICK"
+
+; Components Page
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_SECTION_TITLE			"Planner (vereist)"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_TRANSLATIONS_SECTION_TITLE	"Vertalingen"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_SECTION_DESCRIPTION		"Planner hoofdbestanden en dlls"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_TRANSLATIONS_SECTION_DESCRIPTION	"Additionele talen"
+
+; Installer Finish Page
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_FINISH_VISIT_WEB_SITE		"Bezoek de Planner webpagina"
+
+; Planner Section Prompts and Texts
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_UNINSTALL_DESC			"Planner (alleen verwijderen)"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_PROMPT_WIPEOUT			"Uw oude Planner map staat op het punt verwijderd te worden. Wilt u verder gaan?$\r$\rLet op: Eventuele niet-standaard plugins die u heeft geïtalleerd zullen verwijderd worden.$\rPlanner gebruikersinstellingen worden hierdoor niet beïloed."
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_PROMPT_DIR_EXISTS		"De installatiemap die u heeft geselecteerd bestaat al. De inhoud$\rvan deze map zal verwijderd worden. Wilt u verder gaan?"
+
+; Uninstall Section Prompts
+!insertmacro PLANNER_MACRO_DEFINE_STRING un.PLANNER_UNINSTALL_ERROR_1		"Het verwijderingsprogramma voor Planner kon geen register-ingangen voor Planner vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma geïtalleerd."
+!insertmacro PLANNER_MACRO_DEFINE_STRING un.PLANNER_UNINSTALL_ERROR_2		"U mag dit programma niet verwijderen."

Copied: trunk/installer/languages/english.nsh (from r942, /trunk/installer/english.nsh)
==============================================================================
--- /trunk/installer/english.nsh	(original)
+++ trunk/installer/languages/english.nsh	Mon Dec 29 21:44:34 2008
@@ -1,39 +1,36 @@
 ;;
-;;  english.nsh
-;;
-;;  Default language strings for the Windows Planner NSIS installer.
+;;  Language strings for the Windows Planner NSIS installer.
 ;;  Windows Code page: 1252
 ;;
-;;  Version 3
-;;  Note: If translating this file, replace "!insertmacro PLANNER_MACRO_DEFAULT_STRING"
-;;  with "!define".
 
 ; Make sure to update the PLANNER_MACRO_LANGUAGEFILE_END macro in
-; langmacros.nsh when updating this file
+; langmacros.nsh when adding new strings to this file
+
+!insertmacro PLANNER_MACRO_ADD_LANGUAGE "English"
 
 ; Startup Checks
-!insertmacro PLANNER_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING			"The installer is already running."
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_IS_RUNNING			"An instance of Planner is currently running. Exit Planner and then try again."
-!insertmacro PLANNER_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED			"The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_VERSION} or higher of the GTK+ runtime"
+!insertmacro PLANNER_MACRO_DEFINE_STRING INSTALLER_IS_RUNNING			"The installer is already running."
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_IS_RUNNING			"An instance of Planner is currently running. Exit Planner and then try again."
+!insertmacro PLANNER_MACRO_DEFINE_STRING GTK_INSTALLER_NEEDED			"The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_VERSION} or higher of the GTK+ runtime"
 
 ; License Page
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_LICENSE_BUTTON			"Next >"
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_LICENSE_BOTTOM_TEXT		"$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_LICENSE_BUTTON			"Accept >"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_LICENSE_BOTTOM_TEXT		"$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
 
 ; Components Page
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_SECTION_TITLE			"Planner (required)"
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_TRANSLATIONS_SECTION_TITLE	"Translations"
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_SECTION_DESCRIPTION		"Core Planner files and dlls"
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_TRANSLATIONS_SECTION_DESCRIPTION	"Additional languages"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_SECTION_TITLE			"Planner (required)"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_TRANSLATIONS_SECTION_TITLE	"Translations"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_SECTION_DESCRIPTION		"Core Planner files and dlls"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_TRANSLATIONS_SECTION_DESCRIPTION	"Additional languages"
 
 ; Installer Finish Page
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_FINISH_VISIT_WEB_SITE		"Visit the Windows Planner Web Page"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_FINISH_VISIT_WEB_SITE		"Visit the Windows Planner Web Page"
 
 ; Planner Section Prompts and Texts
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_UNINSTALL_DESC			"Planner (remove only)"
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_PROMPT_WIPEOUT			"Your old Planner directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rPlanner user settings will not be affected."
-!insertmacro PLANNER_MACRO_DEFAULT_STRING PLANNER_PROMPT_DIR_EXISTS		"The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_UNINSTALL_DESC			"Planner (remove only)"
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_PROMPT_WIPEOUT			"Your old Planner directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rPlanner user settings will not be affected."
+!insertmacro PLANNER_MACRO_DEFINE_STRING PLANNER_PROMPT_DIR_EXISTS		"The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
 
 ; Uninstall Section Prompts
-!insertmacro PLANNER_MACRO_DEFAULT_STRING un.PLANNER_UNINSTALL_ERROR_1		"The uninstaller could not find registry entries for Planner.$\rIt is likely that another user installed this application."
-!insertmacro PLANNER_MACRO_DEFAULT_STRING un.PLANNER_UNINSTALL_ERROR_2		"You do not have permission to uninstall this application."
+!insertmacro PLANNER_MACRO_DEFINE_STRING un.PLANNER_UNINSTALL_ERROR_1		"The uninstaller could not find registry entries for Planner.$\rIt is likely that another user installed this application."
+!insertmacro PLANNER_MACRO_DEFINE_STRING un.PLANNER_UNINSTALL_ERROR_2		"You do not have permission to uninstall this application."

Modified: trunk/installer/planner-installer.nsi
==============================================================================
--- trunk/installer/planner-installer.nsi	(original)
+++ trunk/installer/planner-installer.nsi	Mon Dec 29 21:44:34 2008
@@ -9,7 +9,6 @@
 ;Global Variables
 Var name
 Var LANG_IS_SET
-Var ISSILENT
 Var STARTUP_RUN_KEY
 
 ;--------------------------------
@@ -83,22 +82,19 @@
   !insertmacro MUI_UNPAGE_FINISH
 
 ;--------------------------------
-;Languages
+;Languages & Translations
  
   ;; English goes first because its the default. The rest are
   ;; in alphabetical order (at least the strings actually displayed
   ;; will be).
 
-  !insertmacro MUI_LANGUAGE "English"
-
-;--------------------------------
-;Translations
-
-  !define PLANNER_DEFAULT_LANGFILE ".\english.nsh"
+  !define PLANNER_DEFAULT_LANGFILE "languages\english.nsh"
 
   !include ".\langmacros.nsh"
 
-  !insertmacro PLANNER_MACRO_INCLUDE_LANGFILE "ENGLISH"		".\english.nsh"
+  !insertmacro PLANNER_MACRO_INCLUDE_LANGFILE "ENGLISH"		"languages\english.nsh"
+  !insertmacro PLANNER_MACRO_INCLUDE_LANGFILE "DUTCH"		"languages\dutch.nsh"
+
 ;--------------------------------
 ;Reserve Files
   ; Only need this if using bzip2 compression
@@ -528,26 +524,18 @@
     Abort
   Call RunCheck
   StrCpy $name "Planner ${PLANNER_VERSION}"
-  StrCpy $ISSILENT "/NOUI"
-
-  ; GTK installer has two silent states.. one with Message boxes, one without
-  ; If planner installer was run silently, we want to supress gtk installer msg boxes.
-  IfSilent 0 set_gtk_normal
-      StrCpy $ISSILENT "/S"
-  set_gtk_normal:
-
   Call ParseParameters
 
   ; Select Language
   IntCmp $LANG_IS_SET 1 skip_lang
     ; Display Language selection dialog
     !insertmacro MUI_LANGDLL_DISPLAY
-    skip_lang:
+  skip_lang:
 
   ; If install path was set on the command, use it.
   StrCmp $INSTDIR "" 0 instdir_done
 
-  ;  If planner is currently intalled, we should default to where it is currently installed
+  ;  If planner is currently installed, we should default to where it is currently installed
   ClearErrors
   ReadRegStr $INSTDIR HKCU "${PLANNER_REG_KEY}" ""
   IfErrors +2

Modified: trunk/src/Makefile.win32
==============================================================================
--- trunk/src/Makefile.win32	(original)
+++ trunk/src/Makefile.win32	Mon Dec 29 21:44:34 2008
@@ -12,7 +12,7 @@
 
 DLL_LD_FLAGS += -mms-bitfields -mno-cygwin -Wl,--enable-auto-image-base --no-undefined -Wl,--export-all -mwin32
 
-DEPS = libgnomecanvas-2.0,libglade-2.0,libgnomeprint-2.2,libgnomeprintui-2.2
+DEPS = libgnomecanvas-2.0,libglade-2.0
 
 ifdef HAVE_GDA
 DEPS := $(DEPS),libgda
@@ -157,7 +157,7 @@
 ## LIBRARIES
 ##
 
-LIBS = -L$(PREFIX)/lib -leggrecent `pkg-config --libs libgnomecanvas-2.0,libglade-2.0,libgnomeprint-2.2,libgnomeprintui-2.2` -lplanner-1 -L../libplanner
+LIBS = -L$(PREFIX)/lib -leggrecent `pkg-config --libs libgnomecanvas-2.0,libglade-2.0` -lplanner-1 -L../libplanner
 
 ##
 ## RULES
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]