diff --git a/ChangeLog b/ChangeLog index 94c9dc103..3c9312a81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,15 @@ Remove useless path separator. * configure.in: Set $(docdir) if it is not set automatically. - + * geany.nsi, plugins/makefile.win32, src/makefile.win32, src/main.c, + src/plugins.c: + Windows changes: + Install plugins into lib/ not into plugins/. + Don't link against libiconv when compiling against GLib 2.14 and + above (it's statically linked into GLib). + Install Geany's message catalogs into share/locale rather than + lib/locale as GTK does since 2.12.2. + 2008-06-09 Nick Treleaven diff --git a/geany.nsi b/geany.nsi index c8cbf2c2f..bf6802193 100644 --- a/geany.nsi +++ b/geany.nsi @@ -131,8 +131,8 @@ Section "!Program Files" SEC01 File "${RESOURCEDIR}\data\GPL-2" File "${RESOURCEDIR}\data\file*" - SetOutPath "$INSTDIR\share" - File /r "${RESOURCEDIR}\share\*" + SetOutPath "$INSTDIR\share\icons" + File /r "${RESOURCEDIR}\share\icons\*" SetOutPath "$INSTDIR" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application @@ -146,14 +146,14 @@ SectionEnd Section "Plugins" SEC02 SectionIn 1 SetOverwrite ifnewer - SetOutPath "$INSTDIR" - File /r "${RESOURCEDIR}\plugins" + SetOutPath "$INSTDIR\lib" + File "${RESOURCEDIR}\lib\*.dll" SectionEnd Section "Language Files" SEC03 SectionIn 1 - SetOutPath "$INSTDIR" - File /r "${RESOURCEDIR}\lib" + SetOutPath "$INSTDIR\share\locale" + File /r "${RESOURCEDIR}\share\locale\*" SectionEnd Section "Documentation" SEC04 @@ -191,6 +191,8 @@ Section "GTK 2.12 Runtime Environment" SEC06 File /r "gtk\etc\*" SetOutPath "$INSTDIR\lib" File /r "gtk\lib\*" + SetOutPath "$INSTDIR\share" + File /r "gtk\share\*" /* code to embed GTK+ installer executable File ${GTK_INSTALLER} ExecWait ${GTK_INSTALLER} @@ -289,7 +291,6 @@ Section Uninstall Delete "$INSTDIR\charset.dll" Delete "$INSTDIR\gspawn-win32-helper.exe" Delete "$INSTDIR\gspawn-win32-helper-console.exe" - Delete "$INSTDIR\iconv.dll" Delete "$INSTDIR\intl.dll" Delete "$INSTDIR\jpeg62.dll" Delete "$INSTDIR\libgthread-2.0-0.dll" @@ -299,7 +300,6 @@ Section Uninstall Delete "$INSTDIR\libgobject-2.0-0.dll" Delete "$INSTDIR\libpango-1.0-0.dll" Delete "$INSTDIR\libpangoft2-1.0-0.dll" - Delete "$INSTDIR\libpng13.dll" Delete "$INSTDIR\libatk-1.0-0.dll" Delete "$INSTDIR\libcairo-2.dll" Delete "$INSTDIR\libgdk_pixbuf-2.0-0.dll" @@ -307,8 +307,11 @@ Section Uninstall Delete "$INSTDIR\libglib-2.0-0.dll" Delete "$INSTDIR\libgmodule-2.0-0.dll" Delete "$INSTDIR\libtiff3.dll" + Delete "$INSTDIR\libpng12-0.dll" + Delete "$INSTDIR\libgio-2.0-0.dll" Delete "$INSTDIR\zlib1.dll" + Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" Delete "$QUICKLAUNCH\Geany.lnk" @@ -318,7 +321,6 @@ Section Uninstall RMDir "$SMPROGRAMS\$ICONS_GROUP" RMDir /r "$INSTDIR\doc" - RMDir /r "$INSTDIR\plugins" RMDir /r "$INSTDIR\data" RMDir /r "$INSTDIR\etc" RMDir /r "$INSTDIR\lib" diff --git a/plugins/makefile.win32 b/plugins/makefile.win32 index 9a67d99f0..d843485c9 100644 --- a/plugins/makefile.win32 +++ b/plugins/makefile.win32 @@ -28,7 +28,7 @@ INCLUDEDIRS= -I.. \ ALL_GTK_LIBS= \ -L"$(PREFIX)/lib" \ -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \ - -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv + -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl CBASEFLAGS=-Wall -pipe -mms-bitfields -DHAVE_CONFIG_H ifdef DEBUG @@ -37,6 +37,9 @@ else CFLAGS=-O2 $(CBASEFLAGS) endif +ifndef GTK210 +ALL_GTK_LIBS += -liconv +endif .PHONY: all clean plugins diff --git a/src/main.c b/src/main.c index 885aa34f1..578565b93 100644 --- a/src/main.c +++ b/src/main.c @@ -461,8 +461,8 @@ static void locale_init(void) #ifdef G_OS_WIN32 gchar *install_dir = g_win32_get_package_installation_directory("geany", NULL); - /* e.g. C:\Program Files\geany\lib\locale */ - locale_dir = g_strconcat(install_dir, "\\lib\\locale", NULL); + /* e.g. C:\Program Files\Geany\share\locale */ + locale_dir = g_strconcat(install_dir, "\\share\\locale", NULL); g_free(install_dir); #else locale_dir = g_strdup(GEANY_LOCALEDIR); diff --git a/src/makefile.win32 b/src/makefile.win32 index c8b05eedc..51f2c0a7d 100644 --- a/src/makefile.win32 +++ b/src/makefile.win32 @@ -2,7 +2,7 @@ DEFINES = -DHAVE_CONFIG_H \ -DGEANY_DATADIR=\"data\" \ - -DGEANY_LOCALEDIR=\"data\" \ + -DGEANY_LOCALEDIR=\"share\" \ -DGEANY_LIBDIR=\"\" \ -DGEANY_PREFIX=\"\" @@ -36,7 +36,7 @@ INCLUDEDIRS= -I.. \ ALL_GTK_LIBS= \ -L"$(PREFIX)/lib" \ -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \ - -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv + -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl # these things are for GTK >= 2.8 # (should be same as with MSYS: pkg-config --libs gtk+-2.0 gthread-2.0) #"$(PREFIX)/lib/libcairo.dll.a" \ @@ -44,9 +44,9 @@ ALL_GTK_LIBS= \ #"$(PREFIX)/lib/charset.lib" \ ifdef GTK210 -PRINTING_LIBS=-lcairo -lpangocairo-1.0 +ALL_GTK_LIBS +=-lcairo -lpangocairo-1.0 else -PRINTING_LIBS= +ALL_GTK_LIBS +=-liconv endif WIN_LIBS=-mwindows -lkernel32 -limm32 -lshfolder -lshell32 \ @@ -55,6 +55,7 @@ WIN_LIBS=-mwindows -lkernel32 -limm32 -lshfolder -lshell32 \ CBASEFLAGS=-Wall -pipe -mms-bitfields $(DEFINES) $(INCLUDEDIRS) ifdef DEBUG CFLAGS=-O0 -g $(CBASEFLAGS) +DEFINES += -DGEANY_DEBUG else CFLAGS=-O2 $(CBASEFLAGS) endif @@ -87,7 +88,7 @@ binclean: $(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(CXX) $(OBJS) $(RES) -o $(TARGET) \ - ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(ALL_GTK_LIBS) $(PRINTING_LIBS) \ + ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(ALL_GTK_LIBS) \ $(WIN_LIBS) deps.mak: diff --git a/src/plugins.c b/src/plugins.c index 7ac5178c2..f48b21020 100644 --- a/src/plugins.c +++ b/src/plugins.c @@ -715,7 +715,7 @@ static gchar *get_plugin_path() gchar *install_dir = g_win32_get_package_installation_directory("geany", NULL); gchar *path; - path = g_strconcat(install_dir, "\\plugins", NULL); + path = g_strconcat(install_dir, "\\lib", NULL); return path; }