2013-03-13 [colin] 3.9.0cvs124
authorColin Leroy <colin@colino.net>
Wed, 13 Mar 2013 20:06:47 +0000 (20:06 +0000)
committerColin Leroy <colin@colino.net>
Wed, 13 Mar 2013 20:06:47 +0000 (20:06 +0000)
* src/plugins/fancy/Makefile.am
* src/plugins/fancy/claws.def
* src/plugins/fancy/plugin.def
* src/plugins/fancy/version.rc
Preparing for win32 Fancy port

ChangeLog
PATCHSETS
configure.ac
src/plugins/fancy/Makefile.am
src/plugins/fancy/claws.def [new file with mode: 0644]
src/plugins/fancy/plugin.def [new file with mode: 0644]
src/plugins/fancy/version.rc [new file with mode: 0644]

index 5ed9bc9..5c77961 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-13 [colin]     3.9.0cvs124
+
+       * src/plugins/fancy/Makefile.am
+       * src/plugins/fancy/claws.def
+       * src/plugins/fancy/plugin.def
+       * src/plugins/fancy/version.rc
+               Preparing for win32 Fancy port
+
 2013-03-13 [colin]     3.9.0cvs123
 
        * src/plugins/fancy/fancy_viewer.h
index 43f2f0a..75c513d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/fancy/fancy_prefs.c;  ) > 3.9.0cvs121.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pdf_viewer/poppler_viewer.c;  ) > 3.9.0cvs122.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/fancy/fancy_viewer.h;  ) > 3.9.0cvs123.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/fancy/Makefile.am;  diff -u /dev/null src/plugins/fancy/claws.def;  diff -u /dev/null src/plugins/fancy/plugin.def;  diff -u /dev/null src/plugins/fancy/version.rc;  ) > 3.9.0cvs124.patchset
index 41db1e8..bc633b9 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=123
+EXTRA_VERSION=124
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d0d87d3..986ee24 100644 (file)
@@ -1,9 +1,57 @@
+EXTRA_DIST = claws.def plugin.def version.rc
+
+if OS_WIN32
+
+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
+     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
+
+%.lo : %.rc
+       $(LTRCCOMPILE) -i $< -o $@
+
+plugin_res = version.lo
+plugin_res_ldflag = -Wl,.libs/version.o
+
+export_symbols = -export-symbols $(srcdir)/plugin.def
+
+plugin_deps = libclaws.a $(plugin_res) plugin.def
+
+libclaws.a: claws.def
+       $(DLLTOOL) --output-lib $@ --def $<
+
+plugin_ldadd = -L. -lclaws
+
+else
+plugin_res =
+plugin_res_ldflag =
+export_symbols =
+plugin_deps =
+plugin_ldadd =
+endif
+
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+else
+no_undefined =
+endif
+
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
+else
+cygwin_export_lib = 
+endif
+
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_FANCY_PLUGIN
 plugin_LTLIBRARIES = fancy.la
 endif
 
+fancy_la_DEPENDENCIES = $(plugin_deps)
+
+fancy_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
+       $(GTK_LIBS)
+
 fancy_la_SOURCES = \
         fancy_viewer.c \
         fancy_viewer.h \
@@ -11,9 +59,9 @@ fancy_la_SOURCES = \
         fancy_prefs.h
 
 fancy_la_LDFLAGS = \
+       $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
        -avoid-version -module \
        $(GTK_LIBS) \
-       $(GTKPRINTUNIX_LIBS) \
        $(WEBKIT_LIBS) \
        $(LIBSOUP_GNOME_LIBS) \
        $(CURL_LIBS)
diff --git a/src/plugins/fancy/claws.def b/src/plugins/fancy/claws.def
new file mode 100644 (file)
index 0000000..c75471a
--- /dev/null
@@ -0,0 +1,87 @@
+LIBRARY CLAWS-MAIL.EXE
+EXPORTS
+addressbook_folder_selection
+alertpanel
+alertpanel_error
+check_plugin_version
+claws_do_idle
+combobox_get_active_data
+combobox_select_by_data
+combobox_text_new
+complete_address
+compose_new
+conv_codeset_strdup
+conv_get_locale_charset_str
+conv_get_locale_charset_str_no_utf8
+debug_print_real
+debug_srcname
+end_address_completion
+execute_command_line
+extract_address
+filesel_select_file_save
+folder_find_item_from_identifier
+folder_get_default_trash
+folder_item_get_identifier
+folder_item_get_path
+folder_item_remove_msg
+foldersel_folder_sel
+folder_subscribe
+get_complete_address
+get_locale_dir
+get_rc_dir
+gtkut_get_browse_directory_btn
+gtkut_get_options_frame
+gtkutils_scroll_one_line
+gtkutils_scroll_page
+gtkut_sc_combobox_create
+hooks_register_hook
+hooks_unregister_hook
+is_dir_exist
+line_has_quote_char
+log_error
+make_dir
+matcherlist_free
+matcherlist_match
+matcherlist_new
+matcherprop_new
+mimeview_register_viewer_factory
+mimeview_unregister_viewer_factory
+noticeview_hide
+open_uri
+plugin_get_loaded_by_name
+pref_get_escaped_pref
+pref_get_pref_from_entry
+pref_get_unescaped_pref
+prefs_button_toggled
+prefs_button_toggled follow
+prefs_common
+prefs_common_get_prefs
+prefs_common_get_uri_cmd
+pref_set_entry_from_pref
+prefs_file_close
+prefs_file_close_revert
+prefs_gtk_register_page
+prefs_gtk_unregister_page
+prefs_read_config
+prefs_set_block_label
+prefs_set_default
+prefs_write_open
+prefs_write_param
+printing_get_page_setup
+printing_get_settings
+printing_store_settings
+procmime_get_part
+procmime_get_tmp_file_name
+procmime_mimeinfo_get_parameter
+procmime_mimeinfo_next
+procmsg_get_message_file
+procmsg_msginfo_set_flags
+procmsg_msginfo_unset_flags
+procmsg_register_spam_learner
+procmsg_spam_set_folder
+procmsg_unregister_spam_learner
+settings
+start_address_completion
+statusbar_pop_all
+statusbar_print_all
+statusbar_progress_all
diff --git a/src/plugins/fancy/plugin.def b/src/plugins/fancy/plugin.def
new file mode 100644 (file)
index 0000000..8916a5d
--- /dev/null
@@ -0,0 +1,10 @@
+EXPORTS
+        plugin_desc
+        plugin_done
+        plugin_init
+        plugin_licence
+        plugin_name
+        plugin_type
+       plugin_provides
+        plugin_version
+
diff --git a/src/plugins/fancy/version.rc b/src/plugins/fancy/version.rc
new file mode 100644 (file)
index 0000000..1b37250
--- /dev/null
@@ -0,0 +1,36 @@
+1 VERSIONINFO
+ FILEVERSION 0, 0, 0, 0
+ PRODUCTVERSION 0, 0, 0, 0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "FileDescription", "Bsfilter Plugin\0"
+            VALUE "FileVersion", "0.0.0.0\0"
+            VALUE "ProductVersion", "0.0.0.0 Win32\0"
+            VALUE "LegalCopyright", "GPL / © 1999-2008 Hiroyuki Yamamoto & The Claws Mail Team\0"
+            VALUE "CompanyName", "GNU / Free Software Foundation\0"
+            VALUE "ProductName", "Claws Mail\0"
+//            VALUE "Comments", "\0"
+//            VALUE "InternalName", "\0"
+//            VALUE "LegalTrademarks", "\0"
+//            VALUE "OriginalFilename", "\0"
+//            VALUE "PrivateBuild", "\0"
+//            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END