SF.net SVN: geany: [2673] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Mon Jun 9 19:29:55 UTC 2008
Revision: 2673
http://geany.svn.sourceforge.net/geany/?rev=2673&view=rev
Author: eht16
Date: 2008-06-09 12:29:54 -0700 (Mon, 09 Jun 2008)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/ChangeLog
trunk/geany.nsi
trunk/plugins/makefile.win32
trunk/src/main.c
trunk/src/makefile.win32
trunk/src/plugins.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-06-09 17:43:48 UTC (rev 2672)
+++ trunk/ChangeLog 2008-06-09 19:29:54 UTC (rev 2673)
@@ -7,8 +7,16 @@
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 <nick(dot)treleaven(at)btinternet(dot)com>
* tagmanager/python.c:
Modified: trunk/geany.nsi
===================================================================
--- trunk/geany.nsi 2008-06-09 17:43:48 UTC (rev 2672)
+++ trunk/geany.nsi 2008-06-09 19:29:54 UTC (rev 2673)
@@ -131,8 +131,8 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
RMDir "$SMPROGRAMS\$ICONS_GROUP"
RMDir /r "$INSTDIR\doc"
- RMDir /r "$INSTDIR\plugins"
RMDir /r "$INSTDIR\data"
RMDir /r "$INSTDIR\etc"
RMDir /r "$INSTDIR\lib"
Modified: trunk/plugins/makefile.win32
===================================================================
--- trunk/plugins/makefile.win32 2008-06-09 17:43:48 UTC (rev 2672)
+++ trunk/plugins/makefile.win32 2008-06-09 19:29:54 UTC (rev 2673)
@@ -28,7 +28,7 @@
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 @@
CFLAGS=-O2 $(CBASEFLAGS)
endif
+ifndef GTK210
+ALL_GTK_LIBS += -liconv
+endif
.PHONY: all clean plugins
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2008-06-09 17:43:48 UTC (rev 2672)
+++ trunk/src/main.c 2008-06-09 19:29:54 UTC (rev 2673)
@@ -461,8 +461,8 @@
#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);
Modified: trunk/src/makefile.win32
===================================================================
--- trunk/src/makefile.win32 2008-06-09 17:43:48 UTC (rev 2672)
+++ trunk/src/makefile.win32 2008-06-09 19:29:54 UTC (rev 2673)
@@ -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 @@
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 @@
#"$(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 @@
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 @@
$(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:
Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c 2008-06-09 17:43:48 UTC (rev 2672)
+++ trunk/src/plugins.c 2008-06-09 19:29:54 UTC (rev 2673)
@@ -715,7 +715,7 @@
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;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list