planner r920 - in trunk: . installer

[mvdpot svn gnome org]

Author: mvdpot
Date: Fri Jul 18 20:51:22 2008
New Revision: 920
URL: http://svn.gnome.org/viewvc/planner?rev=920&view=rev

Log:
2008-07-18  Maurice van der Pot  <griffon26 kfk4ever com>

	* Makefile.win32:
	* installer/planner-installer.nsi:
	Fixed paths to executable in installer and included GTK+ translations.
	Thanks to Massimiliano Franco for bringing these problems to my attention.



Modified:
   trunk/ChangeLog
   trunk/Makefile.win32
   trunk/installer/planner-installer.nsi

Modified: trunk/Makefile.win32
==============================================================================
--- trunk/Makefile.win32	(original)
+++ trunk/Makefile.win32	Fri Jul 18 20:51:22 2008
@@ -3,6 +3,7 @@
 #
 
 SUBDIRS=libplanner src po
+INSTALLERTMP = installer/tmp
 
 VERSION := `sed <configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'`
 
@@ -44,6 +45,7 @@
 
 clean-am:
 	rm -f config.h
+	rm -rf $(INSTALLERTMP)
 
 DTD = \
 	mrproject-0.5.1.dtd		\
@@ -125,7 +127,6 @@
 	  rm -f $$dest/$$file; \
 	done
 
-INSTALLERTMP = installer/tmp
 GTK_BINFILES = \
 	freetype6.dll			\
 	iconv.dll			\
@@ -174,17 +175,23 @@
 
 createinstaller:
 	DESTDIR=$$(pwd)/$(INSTALLERTMP) $(MAKE) -f Makefile.win32 install
-	LOADERSPATH=`grep "loaders/libpixbufloader" $(PREFIX)/etc/gtk-2.0/gdk-pixbuf.loaders|head -n1|sed -e 's#.*/\(lib/gtk-2.0/[^/]*/loaders\)/.*#\1#'`; \
+	@LOADERSPATH=`grep "loaders/libpixbufloader" $(PREFIX)/etc/gtk-2.0/gdk-pixbuf.loaders|head -n1|sed -e 's#.*/\(lib/gtk-2.0/[^/]*/loaders\)/.*#\1#'`; \
+	GTK_TRANSLATIONS=`echo $(INSTALLERTMP)/planner/share/locale/*|sed -e "s#$(INSTALLERTMP)/planner##g"`; \
 	GTK_FILES="/etc/gtk-2.0/gdk-pixbuf.loaders \
 	         /etc/gtk-2.0/gtkrc \
 	         /lib/libgnomeprint \
 	         /share/libgnomeprint \
-	         /share/icons/gnome \
+	         $${GTK_TRANSLATIONS} \
 	         $(addprefix /bin/,$(GTK_BINFILES)) \
 	         $(addprefix /share/icons/gnome/,$(GTK_ICONFILES)) \
-	         $${LOADERSPATH}/*.dll"; \
+	         $${LOADERSPATH}"; \
 	mkdir -p $(INSTALLERTMP)/planner; \
 	for file in $${GTK_FILES}; do \
+		echo "Copying $(PREFIX)/$${file}..."; \
+		if [ ! -e $(PREFIX)/$${file} ]; then \
+			echo "Failed to locate '$(PREFIX)/$${file}' while gathering files for installer!"; \
+			exit -1; \
+		fi; \
 		mkdir -p $(INSTALLERTMP)/planner/$$(dirname $${file}); \
 		cp -r $(PREFIX)/$${file} $(INSTALLERTMP)/planner/$$(dirname $${file})/; \
 	done

Modified: trunk/installer/planner-installer.nsi
==============================================================================
--- trunk/installer/planner-installer.nsi	(original)
+++ trunk/installer/planner-installer.nsi	Fri Jul 18 20:51:22 2008
@@ -59,7 +59,7 @@
   !define MUI_ABORTWARNING
 
   ;Finish Page config
-  !define MUI_FINISHPAGE_RUN			"$INSTDIR\planner.exe"
+  !define MUI_FINISHPAGE_RUN			"$INSTDIR\bin\planner.exe"
   !define MUI_FINISHPAGE_RUN_NOTCHECKED
   !define MUI_FINISHPAGE_LINK			$(PLANNER_FINISH_VISIT_WEB_SITE)
   !define MUI_FINISHPAGE_LINK_LOCATION          "http://live.gnome.org/Planner/";
@@ -210,7 +210,7 @@
   StrCmp $R0 "HKLM" planner_hklm planner_hkcu
 
   planner_hklm:
-    WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "" "$INSTDIR\planner.exe"
+    WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "" "$INSTDIR\bin\planner.exe"
     WriteRegStr HKLM ${PLANNER_REG_KEY} "" "$INSTDIR"
     WriteRegStr HKLM ${PLANNER_REG_KEY} "Version" "${PLANNER_VERSION}"
     WriteRegStr HKLM "${PLANNER_UNINSTALL_KEY}" "DisplayName" $(PLANNER_UNINSTALL_DESC)
@@ -233,8 +233,8 @@
     File /r /x locale ${STAGING_DIR}\*.*
 
     CreateDirectory "$SMPROGRAMS\Planner"
-    CreateShortCut "$SMPROGRAMS\Planner\Planner.lnk" "$INSTDIR\planner.exe"
-    CreateShortCut "$DESKTOP\Planner.lnk" "$INSTDIR\planner.exe"
+    CreateShortCut "$SMPROGRAMS\Planner\Planner.lnk" "$INSTDIR\bin\planner.exe"
+    CreateShortCut "$DESKTOP\Planner.lnk" "$INSTDIR\bin\planner.exe"
     SetOutPath "$INSTDIR"
 
     ; If we don't have install rights.. we're done
@@ -253,9 +253,9 @@
 
     ; If we previously had planner setup to run on startup, make it do so again
     StrCmp $STARTUP_RUN_KEY "HKCU" +1 +2
-    WriteRegStr HKCU "${PLANNER_STARTUP_RUN_KEY}" "Planner" "$INSTDIR\planner.exe"
+    WriteRegStr HKCU "${PLANNER_STARTUP_RUN_KEY}" "Planner" "$INSTDIR\bin\planner.exe"
     StrCmp $STARTUP_RUN_KEY "HKLM" +1 +2
-    WriteRegStr HKLM "${PLANNER_STARTUP_RUN_KEY}" "Planner" "$INSTDIR\planner.exe"
+    WriteRegStr HKLM "${PLANNER_STARTUP_RUN_KEY}" "Planner" "$INSTDIR\bin\planner.exe"
 
   done:
 SectionEnd ; end of default Planner section