@@ -54,3 +54,4 @@ data/default-prefs.js gtester.xml report.html test/test +install_manifest.txt .gitignore @@ -2,7 +2,16 @@ project(chmsee) cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR) set(PACKAGE_VERSION "1.0.7" ) find_package(PkgConfig) -pkg_check_modules (CHMSEE REQUIRED gthread-2.0 glib-2.0 libxml-2.0 gtk+-2.0 libglade-2.0 libxul-embedding-unstable>=1.9 libxul-embedding-unstable<=1.9.0.999) +pkg_check_modules (CHMSEE REQUIRED gthread-2.0 glib-2.0 libxml-2.0 gtk+-2.0 libglade-2.0) +pkg_search_module(XULRUNNER libxul-embedding-unstable>=1.9 xulrunner-gtkmozembed>=1.8) +set(CHMSEE_INCLUDE_DIRS ${CHMSEE_INCLUDE_DIRS} ${XULRUNNER_INCLUDE_DIRS}) +set(CHMSEE_CFLAGS_OTHER ${CHMSEE_CFLAGS_OTHER} ${XULRUNNER_CFLAGS_OTHER} -Wall) +set(CHMSEE_LIBRARY_DIRS ${CHMSEE_LIBRARY_DIRS} ${XULRUNNER_LIBRARY_DIRS}) +set(CHMSEE_LIBRARIES ${CHMSEE_LIBRARIES} ${XULRUNNER_LIBRARIES} chm gcrypt) +if(XULRUNNER_VERSION STRLESS "1.9") + set(XULRUNNER18 1) + set(GECKO_LIB_ROOT "${XULRUNNER_LIBDIR}") +endif() set(CHMSEE_BOOKMARK_FILE "chmsee_bookmarks") set(CHMSEE_BOOKINFO_FILE "chmsee_bookinfo") CMakeLists.txt @@ -5,6 +5,7 @@ Features ~~~~~~~~ * issue 47: jump to specify index page from command line. +* issue 48: support xulrunner 1.8 again. l10n ~~~~ NEWS @@ -4,7 +4,6 @@ include_directories( ${CHMSEE_INCLUDE_DIRS} ) add_definitions( - -Wall ${CHMSEE_CFLAGS_OTHER} ) add_custom_command( @@ -49,8 +48,6 @@ set(CHMSEE_SRCS add_library(chmseelib STATIC ${CHMSEE_SRCS}) target_link_libraries(chmseelib ${CHMSEE_LIBRARIES} - chm - gcrypt ) add_executable(chmsee main.cpp) src/CMakeLists.txt @@ -9,3 +9,6 @@ #define PACKAGE "chmsee" #define GETTEXT_PACKAGE "chmsee" #define PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale" +#cmakedefine XULRUNNER_VERSION "${XULRUNNER_VERSION}" +#cmakedefine XULRUNNER18 1 +#cmakedefine GECKO_LIB_ROOT "${GECKO_LIB_ROOT}" src/config.h.in @@ -53,7 +53,13 @@ #include <nsMemory.h> #include <nsEmbedString.h> #include <nsIPrefService.h> -#include <nsICommandManager.h> +#if XULRUNNER18 + #include <commandhandler/nsICommandManager.h> + #include <locale/nsILocaleService.h> +#else + #include <nsICommandManager.h> + #include <nsILocaleService.h> +#endif #include <nsIInterfaceRequestorUtils.h> #include <nsIDOMWindow.h> @@ -65,7 +71,6 @@ #include <nsILocalFile.h> #include <nsIDOMMouseEvent.h> #include <nsIWebBrowserFind.h> -#include <nsILocaleService.h> #include <nsStringAPI.h> #include "utils/utils.h" src/gecko_utils.cpp 012b3292c12f4aa89080a6be25bf0795a3719aa0 LI Daobing lidaobing@gmail.com http://github.com/lidaobing/chmsee/commit/320f40990ce0bfe6449fbe2cb54733e8c446137e 320f40990ce0bfe6449fbe2cb54733e8c446137e 2009-08-01T09:56:04-07:00 2009-08-01T09:56:04-07:00 issue 48: support xulrunner 1.8 again. c07befacee3f2d701a83aef2f2469358512bbe90 LI Daobing lidaobing@gmail.com