gnumeric r16432 - in trunk: plugins/excel tools/win32 tools/win32/patches

From: jody svn gnome org
To: svn-commits-list gnome org
Subject: gnumeric r16432 - in trunk: plugins/excel tools/win32 tools/win32/patches
Date: Sat, 1 Mar 2008 18:42:19 +0000 (GMT)
Author: jody
Date: Sat Mar  1 18:42:18 2008
New Revision: 16432
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16432&view=rev

Log:
2008-03-01  Jody Goldberg <jody gnome org>

	* src/style.c : drop use of pangoft2 as a hard coded fallback use
	  pangocairo instead.

	* src/wbc-gtk-actions.c (cb_help_docs) : add a warning if help viewer
	  fails.


Removed:
   trunk/tools/win32/patches/gettext-dup-labels.patch
Modified:
   trunk/plugins/excel/plugin.xml.in
   trunk/tools/win32/gnumeric.nsi.in
   trunk/tools/win32/jhbuildrc
   trunk/tools/win32/moduleset

Modified: trunk/plugins/excel/plugin.xml.in
==============================================================================
--- trunk/plugins/excel/plugin.xml.in	(original)
+++ trunk/plugins/excel/plugin.xml.in	Sat Mar  1 18:42:18 2008
@@ -78,7 +78,6 @@
 				<suffix>xlsb</suffix>
 				<suffix>xlsm</suffix>
 				<suffix>xltm</suffix>
-				<suffix>xltx</suffix>
 			</suffixes>
 <!--
 			<mime-types>

Modified: trunk/tools/win32/gnumeric.nsi.in
==============================================================================
--- trunk/tools/win32/gnumeric.nsi.in	(original)
+++ trunk/tools/win32/gnumeric.nsi.in	Sat Mar  1 18:42:18 2008
@@ -12,6 +12,8 @@
 !define GNM_VERSION_FULL	"${GNM_VERSION}-${GNM_VERSION_TAG}"
 !define GNM_UNINST_KEY		"Software\Microsoft\Windows\CurrentVersion\Uninstall\${GNM_NAME}"
 !define GNM_STARTMENU_REG_VAL	"NSIS:StartMenuDir"
+!define GNM_HELP_DIR		"share\gnumeric\${GNM_VERSION}\doc\C"
+!define GNM_HELP		"${GNM_HELP_DIR}\gnumeric.chm"
 
 !define GOFFICE_VERSION		"@GOFFICE_VERSION@"
 
@@ -36,9 +38,11 @@
 !define MUI_WELCOMEPAGE_TEXT "You can always get the newest version from:\r\n\r\nhttp://www.gnumeric.org/\r\n\r\nThis wizard will guide you through the installation of $(^NameDA).\r\n\r\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.\r\n\r\n$_CLICK"
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "gpl.txt"
+
 Page custom CustomPageShortcut
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
+
 var ICONS_GROUP
 !define MUI_STARTMENUPAGE_NODISABLE
 !define MUI_STARTMENUPAGE_DEFAULTFOLDER "Gnumeric"
@@ -52,6 +56,9 @@
 !insertmacro MUI_UNPAGE_INSTFILES
 !insertmacro MUI_LANGUAGE "English"
 
+InstType "Full"
+InstType "Minimal"
+
 ; MUI end ------
 
 Var SHORTINSTDIR
@@ -60,199 +67,323 @@
 
 Name "${GNM_LONGNAME} ${GNM_VERSION_FULL}"
 OutFile			"gnumeric-${GNM_VERSION_FULL}.exe"
-;Icon			"gnm-installer.ico"
-InstallDir		"C:\Program Files\${GNM_NAME}\${GNM_VERSION}"
-InstallDirRegKey	HKLM "Software\GTK\2.0\${GNM_NAME}" "Path"
+Icon			"share\pixmaps\win32-gnumeric.ico"
+InstallDir		"C:\Program Files\${GNM_NAME}"
+InstallDirRegKey	HKLM "Software\GNOME\${GNM_NAME}" "Path"
 ShowInstDetails		hide
 ShowUnInstDetails	show
 
-Section "Gnumeric (required)" SEC03
-  SectionIn RO
-  SetOutPath "$INSTDIR"
-
-  File /r /x "libpython*.dll" "bin\*"
-  File /r etc lib share
-
-  WriteRegStr SHCTX "Software\GTK\2.0\${GNM_NAME}" "Path" "$INSTDIR"
-  WriteRegStr SHCTX "Software\GTK\2.0\${GNM_NAME}" "Version" "$GNM_VERSION_FULL"
-
-  GetFullPathName /SHORT $SHORTINSTDIR $INSTDIR
-  StrCmp $ISADMIN "1" 0 +5
-  ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-dialogs.reg"
-  ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-general.reg"
-  ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-plugins.reg"
-  Goto +4
-  ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-dialogs.hkcu.reg"
-  ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-general.hkcu.reg"
-  ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-plugins.hkcu.reg"
-
-  ;ExecWait "$SHORTINSTDIR\gtk-update-icon-cache.exe $SHORTINSTDIR\share\icons\gnome"
-  ;ExecWait "$SHORTINSTDIR\gtk-update-icon-cache.exe $SHORTINSTDIR\share\icons\hicolor"
-
-  !define Index "Line${__LINE__}"
-  ReadRegStr $1 HKCR ".gnumeric" ""
-  StrCmp $1 "" "${Index}-NoBackup1"
-    StrCmp $1 "Gnumeric.XML" "${Index}-NoBackup1"
-    WriteRegStr HKCR ".gnumeric" "Old Default" $1
-"${Index}-NoBackup1:"
-  ReadRegStr $1 HKCR ".gnumeric" "Content Type"
-  StrCmp $1 "" "${Index}-NoBackup2"
-    StrCmp $1 "application/x-gnumeric" "${Index}-NoBackup2"
-    WriteRegStr HKCR ".gnumeric" "Old Content Type" $1
-"${Index}-NoBackup2:"
-  WriteRegStr HKCR ".gnumeric" "" "Gnumeric.XML"
-  WriteRegStr HKCR ".gnumeric" "Content Type" "application/x-gnumeric"
-  ReadRegStr $0 HKCR "Gnumeric.XML" ""
-  StrCmp $0 "" 0 "${Index}-Skip"
-	WriteRegStr HKCR "Gnumeric.XML" "" "Gnumeric XML File"
-	WriteRegStr HKCR "Gnumeric.XML\shell" "" "Open"
-	WriteRegStr HKCR "Gnumeric.XML\DefaultIcon" "" "$INSTDIR\gnumeric.exe,0"
-"${Index}-Skip:"
-  WriteRegStr HKCR "Gnumeric.XML\shell\Open\command" "" '$INSTDIR\gnumeric.exe "%1"'
-  !undef Index
-SectionEnd
-
-;Section Translations
-;  File "*\*\*\*\gnumeric.mo" "*\*\*\*\gnumeric-functions.mo"
-;  File "*\*\*\*\goffice-${GOFFICE_VERSION}.mo"
-;SectionEnd
+!define GNM_ROOT	"$INSTDIR\${GNM_VERSION}"
+
+Section "Gnumeric (required)" SEC01
+    SectionIn 1 2 RO
+
+    SetOutPath "${GNM_ROOT}\bin"
+    File /x "libpython*.dll" "bin\*.dll"
+    File "bin\gnumeric.exe"
+    File "bin\ssconvert.exe"
+    File "bin\gsf.exe"
+    File "bin\gtk-update-icon-cache.exe"
+    File "bin\gdk-pixbuf-query-loaders.exe"
+
+    # required for g_spawn_*
+    File "bin\gspawn-win32-helper-console.exe"
+    File "bin\gspawn-win32-helper.exe"
+
+    # helpful smoke test
+    File "bin\gtk-demo.exe"
+
+    SetOutPath "${GNM_ROOT}"
+    File /r etc
+    File /r /x "*.a" /x "*.la" /x "*.lib" /x "*.def" /x "pkgconfig" /x "include" lib
+
+    SetOutPath "${GNM_ROOT}\share"
+    File /r "share\themes"
+    File /r "share\goffice"
+    File /r /x C "share\gnumeric"
+    File /r "share\libthai"
+    File /r "share\libgda-3.0"
+    File /r /x "demo" "share\gnome-db-3.0"
+    File /r "share\pixmaps"
+
+    SetOutPath "${GNM_ROOT}\${GNM_HELP_DIR}"
+    File "${GNM_HELP}"
+
+    WriteRegStr SHCTX "Software\GNOME\${GNM_NAME}" "Path" "${GNM_ROOT}\bin"
+    WriteRegStr SHCTX "Software\GNOME\${GNM_NAME}" "Version" "${GNM_VERSION_FULL}"
+
+    GetFullPathName /SHORT $SHORTINSTDIR ${GNM_ROOT}
+    StrCmp $ISADMIN "1" 0 +5
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-dialogs.reg"
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-general.reg"
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-plugins.reg"
+    Goto +4
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-dialogs.hkcu.reg"
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-general.hkcu.reg"
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-plugins.hkcu.reg"
+
+    ;ExecWait "${GNM_ROOT}\bin\gdk-pixbuf-query-loaders.exe >${GNM_ROOT}\etc\gtk-2.0\gdk-pixbuf.loaders"
+    ;ExecWait "${GNM_ROOT}\gtk-update-icon-cache.exe ${GNM_ROOT}\share\icons\gnome"
+    ;ExecWait "${GNM_ROOT}\gtk-update-icon-cache.exe ${GNM_ROOT}\share\icons\hicolor"
+
+    WriteRegStr HKCR "GNOME.Gnumeric"			"" "Gnumeric Spreadsheet"
+    WriteRegStr HKCR "GNOME.Gnumeric\shell"		"" "Open"
+    WriteRegStr HKCR "GNOME.Gnumeric\DefaultIcon"		"" "${GNM_ROOT}\bin\gnumeric.exe,0"
+    WriteRegStr HKCR "GNOME.Gnumeric\shell\Open\command"	"" '${GNM_ROOT}\bin\gnumeric.exe "%1"'
+SectionEnd
+
+#############################################################################
+
+SectionGroup "File Handlers"
+Section "Gnumeric (.gnumeric)"
+    SectionIn 1 2
+    WriteRegStr HKCR ".gnumeric" ""		"GNOME.Gnumeric"
+    WriteRegStr HKCR ".gnumeric" "Content Type" "application/x-gnumeric"
+SectionEnd
+
+Section "MS Excel (tm)"
+    WriteRegStr HKCR ".xls" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".xls" "Content Type"	"application/vnd.ms-excel"
+
+    WriteRegStr HKCR ".xlw" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".xlw" "Content Type"	"application/vnd.ms-excel"
+
+    WriteRegStr HKCR ".xlt" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".xlt" "Content Type"	"application/vnd.ms-excel"
+
+    WriteRegStr HKCR ".xlsx" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".xlsx" "Content Type"	"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+    WriteRegStr HKCR ".xltx" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".xltx" "Content Type"	"application/vnd.openxmlformats-officedocument.spreadsheetml.template"
+SectionEnd
+Section "OpenOffice.org ODF"
+    WriteRegStr HKCR ".ods" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".ods" "Content Type"	"vnd.oasis.opendocument.spreadsheet"
+    WriteRegStr HKCR ".odt" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".odt" "Content Type"	"vnd.oasis.opendocument.spreadsheet-template"
+    WriteRegStr HKCR ".sxc" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".sxc" "Content Type"	"application/vnd.sun.xml.calc"
+    WriteRegStr HKCR ".stc" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".stc" "Content Type"	"application/vnd.sun.xml.calc.template"
+SectionEnd
+Section "Lotus 123 (tm)"
+    WriteRegStr HKCR ".wk1" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".wk1" "Content Type"	"application/vnd.lotus-1-2-3"
+    WriteRegStr HKCR ".wk4" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".wk4" "Content Type"	"application/vnd.lotus-1-2-3"
+    WriteRegStr HKCR ".wr1" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".wr1" "Content Type"	"application/vnd.lotus-1-2-3"
+    WriteRegStr HKCR ".wks" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".wks" "Content Type"	"application/vnd.lotus-1-2-3"
+    WriteRegStr HKCR ".123" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".123" "Content Type"	"application/vnd.lotus-1-2-3"
+SectionEnd
+Section "Applix (.as)"
+    WriteRegStr HKCR ".as" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".as" "Content Type"	"application/x-applix-spreadsheet"
+SectionEnd
+Section "Quattro Pro (tm)"
+    WriteRegStr HKCR ".wb1" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".wb1" "Content Type"	"application/x-quattro-pro"
+    WriteRegStr HKCR ".wb2" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".wb2" "Content Type"	"application/x-quattro-pro"
+    WriteRegStr HKCR ".wb3" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".wb3" "Content Type"	"application/x-quattro-pro"
+SectionEnd
+Section "Plan Perfect (tm)"
+    WriteRegStr HKCR ".pln" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".pln" "Content Type"	"application/x-planperfect"
+SectionEnd
+Section "Psiconv"
+    WriteRegStr HKCR ".psisheet" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".psisheet" "Content Type"	"application/x-psiconv"
+SectionEnd
+Section "Data Interchange Format (.dif)"
+    WriteRegStr HKCR ".dif" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".dif" "Content Type"	"application/x-dif-spreadsheet"
+SectionEnd
+Section "Multiplan SYLK"
+    WriteRegStr HKCR ".slk" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".slk" "Content Type"	"application/x-sylk"
+    WriteRegStr HKCR ".sylk" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".sylk" "Content Type"	"application/x-sylk"
+SectionEnd
+Section "GNU Oleo"
+    WriteRegStr HKCR ".oleo" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".oleo" "Content Type"	"application/x-oleo"
+SectionEnd
+Section "Paradox Database (tm)"
+    WriteRegStr HKCR ".px" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".px" "Content Type"	"application/x-paradox-db"
+SectionEnd
+Section "XBase Database (tm)"
+    WriteRegStr HKCR ".dbf" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".dbf" "Content Type"	"application/dbf"
+SectionEnd
+Section "MPS linear and integer programs"
+    WriteRegStr HKCR ".mps" ""			"GNOME.Gnumeric"
+    WriteRegStr HKCR ".mps" "Content Type"	"application/x-mps"
+SectionEnd
+
+SectionGroupEnd
+
+#############################################################################
+
+!macro Locale LOCALE
+Section "${LOCALE} Translation"
+    SectionIn 1
+    SetOutPath "${GNM_ROOT}\share\locale\${LOCALE}\LC_MESSAGES"
+    File "share\locale\${LOCALE}\LC_MESSAGES\gtk20.mo"
+    File "share\locale\${LOCALE}\LC_MESSAGES\glib20.mo"
+    File "share\locale\${LOCALE}\LC_MESSAGES\goffice-${GOFFICE_VERSION}.mo"
+    File "share\locale\${LOCALE}\LC_MESSAGES\gnumeric.mo"
+    File "share\locale\${LOCALE}\LC_MESSAGES\gnumeric-functions.mo"
+SectionEnd
+!macroend
+
+SectionGroup "Translations"
+    !insertmacro Locale "am"
+    !insertmacro Locale "ar"
+    !insertmacro Locale "az"
+    !insertmacro Locale "bg"
+    !insertmacro Locale "ca"
+    !insertmacro Locale "cs"
+    !insertmacro Locale "da"
+    !insertmacro Locale "de"
+    !insertmacro Locale "el"
+    !insertmacro Locale "en_CA"
+    !insertmacro Locale "en_GB"
+    !insertmacro Locale "es"
+    !insertmacro Locale "et"
+    !insertmacro Locale "fi"
+    !insertmacro Locale "fr"
+    !insertmacro Locale "ga"
+    !insertmacro Locale "gl"
+    !insertmacro Locale "he"
+    !insertmacro Locale "hr"
+    !insertmacro Locale "hu"
+    !insertmacro Locale "it"
+    !insertmacro Locale "ja"
+    !insertmacro Locale "ko"
+    !insertmacro Locale "lt"
+    !insertmacro Locale "lv"
+    !insertmacro Locale "ms"
+    !insertmacro Locale "nb"
+    !insertmacro Locale "nl"
+    !insertmacro Locale "nn"
+    !insertmacro Locale "oc"
+    !insertmacro Locale "pl"
+    !insertmacro Locale "pt"
+    !insertmacro Locale "pt_BR"
+    !insertmacro Locale "ro"
+    !insertmacro Locale "ru"
+    !insertmacro Locale "sk"
+    !insertmacro Locale "sr"
+    !insertmacro Locale "sr Latn"
+    !insertmacro Locale "sv"
+    !insertmacro Locale "tr"
+    !insertmacro Locale "uk"
+    !insertmacro Locale "vi"
+    !insertmacro Locale "zh_CN"
+    !insertmacro Locale "zh_TW"
+SectionGroupEnd
+
+#############################################################################
 
 Section -AdditionalIcons
-  CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\${GNM_APPNAME}.lnk" "$INSTDIR\gnumeric.exe"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\${GNM_APPNAME} Help.lnk" "$INSTDIR\share\gnumeric\${GNM_VERSION}\doc\C\gnumeric.chm"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" "$INSTDIR\uninst.exe"
+    SetOutPath "${GNM_ROOT}\bin"
+    CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
+    CreateShortCut  "$SMPROGRAMS\$ICONS_GROUP\${GNM_APPNAME}.lnk"	"${GNM_ROOT}\bin\gnumeric.exe"
+    CreateShortCut  "$SMPROGRAMS\$ICONS_GROUP\${GNM_APPNAME} Help.lnk"	"${GNM_ROOT}\${GNM_HELP}"
+    CreateShortCut  "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"		"${GNM_ROOT}\bin\uninst.exe"
 SectionEnd
 
 Section -Post
-  SetOutPath "$INSTDIR"
+    SetOutPath "$INSTDIR"
+    WriteUninstaller "${GNM_ROOT}\bin\uninst.exe"
 
-  WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr SHCTX "${GNM_UNINST_KEY}" "DisplayName"			"$(^Name)"
-  WriteRegStr SHCTX "${GNM_UNINST_KEY}" "UninstallString"		"$INSTDIR\uninst.exe"
-  WriteRegStr SHCTX "${GNM_UNINST_KEY}" "DisplayVersion"		"${GNM_VERSION_FULL}"
-  WriteRegStr SHCTX "${GNM_UNINST_KEY}" "${GNM_STARTMENU_REG_VAL}"	"$ICONS_GROUP"
-  WriteRegStr SHCTX "${GNM_UNINST_KEY}" "Context" "$ISADMIN"
+    WriteRegStr SHCTX "${GNM_UNINST_KEY}" "DisplayName"			"$(^Name)"
+    WriteRegStr SHCTX "${GNM_UNINST_KEY}" "UninstallString"		"${GNM_ROOT}\bin\uninst.exe"
+    WriteRegStr SHCTX "${GNM_UNINST_KEY}" "DisplayVersion"		"${GNM_VERSION_FULL}"
+    WriteRegStr SHCTX "${GNM_UNINST_KEY}" "${GNM_STARTMENU_REG_VAL}"	"$ICONS_GROUP"
+    WriteRegStr SHCTX "${GNM_UNINST_KEY}" "Context"			"$ISADMIN"
+    WriteRegStr SHCTX "${GNM_UNINST_KEY}" "RootDir"			"$INSTDIR"
 SectionEnd
 
 ; Section descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} ""
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} ""
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
-LangString TEXT_IO_TITLE_OP1 ${LANG_ENGLISH} "Install Option"
+LangString TEXT_IO_TITLE_OP1	${LANG_ENGLISH} "Install Option"
 LangString TEXT_IO_SUBTITLE_OP1 ${LANG_ENGLISH} "You can choose to install ${GNM_NAME} for anyone who uses this computer or only you."
 
 Function CustomPageShortcut
-  ClearErrors
-  UserInfo::GetName
-  IfErrors Win9x
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 not_admin
-Win9x:
-  !insertmacro MUI_HEADER_TEXT "$(TEXT_IO_TITLE_OP1)" "$(TEXT_IO_SUBTITLE_OP1)"
-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "op1.ini"
-  !insertmacro MUI_INSTALLOPTIONS_READ $INI_VALUE "op1.ini" "Field 2" "State"
-  StrCmp $INI_VALUE "1" 0 not_admin
-  StrCpy $ISADMIN "1"
-  SetShellVarContext all
-  Goto done
-not_admin:
-  StrCpy $ISADMIN "0"
-  SetShellVarContext current
-done:
+    ClearErrors
+    UserInfo::GetName
+    IfErrors Win9x
+	Pop $0
+	UserInfo::GetAccountType
+	Pop $1
+	StrCmp $1 "Admin" 0 not_admin
+    Win9x:
+	!insertmacro MUI_HEADER_TEXT			"$(TEXT_IO_TITLE_OP1)" "$(TEXT_IO_SUBTITLE_OP1)"
+	!insertmacro MUI_INSTALLOPTIONS_DISPLAY		"op1.ini"
+	!insertmacro MUI_INSTALLOPTIONS_READ $INI_VALUE "op1.ini" "Field 2" "State"
+	StrCmp $INI_VALUE "1" 0 not_admin
+	StrCpy $ISADMIN "1"
+	SetShellVarContext all
+	Goto done
+    not_admin:
+	StrCpy $ISADMIN "0"
+	SetShellVarContext current
+    done:
 FunctionEnd
 
 Function .onInit
-  ;InitPluginsDir
+	InitPluginsDir
 ;  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "op1.ini"
 ;  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "op3.ini"
 FunctionEnd
 
+Function un.onInit
+    MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+    Abort
+FunctionEnd
 Function un.onUninstSuccess
-  HideWindow
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+    HideWindow
+    MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
 FunctionEnd
+Section Uninstall
+    Push $1
 
-Function un.onInit
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
-  Abort
-FunctionEnd
+    ReadRegStr $INSTDIR SHCTX "${GNM_UNINST_KEY}" "RootDir"
+    SetOutPath "$INSTDIR"
+    RMDir /r /REBOOTOK "${GNM_ROOT}"
 
-Section Uninstall
-  Push $1
+    ReadRegStr $ISADMIN SHCTX "${GNM_UNINST_KEY}" "Context"
+    StrCmp $ISADMIN "1" 0 +2
+	SetShellVarContext all
+
+    ReadRegStr $ICONS_GROUP SHCTX "${GNM_UNINST_KEY}" "${GNM_STARTMENU_REG_VAL}"
+    Delete "$SMPROGRAMS\$ICONS_GROUP\${GNM_APPNAME}.lnk"
+    Delete "$SMPROGRAMS\$ICONS_GROUP\${GNM_APPNAME} Help.lnk"
+    Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
+    RMDir "$SMPROGRAMS\$ICONS_GROUP"
+
+    GetFullPathName /SHORT $SHORTINSTDIR ${GNM_ROOT}
+
+    DeleteRegKey SHCTX "${GNM_UNINST_KEY}"
+
+    ReadRegStr $1 SHCTX "Software\GNOME\${GNM_NAME}" "Path"
+    StrCmp $1 "${GNM_ROOT}" 0 +2
+	DeleteRegValue SHCTX "Software\GNOME\${GNM_NAME}" "Path"
 
-  ReadRegStr $ISADMIN HKLM "${GNM_UNINST_KEY}" "Context"
-  StrCmp $ISADMIN "1" 0 +2
-  SetShellVarContext all
-
-  ReadRegStr $ICONS_GROUP SHCTX "${GNM_UNINST_KEY}" "${GNM_STARTMENU_REG_VAL}"
-  Delete "$INSTDIR\uninst.exe"
-  Delete "$INSTDIR\license.txt"
-
-  Delete "$SMPROGRAMS\$ICONS_GROUP\${GNM_APPNAME}.lnk"
-  Delete "$SMPROGRAMS\$ICONS_GROUP\${GNM_APPNAME} Help.lnk"
-  Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
-  Delete "$SMPROGRAMS\$ICONS_GROUP\Theme Selector.lnk"
-  GetFullPathName /SHORT $SHORTINSTDIR $INSTDIR
-
-  RMDir "$SMPROGRAMS\$ICONS_GROUP"
-
-  RMDir /REBOOTOK "$INSTDIR"
-
-  DeleteRegKey SHCTX "${GNM_UNINST_KEY}"
-
-  ReadRegStr $1 SHCTX "Software\GTK\2.0" "Path"
-  StrCmp $1 "$INSTDIR" 0 +2
-  DeleteRegValue SHCTX "Software\GTK\2.0" "Path"
-
-  ReadRegStr $1 SHCTX "Software\GTK\2.0" "DllPath"
-  StrCmp $1 "$INSTDIR" 0 +2
-  DeleteRegValue SHCTX "Software\GTK\2.0" "DllPath"
-
-  ReadRegStr $1 SHCTX "Software\GTK\2.0" "Version"
-  StrCmp $1 "${GTK_VERSION}" 0 +2
-  DeleteRegValue SHCTX "Software\GTK\2.0" "Version"
-
-  ReadRegStr $1 SHCTX "Software\GTK\2.0" "VendorVersion"
-  StrCmp $1 "${GTK_VENDORVERSION}" 0 +2
-  DeleteRegValue SHCTX "Software\GTK\2.0" "VendorVersion"
-
-  ReadRegStr $1 SHCTX "Software\GTK\2.0\${GNM_NAME}" "Path"
-  StrCmp $1 "$INSTDIR" 0 +2
-  DeleteRegValue SHCTX "Software\GTK\2.0\${GNM_NAME}" "Path"
-
-  DeleteRegKey /ifempty SHCTX "Software\GTK\2.0\${GNM_NAME}"
-  DeleteRegKey /ifempty SHCTX "Software\GTK\2.0"
-  DeleteRegKey /ifempty SHCTX "Software\GTK"
-
-  !define Index "Line${__LINE__}"
-  ReadRegStr $1 HKCR ".gnumeric" ""
-  StrCmp $1 "Gnumeric.XML" 0 "${Index}-NoOwn"
-    ReadRegStr $1 HKCR ".gnumeric" "Old Content Type"
-    StrCmp $1 "" 0 "${Index}-Restore1"
-      DeleteRegValue HKCR ".gnumeric" "Content Type"
-    Goto "${Index}-Next"
-"${Index}-Restore1:"
-      WriteRegStr HKCR ".gnumeric" "Content Type" $1
-      DeleteRegValue HKCR ".gnumeric" "Old Content Type"
-"${Index}-Next:"
-    ReadRegStr $1 HKCR ".gnumeric" "Old Default"
-    StrCmp $1 "" 0 "${Index}-Restore2"
-      DeleteRegKey HKCR ".gnumeric"
-    Goto "${Index}-NoOwn"
-"${Index}-Restore2:"
-      WriteRegStr HKCR ".gnumeric" "" $1
-      DeleteRegValue HKCR ".gnumeric" "Old Default"
-"${Index}-NoOwn:"
-  DeleteRegKey HKCR "Gnumeric.XML"
-  !undef Index
+    DeleteRegKey /ifempty SHCTX "Software\GNOME\${GNM_NAME}"
+    DeleteRegKey /ifempty SHCTX "Software\GNOME"
 
-  SetAutoClose true
+#    SetAutoClose true
 
-  Pop $1
+    Pop $1
 SectionEnd
 

Modified: trunk/tools/win32/jhbuildrc
==============================================================================
--- trunk/tools/win32/jhbuildrc	(original)
+++ trunk/tools/win32/jhbuildrc	Sat Mar  1 18:42:18 2008
@@ -14,13 +14,14 @@
 # checkoutroot: path to download packages elsewhere
 # prefix:       target path to install the compiled binaries
 checkoutroot = os.path.expanduser('~/checkout/')
-prefix = os.path.expanduser("~/target")
+prefix	     = os.path.expanduser("~/target")
 
 #The host value is obtained with the result of executing
 #the config.guess script on any of the packages.
 #This value must be valid for most linux/x86 out there
 os.environ['HOST']	= 'i686-pc-linux-gnuaout'
 os.environ['TARGET']	= 'i586-pc-mingw32msvc'
+os.environ['PKG_CONFIG']= '/usr/bin/pkg-config'
 
 addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'lib', 'pkgconfig'))
 addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
@@ -70,6 +71,7 @@
 autogenargs += ' --enable-all-warnings'
 autogenargs += ' --enable-maintainer-mode'
 autogenargs += ' --enable-explicit-deps=no'
+autogenargs += ' --prefix='+prefix 
 
 for tool in ('AR', 'RANLIB', 'STRIP', 'AS',
 	     'DLLTOOL', 'OBJDUMP', 'NM', 'WINDRES'):
@@ -78,6 +80,7 @@
 #Module specific configure arguments
 module_autogenargs['pcre']    = autogenargs + ' --enable-utf8' + ' --enable-shared'
 module_autogenargs['gettext'] = autogenargs + """ --without-emacs \
+						  --disable-libasprintf \
                                                   --disable-java \
                                                   --disable-native-java \
                                                   --enable-relocatable"""
@@ -89,9 +92,9 @@
 module_autogenargs['glib'] =    autogenargs + """ --enable-explicit-deps=no \
                                                   --cache-file=win32.cache \
                                                   --disable-gtk-doc"""
-module_autogenargs['expat']	= autogenargs
-module_autogenargs['freetype']	= autogenargs
-module_autogenargs['fontconfig']= autogenargs + """ --with-arch=i586-pc-mingw32msvc"""
+#module_autogenargs['expat']	= autogenargs
+#module_autogenargs['freetype']	= autogenargs + """ --enable=shared"""
+#module_autogenargs['fontconfig']= autogenargs + """ --with-arch=i586-pc-mingw32msvc"""
 module_autogenargs['pango']	= autogenargs + """ --disable-gtk-doc \
                                                   --enable-explicit-deps=no \
                                                   --with-included-modules"""
@@ -104,7 +107,9 @@
                                                   --enable-xlib=no \
                                                   --enable-xlib-xrender=no \
                                                   --enable-win32-font=yes \
-						  --enable-freetype"""
+						  --enable-freetype=no \
+						  --disable-static \
+						  --enable-shared"""
 
 
 module_autogenargs['libxml2']	= autogenargs + """ --disable-scrollkeeper"""
@@ -113,7 +118,9 @@
 
 module_autogenargs['atk']	= autogenargs + """ --disable-glibtest"""
 module_autogenargs['gtk+']	= autogenargs + """ --disable-glibtest"""
+
 module_autogenargs['libgda']	= autogenargs + """ --without-odbc --without-lda"""
+module_autogenargs['pxlib']	= autogenargs + """ --with-gsf=""" + prefix
 module_autogenargs['psiconv']	= autogenargs + """ --disable-xhtml-docs \
 						    --disable-html4-docs \
 						    --disable-ascii-docs \

Modified: trunk/tools/win32/moduleset
==============================================================================
--- trunk/tools/win32/moduleset	(original)
+++ trunk/tools/win32/moduleset	Sat Mar  1 18:42:18 2008
@@ -9,30 +9,22 @@
     <repository type="git" name="freedesktop.org"
 		href="git://cgit.freedesktop.org/git"/>
 
-<!-- i18n -->
-    <tarball id="iconv-fake" version="1.10">
-	<!-- this package is a workaround for bootstrapping
-	     intl support from gettext on iconv -->
-	<source href="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.10.tar.gz";
-		md5sum="0d621d541e28ff053d8bbcf7215de3a4"/>
-    </tarball>
-    <tarball id="gettext" version="0.16.1">
-	<source href="ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.16.1.tar.gz";
-		md5sum="3d9ad24301c6d6b17ec30704a13fe127"/>
-	<dependencies>
-	    <dep package="iconv-fake"/>
-	</dependencies>
+    <tarball id="iconv" version="1.12">
+	<source href="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz";
+	    md5sum="c2be282595751535a618ae0edeb8f648"/>
+    </tarball>
+ 
+    <tarball id="gettext" version="0.17">
+	<source href="ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz";
+	    md5sum="58a2bc6d39c0ba57823034d55d65d606"/>
 	<patches>
-	    <patch file="&patch_dir;gettext-dup-labels.patch" />
+	    <patch file="http://www.gnome.org/~aruiz/gtk+/patches/gettext_0_17_crossbuild_override_tools_fix.patch"/>
 	</patches>
-    </tarball>
-    <tarball id="iconv" version="1.11">
-	<source href="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz";
-		md5sum="b77a17e4a5a817100ad4b2613935055e"/>
 	<dependencies>
-	    <dep package="gettext"/>
+	    <dep package="iconv"/>
 	</dependencies>
     </tarball>
+
     <tarball id="pcre" version="7.2">
 	<source href="http://downloads.sourceforge.net/pcre/pcre-7.2.tar.bz2";
 		md5sum="53305db73855f1ff155dcd2c05d448d3"/>
@@ -40,11 +32,11 @@
 	    <patch file="&patch_dir;pcre.patch"/>
 	</patches>
     </tarball>
-    <tarball id="glib" version="2.14.4">
-	<source href="http://download.gnome.org/sources/glib/2.14/glib-2.14.4.tar.bz2";
-		md5sum="7ee7874108cbe9ea7fff1f4ab3389ce8"/>
+    <tarball id="glib" version="2.14.6">
+	<source href="http://download.gnome.org/sources/glib/2.14/glib-2.14.6.tar.bz2";
+		md5sum="3b340946d6916ee9cbf2c348e7c099f1"/>
 	<patches>
-		<patch file="http://osl.ulpgc.es/~arc/gnome/gtk/glib_win32_cachefile.patch.gz"/>
+		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch"/>
 	</patches>
 	<dependencies>
 	    <dep package="gettext"/>
@@ -55,7 +47,7 @@
     <autotools id="glib">
 	<branch/>
 	<patches>
-		<patch file="http://osl.ulpgc.es/~arc/gnome/gtk/glib_win32_cachefile.patch.gz"/>
+		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch.gz"/>
 	</patches>
 	<dependencies>
 	    <dep package="gettext"/>
@@ -70,8 +62,7 @@
 	<source href="http://www.zlib.net/zlib-1.2.3.tar.gz";
 		md5sum="debc62758716a169df9f62e6ab2bc634"/>
 	<patches>
-	    <patch file="&patch_dir;zlib.patch" strip="1"/>
-	    <patch file="http://osl.ulpgc.es/~arc/gnome/gtk/zlib_mingw_build.patch.gz"/>
+	    <patch file="http://www.gnome.org/~aruiz/gtk+/patches/zlib_hardcore_makefile.patch"/>
 	</patches>
     </tarball>
     -->
@@ -85,86 +76,44 @@
     </tarball>
 
 <!-- Image formats  -->
-<!-- from gnuwin32
     <tarball id="jpeg" version="6b" checkoutdir="jpeg-6b">
 	<source href="http://www.ijg.org/files/jpegsrc.v6b.tar.gz";
 		md5sum="dbd5f3b47ed13132f04c685d608a7547"/>
 	<patches>
-	    <patch file="http://ftp.debian.org/debian/pool/main/libj/libjpeg6b/libjpeg6b_6b-13.diff.gz"; strip="1"/>
+	    <patch file="http://gnome.org/~aruiz/gtk+/patches/jpeg_mingwport.patch"; strip="1"/>
 	</patches>
     </tarball>
--->
-    <tarball id="png" version="1.2.24">
-	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.24.tar.bz2"; />
+    <tarball id="png" version="1.2.25">
+	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.25.tar.bz2";
+		md5sum="0c1df914de7fd3b6a129af569889c856"/>
 	<dependencies>
-	    <!-- <dep package="zlib"/> -->
+	    <!--<dep package="zlib"/> -->
 	</dependencies>
     </tarball>
     <tarball id="tiff" version="3.8.2">
 	<source href="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz";
 		md5sum="fbb6f446ea4ed18955e2714934e5b698"/>
 	<dependencies>
-	    <!-- <dep package="jpeg"/> -->
-	</dependencies>
-    </tarball>
-    <tarball id="freetype" version="2.3.5">
-	<source href="http://download.savannah.gnu.org/releases/freetype/freetype-2.3.5.tar.bz2";
-		md5sum="65234327c5ac46ee00ebda15995d4c1c"/>
-    </tarball>
-    <!--
-    <tarball id="expat" version="2.0.1">
-	<source href="http://internap.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz";
-		md5sum="ee8b492592568805593f81f8cdf2a04c"/>
-    </tarball>
-    -->
-    <tarball id="fontconfig" version="2.4.2">
-	<source href="http://fontconfig.org/release/fontconfig-2.4.2.tar.gz";
-		md5sum="f035852f521b54677f2b5c9e2f6d54a4"/>
-	<dependencies>
-	    <dep package="libxml2"/>
-	    <dep package="freetype"/>
+	    <dep package="jpeg"/>
 	</dependencies>
-	<patches>
-	    <patch file="&patch_dir;fontconfig-2.4.2-tml-20070301.diff"/>
-	    <patch file="&patch_dir;fontconfig-2.4.2-jeg.patch"/>
-	</patches>
     </tarball>
 
 <!-- Gtk stack -->
-<!-- wine breakage in 1.3.10 with ExtTextOutW, but 1.2.6 also seems broken
-    might as well use the latest and greatest, and test in vmware
-    <tarball id="cairo" version="1.2.6">
-	<source href="http://cairographics.org/releases/cairo-1.2.6.tar.gz";
-		md5sum="487b3d7515752fe57f780d0fd707b01a"/>
-    <tarball id="cairo" version="1.4.10">
-	<source href="http://cairographics.org/releases/cairo-1.4.10.tar.gz";
-		md5sum="5598a5e500ad922e37b159dee72fc993"/>
-	<dependencies>
-	    <dep package="zlib"/>
-	    <dep package="png"/>
-	    <dep package="freetype"/>
-	</dependencies>
-    </tarball>
-		-->
     <autotools id="pixman">
 	<branch repo="freedesktop.org"/>
-	<dependencies>
-	</dependencies>
     </autotools>
     <autotools id="cairo">
 	<branch repo="freedesktop.org"/>
 	<dependencies>
 	    <!-- <dep package="zlib"/> -->
 	    <dep package="png"/>
-	    <dep package="freetype"/>
-	    <dep package="fontconfig"/>
 	    <dep package="pixman"/>
 	</dependencies>
     </autotools>
 
-    <tarball id="libdatrie" version="0.1.2" checkoutdir="libdatrie-0.1.2">
-	<source href="http://ftp.debian.org/pool/main/libd/libdatrie/libdatrie_0.1.2.orig.tar.gz";
-		md5sum="3eaedd5452149e11547a0dc74ee3fcfd"/>
+    <tarball id="libdatrie" version="0.1.2" checkoutdir="libdatrie-0.1.3">
+	<source href="http://ftp.debian.org/pool/main/libd/libdatrie/libdatrie_0.1.3.orig.tar.gz";
+		md5sum="917a40de487df3c29650b7434f473fa0"/>
     </tarball>
     <tarball id="libthai" version="0.1.9" checkoutdir="libthai-0.1.9">
 	<source href="http://ftp.debian.org/pool/main/libt/libthai/libthai_0.1.9.orig.tar.gz";
@@ -197,16 +146,16 @@
 	</dependencies>
     </autotools>
 
-    <tarball id="atk" version="1.20.0">
-	<source href="http://ftp.acc.umu.se/pub/gnome/sources/atk/1.20/atk-1.20.0.tar.bz2";
-		md5sum="b1a9e28d9f54ea306bd85a4c84b25fb8"/>
+    <tarball id="atk" version="1.21.5">
+	<source href="http://ftp.acc.umu.se/pub/gnome/sources/atk/1.21/atk-1.21.5.tar.bz2";
+		md5sum="3ac67cf2c1739aca39c3e11284cf247e"/>
 	<dependencies>
 	    <dep package="glib"/>
 	</dependencies>
     </tarball>
-    <tarball id="gtk+" version="2.12.3">
-	<source href="http://ftp.acc.umu.se/pub/gnome/sources/gtk+/2.12/gtk+-2.12.3.tar.bz2";
-		md5sum="dc8455144f27945f2fcbe91e75acd118"/>
+    <tarball id="gtk+" version="2.12.8">
+	<source href="http://ftp.acc.umu.se/pub/gnome/sources/gtk+/2.12/gtk+-2.12.8.tar.bz2";
+		md5sum="1e0d7db0bfa210881743e1d42ee91a24"/>
 	<dependencies>
 	    <dep package="glib"/>
 	    <dep package="cairo"/>
@@ -319,6 +268,12 @@
 	</dependencies>
     </autotools>
 
+    <tarball id="pxlib" version="0.6.3">
+	<source href="http://superb-east.dl.sourceforge.net/sourceforge/pxlib/pxlib-0.6.3.tar.gz";
+		md5sum="0742020854496fa757d7acbe6a895224"/>
+	<patches>
+	</patches>
+    </tarball>
     <tarball id="psiconv" version="2.6.0">
 	<source href="http://software.frodo.looijaard.name/psiconv/files/psiconv-0.9.8.tar.gz";
 		md5sum="8d7548e3c6b9cd408544736133728acd"/>
@@ -352,6 +307,7 @@
 	    <dep package="pango"/>
 	    <dep package="libglade"/>
 	    <dep package="libart_lgpl"/>
+	    <dep package="intltool"/>
 	</dependencies>
 	<patches>
 	    <patch file="&patch_dir;goffice.patch"/>
@@ -364,6 +320,7 @@
 	</dependencies>
 	<suggests>
 	    <dep package="libgnomedb"/>
+	    <dep package="pxlib"/>
 	    <dep package="psiconv"/>
 	    <dep package="pygobject"/>
 	</suggests>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]