|
[-]
[+]
|
Changed |
sim-svn.spec
|
|
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/CMakeLists.txt
^
|
| @@ -1,10 +1,11 @@
# main cmake file for SIM-IM
PROJECT(Sim-IM)
+SET(Sim-IM_VERSION 0.9.5)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4)
if(COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
+ cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
SET(CMAKE_COLOR_MAKEFILE ON)
@@ -15,16 +16,10 @@
INCLUDE(FindQt3)
INCLUDE(MacroEnsureOutOfSourceBuild)
-
-INCLUDE(CPack)
IF(NOT WIN32)
- MACRO_ENSURE_OUT_OF_SOURCE_BUILD("SIM-IM requires an out of source build. Please create a separate build directory and run 'cmake path_to_sim_im [options]' there.")
+ MACRO_ENSURE_OUT_OF_SOURCE_BUILD("SIM-IM requires an out of source build. Please create a separate build directory and run 'cmake path_to_sim_im [options]' there.")
ENDIF(NOT WIN32)
-SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.sw[p-z]$;~$;tmp$;/CMakeFiles/")
-SET(CPACK_PACKAGE_VERSION "0.9.5")
-SET(CPACK_PACKAGE_FILE_NAME "Sim-IM-0.9.5-Source")
-
INCLUDE(Flex)
INCLUDE(Jisp)
INCLUDE(KDE3Macros)
@@ -183,21 +178,36 @@
ENDIF(ENABLE_TARGET_UPDATE_MESSAGES)
IF(DEV_BUILD)
- # Get revision number from SVN
- FIND_PACKAGE(Subversion)
- IF(Subversion_FOUND)
- MESSAGE("-- Found Subversion ${Subversion_VERSION_SVN}")
- Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Sim-IM)
- IF(DEFINED Sim-IM_WC_REVISION)
- SET(CMAKE_KVIRC_BUILD_REVISION ${Sim-IM_WC_REVISION})
- MESSAGE("-- Current revision is ${Sim-IM_WC_REVISION}")
+ IF(EXISTS "${CMAKE_MODULE_PATH}/StaticRevDefinition.cmake")
+ # We have static information about revision number
+ # that were stored by tarball creating script (make dist)
+ INCLUDE(StaticRevDefinition)
+ MESSAGE(STATUS "This Sim-IM source package were created from SVN-repository revision ${Sim-IM_WC_REVISION}")
+ ELSE(EXISTS "${CMAKE_MODULE_PATH}/StaticRevDefinition.cmake")
+ # Get revision number from SVN
+ FIND_PACKAGE(Subversion)
+ IF(Subversion_FOUND)
+ MESSAGE("-- Found Subversion ${Subversion_VERSION_SVN}")
+ Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Sim-IM)
+ IF(DEFINED Sim-IM_WC_REVISION)
+ SET(CMAKE_KVIRC_BUILD_REVISION ${Sim-IM_WC_REVISION})
+ MESSAGE("-- Current revision is ${Sim-IM_WC_REVISION}")
+ ELSE()
+ MESSAGE("-- No Subversion working copy found")
+ ENDIF()
ELSE()
- MESSAGE("-- No Subversion working copy found")
+ MESSAGE("Subversion not found. No revision number will be used")
ENDIF()
- ELSE()
- MESSAGE("Subversion not found. No revision number will be used")
- ENDIF()
+ ENDIF(EXISTS "${CMAKE_MODULE_PATH}/StaticRevDefinition.cmake")
+
ENDIF()
+FIND_PROGRAM(BZIP2_EXECUTABLE bzip2)
+IF (BZIP2_EXECUTABLE)
+ MESSAGE(STATUS "Found bzip2: ${BZIP2_EXECUTABLE}")
+ELSE()
+ MESSAGE(SATUS "bzip2 not found")
+ENDIF()
+
# subdirectories
ADD_SUBDIRECTORY(sim)
@@ -274,5 +284,52 @@
COMMAND ${MSGMERGE_EXECUTABLE} ${po_file}.backup ${CMAKE_SOURCE_DIR}/po/sim.pot >${po_file}
)
ENDFOREACH(po_file)
-
ENDIF ( ENABLE_TARGET_UPDATE_MESSAGES )
+
+
+# for dist target
+SET(root_files CMakeLists.txt
+ COPYING
+ ChangeLog
+ ConfigureChecks.cmake
+ README
+ config.h.cmake
+ AUTHORS
+ AUTHORS.sim)
+FOREACH(file ${root_files})
+ ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/${file}")
+ENDFOREACH(file)
+
+FILE(GLOB cmake_files cmake/*.in cmake/*.cmake cmake/COPYING-CMAKE-SCRIPTS)
+FOREACH(file ${cmake_files})
+ ADD_TO_DIST_TARGET("${file}")
+ENDFOREACH(file)
+
+FILE(GLOB po_files po/*.po po/*.pot)
+FOREACH(file ${po_files})
+ ADD_TO_DIST_TARGET("${file}")
+ENDFOREACH(file)
+
+
+CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_make_dist.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_make_dist.cmake"
+ IMMEDIATE @ONLY)
+
+SET(DIST_TYPE "non-free")
+CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_make_dist.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_make_dist_non-free.cmake"
+ IMMEDIATE @ONLY)
+
+# dist targets
+ADD_CUSTOM_TARGET(dist
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_make_dist.cmake")
+
+ADD_CUSTOM_TARGET(dist-non-free
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_make_dist_non-free.cmake")
+
+ADD_CUSTOM_TARGET(dist-all )
+# DEPENDS dist dist-non-free )
+
+add_dependencies(dist-all dist dist-non-free)
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/admin/cvs.sh
^
|
| @@ -68,7 +68,7 @@
echo "*** SIM requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/cmake/DistTarget.cmake
^
|
| @@ -1,36 +1,20 @@
-# dist target
-# from cmake wiki, feel free to modify
+# Copyright (c) 2009, Swami Dhyan Nataraj (Nikolay Shaplov), <n@shaplov.ru>
+#
+# Redistribution and use is allowed according to the terms of
+# GNU Public License version 2 or later
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sim-IM")
-SET(CPACK_PACKAGE_VENDOR "Sim-IM developers")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "9")
-SET(CPACK_PACKAGE_VERSION_PATCH "5")
-#SET(CPACK_INSTALL_CMAKE_PROJECTS "sim")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Sim-IM ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+FILE(WRITE "${Sim-IM_BINARY_DIR}/make-dist.manifest.txt" "") # Clearing dist manifest files
+FILE(WRITE "${Sim-IM_BINARY_DIR}/make-dist-non-free.manifest.txt" "")
-IF(WIN32 AND NOT UNIX)
- SET(CPACK_GENERATOR NSIS) # can be NSIS, STGZ, TBZ2, TGZ, TZ and ZIP
- SET(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
- # There is a bug in NSI that does not handle full unix paths properly. Make
- # sure there is at least one set of four (4) backlasshes.
- SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/install_win32\\\\sim-window-small.bmp")
- SET(CPACK_NSIS_INSTALLED_ICON_NAME "sim.exe")
- SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
- SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.sim-im.org")
- SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.sim-im.org")
- SET(CPACK_NSIS_CONTACT "sim-im-main@lists.sim-im.org")
-
- SET(CPACK_SOURCE_GENERATOR "NSIS")
- SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.svn/")
-ELSE(WIN32 AND NOT UNIX)
- SET(CPACK_GENERATOR TBZ2) # can be STGZ, TBZ2, TGZ, TZ and ZIP
-
- SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ")
- SET(CPACK_SOURCE_IGNORE_FILES "/install_win32/" "/sim/win32/" "/\\\\.svn/")
-ENDIF(WIN32 AND NOT UNIX)
-SET(CPACK_PACKAGE_EXECUTABLES "sim" "sim")
-
-INCLUDE(CPack)
+MACRO(ADD_TO_DIST_TARGET)
+ SET(_file_name ${ARGV0})
+ SET(_dist_type ${ARGV1})
+ IF( NOT _dist_type)
+ FILE(APPEND "${Sim-IM_BINARY_DIR}/make-dist.manifest.txt" "${_file_name}\n")
+ FILE(APPEND "${Sim-IM_BINARY_DIR}/make-dist-non-free.manifest.txt" "${_file_name}\n")
+ ELSE( NOT _dist_type)
+ IF(_dist_type STREQUAL "non-free")
+ FILE(APPEND "${Sim-IM_BINARY_DIR}/make-dist-non-free.manifest.txt" "${_file_name}\n")
+ ENDIF(_dist_type STREQUAL "non-free")
+ ENDIF( NOT _dist_type)
+ENDMACRO(ADD_TO_DIST_TARGET)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/cmake/Jisp.cmake
^
|
| @@ -12,24 +12,30 @@
ENDMACRO(FIND_ZIP)
-MACRO(ADD_JISP_ARCHIVE subdir jisp_name _sources)
+MACRO(ADD_JISP_ARCHIVE)
+ SET(subdir ${ARGV0}) # Create jisp archive form this dir
+ SET(jisp_name ${ARGV1}) # Create jisp archive with this nmae
+ SET(_sources ${ARGV2}) # Var name, with list of targets that will be built, target for creating jisp will be added there
+ SET(_dist_type ${ARGV3}) # Add jisp source files to a specific dist tarball (i.e. tarball with nonfree media)
+
FIND_ZIP()
GET_FILENAME_COMPONENT(_in_dir ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/icondef.xml PATH)
IF(EXISTS ${_in_dir}/icondef.xml)
FILE(GLOB _in ${_in_dir}/*.png)
- SET(_in ${_in} ${_in_dir}/icondef.xml)
+ LIST(APPEND _in ${_in_dir}/icondef.xml)
IF(WIN32)
GET_FILENAME_COMPONENT(_out ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/icons/${jisp_name} ABSOLUTE)
ELSE(WIN32)
GET_FILENAME_COMPONENT(_out ${CMAKE_CURRENT_BINARY_DIR}/${jisp_name} ABSOLUTE)
ENDIF(WIN32)
-
+
FILE(WRITE ${_out}.files "")
FOREACH(_file ${_in})
FILE(APPEND ${_out}.files "${_file}\n")
+ ADD_TO_DIST_TARGET(${_file} ${_dist_type})
ENDFOREACH(_file ${_in})
ADD_CUSTOM_COMMAND(
@@ -38,7 +44,7 @@
-j -q -9 ${_out} -@ < ${_out}.files
DEPENDS ${_in}
)
- SET(${_sources} ${${_sources}} ${_out})
+ LIST(APPEND ${_sources} ${_out})
INSTALL(FILES ${_out} DESTINATION ${SIM_ICONS_DIR})
ENDIF(EXISTS ${_in_dir}/icondef.xml)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/cmake/SimPlugins.cmake
^
|
| @@ -1,25 +1,92 @@
# Searching and enabling plugins
MACRO(SIM_ADD_PLUGIN _name)
PROJECT(${_name})
-
- SET(_srcs ${${_name}_SRCS})
- SET(_hdrs ${${_name}_HDRS})
- SET(_uics ${${_name}_UICS})
- SET(_libs ${${_name}_LIBS})
- KDE3_AUTOMOC(${_srcs})
+ ##################################################
+ IF(${_name}_PLATFORMS)
+ SET(_src_types SRCS HDRS UICS LIBS FLEX MEDIA)
+
+ FOREACH(_src_type ${_src_types})
+ SET(_${_src_type} "")
+ SET(_${_src_type}_ALL "")
+ ENDFOREACH(_src_type)
+
+ SET(${_name}_FLAG_COMMON 1) # Always incliude common srcs
+ IF(WIN32)
+ SET (${_name}_FLAG_WIN32 1)
+ ELSE(WIN32)
+ SET (${_name}_FLAG_NON_WIN32 1)
+ ENDIF(WIN32)
+
+ FOREACH(_platform ${${_name}_PLATFORMS}) # COMMON WIN32 UNIX NON_WIN32 etc
+ FOREACH(_src_type ${_src_types})
+ IF(NOT ${_name}_PLUGIN_FORBIDDEN)
+ IF(${_name}_FLAG_${_platform}) # i.e. __home_FLAG_WIN32
+ LIST(APPEND _${_src_type} ${${_name}_${_src_type}_${_platform}})
+ IF(_src_type STREQUAL FLEX)
+ FOREACH(_flex_file ${${_name}_${_src_type}_${_platform}})
+ ADD_FLEX_FILES(_SRCS ${_flex_file})
+ ENDFOREACH(_flex_file)
+ ENDIF(_src_type STREQUAL FLEX)
+ ENDIF(${_name}_FLAG_${_platform})
+ ENDIF(NOT ${_name}_PLUGIN_FORBIDDEN)
+
+
+ LIST(APPEND _${_src_type}_ALL ${${_name}_${_src_type}_${_platform}})
+ FOREACH(a_file_name ${${_name}_${_src_type}_${_platform}})
+ IF(IS_ABSOLUTE ${a_file_name})
+ ADD_TO_DIST_TARGET("${a_file_name}")
+ ELSE(IS_ABSOLUTE ${a_file_name})
+ ADD_TO_DIST_TARGET("${Sim-IM_PLUGINS_SOURCE_DIR}/${_name}/${a_file_name}")
+ ENDIF(IS_ABSOLUTE ${a_file_name})
+ ENDFOREACH(a_file_name)
+ ENDFOREACH(_src_type)
+ ENDFOREACH(_platform)
+ # some make targets are generated not by source files but by ADD_CUSTOM_COMMAND (i.e. in ADD_JISP_ARCHIVE)
+ # in order not to add these targets to make dist file list we will keep them in _NON_SRC_TARGETS
+ SET(_NON_SRC_TARGETS ${${_name}_NON_SRC_TARGETS})
+ SET(${_name}_MESSAGE_SOURCES ${_UICS_ALL} ${_SRCS_ALL} PARENT_SCOPE)
+ ADD_TO_DIST_TARGET("${Sim-IM_PLUGINS_SOURCE_DIR}/${_name}/CMakeLists.txt")
+
+ # SET(_srcs ${_SRCS})
+ # SET(_hdrs ${_HDRS})
+ # SET(_uics ${_UICS})
+ # SET(_libs ${_LIBS})
+ # MESSAGE(" srcs: ${_srcs}")
+ # MESSAGE(" hdrs: ${_hdrs}")
+ # MESSAGE(" uics: ${_uics}")
+
+ # MESSAGE("==============================")
+
+ # MESSAGE(" SRCS_ALL: ${_SRCS_ALL}")
+ # MESSAGE(" HDRS_ALL: ${_HDRS_ALL}")
+ # MESSAGE(" UICS_ALL: ${_UICS_ALL}")
+ # MESSAGE("==============================")
+
+ ##################################################
+ #ELSE()
+ # MESSAGE(FATAL_ERROR "I've forgot something!")
+ # SET(_srcs ${${_name}_SRCS})
+ # SET(_hdrs ${${_name}_HDRS})
+ # SET(_uics ${${_name}_UICS})
+ # SET(_libs ${${_name}_LIBS})
+ ENDIF()
+
+ IF(NOT ${_name}_PLUGIN_FORBIDDEN)
+ KDE3_AUTOMOC(${_SRCS})
- QT3_ADD_UI_FILES(_srcs ${_uics})
+ QT3_ADD_UI_FILES(_SRCS ${_UICS})
- ADD_LIBRARY(${_name} SHARED ${_srcs} ${_hdrs})
+ ADD_LIBRARY(${_name} SHARED ${_SRCS} ${_HDRS} ${_MEDIA} ${_NON_SRC_TARGETS})
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
- TARGET_LINK_LIBRARIES(${_name} simlib ${_libs})
+ TARGET_LINK_LIBRARIES(${_name} simlib ${_LIBS})
- SET_TARGET_PROPERTIES(${_name} PROPERTIES PREFIX "")
+ SET_TARGET_PROPERTIES(${_name} PROPERTIES PREFIX "")
- INSTALL(TARGETS ${_name} LIBRARY DESTINATION ${SIM_PLUGIN_DIR} RUNTIME DESTINATION ${SIM_PLUGIN_DIR})
+ INSTALL(TARGETS ${_name} LIBRARY DESTINATION ${SIM_PLUGIN_DIR} RUNTIME DESTINATION ${SIM_PLUGIN_DIR})
+ ENDIF(NOT ${_name}_PLUGIN_FORBIDDEN)
ENDMACRO(SIM_ADD_PLUGIN)
MACRO(SIM_FIND_PLUGINS sim_plugin_dir)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/cmake/XGetText.cmake
^
|
| @@ -4,7 +4,7 @@
IF (XGETTEXT_EXECUTABLE)
MESSAGE(STATUS "Found kde-xgettext: ${XGETTEXT_EXECUTABLE}")
ELSE()
- MESSAGE(SATUS "Xgettext not found")
+ MESSAGE(SATUS "kde-xgettext not found")
ENDIF()
FIND_PROGRAM(MSGMERGE_EXECUTABLE msgmerge)
|
|
[-]
[+]
|
Added |
sim-0.9.5.tar.bz2/cmake/cmake_make_dist.cmake.in
^
|
| @@ -0,0 +1,114 @@
+# Copyright (c) 2009, Swami Dhyan Nataraj (Nikolay Shaplov), <n@shaplov.ru>
+#
+# Redistribution and use is allowed according to the terms of
+# GNU Public License version 2 or later
+
+SET(_dist_type @DIST_TYPE@)
+
+IF(_dist_type)
+ SET(_manifest_postfix "-${_dist_type}")
+ SET(_base_name_postfix "_${_dist_type}")
+ENDIF(_dist_type)
+
+SET(_manifest "@CMAKE_CURRENT_BINARY_DIR@/make-dist${_manifest_postfix}.manifest.txt")
+
+IF(NOT EXISTS "${_manifest}")
+ MESSAGE(FATAL_ERROR "Cannot find make dist manifest: \"${_manifest}\"")
+ENDIF(NOT EXISTS "${_manifest}")
+
+SET(_base_name "sim-im_@Sim-IM_VERSION@")
+SET(_dev @DEV_BUILD@)
+IF(_dev)
+ SET(_base_name "${_base_name}~svn@Sim-IM_WC_REVISION@")
+ENDIF(_dev)
+SET(_base_name "${_base_name}${_base_name_postfix}")
+
+
+MESSAGE("Creating ${_base_name} source package:")
+MESSAGE(" Prepearing files...")
+EXECUTE_PROCESS(
+ COMMAND @CMAKE_COMMAND@ -E remove_directory "@CMAKE_CURRENT_BINARY_DIR@/${_base_name}"
+ OUTPUT_VARIABLE _out
+ RESULT_VARIABLE _res
+)
+
+FILE(READ "${_manifest}" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ FILE(RELATIVE_PATH rel_file_name "@Sim-IM_SOURCE_DIR@" ${file})
+# MESSAGE(STATUS "${rel_file_name}")
+ IF(EXISTS "${file}")
+
+ EXECUTE_PROCESS(
+ COMMAND @CMAKE_COMMAND@ -E copy "${rel_file_name}" "@CMAKE_CURRENT_BINARY_DIR@/${_base_name}/${rel_file_name}"
+ OUTPUT_VARIABLE _out
+ RESULT_VARIABLE _res
+ ERROR_VARIABLE _err
+ WORKING_DIRECTORY "@Sim-IM_SOURCE_DIR@"
+ )
+ IF(_res)
+ MESSAGE(FATAL_ERROR "Error coping file ${rel_file_name}:\n ${_err}")
+ ENDIF(_res)
+
+ ELSE(EXISTS "${file}")
+ MESSAGE(FATAL_ERROR "File \"${file}\" does not exist.")
+ ENDIF(EXISTS "${file}")
+ENDFOREACH(file)
+
+IF(_dev)
+ FILE(WRITE "@CMAKE_CURRENT_BINARY_DIR@/${_base_name}/cmake/StaticRevDefinition.cmake"
+ "# This file were automaticly created by 'make dist' in order to remember sorce revision when all .svn files are lost\n"
+ "SET(Sim-IM_WC_REVISION \"@Sim-IM_WC_REVISION@\")\n"
+ )
+ENDIF(_dev)
+
+MESSAGE(" Creating ${_base_name}.tar.gz...")
+
+EXECUTE_PROCESS(
+ COMMAND @CMAKE_COMMAND@ -E tar -cvzf ${_base_name}.tar.gz ${_base_name}
+ OUTPUT_VARIABLE _out
+ RESULT_VARIABLE _res
+ ERROR_VARIABLE _err
+ WORKING_DIRECTORY @CMAKE_CURRENT_BINARY_DIR@
+)
+IF(_res)
+ MESSAGE(FATAL_ERROR "Error creating tar.gz archive:\n ${_err}")
+ENDIF(_res)
+
+SET(BZIP2_EXECUTABLE "@BZIP2_EXECUTABLE@")
+IF(BZIP2_EXECUTABLE)
+ MESSAGE(" Creating ${_base_name}.tar.bz2...")
+ EXECUTE_PROCESS(
+ COMMAND @CMAKE_COMMAND@ -E tar -cvf ${_base_name}.tar ${_base_name}
+ OUTPUT_VARIABLE _out
+ RESULT_VARIABLE _res
+ ERROR_VARIABLE _err
+ WORKING_DIRECTORY @CMAKE_CURRENT_BINARY_DIR@
+ )
+ IF(_res)
+ MESSAGE(FATAL_ERROR "Error creating tar archive:\n ${_err}")
+ ENDIF(_res)
+
+ EXECUTE_PROCESS(
+ COMMAND @BZIP2_EXECUTABLE@ -f ${_base_name}.tar
+ OUTPUT_VARIABLE _out
+ RESULT_VARIABLE _res
+ ERROR_VARIABLE _err
+ WORKING_DIRECTORY @CMAKE_CURRENT_BINARY_DIR@
+ )
+ IF(_res)
+ MESSAGE(FATAL_ERROR "Error b2zipping tar archive:\n ${_err}")
+ ENDIF(_res)
+
+ELSE(BZIP2_EXECUTABLE)
+ MESSAGE(" bizp not fond: tar.bz2 archive were not created")
+ENDIF(BZIP2_EXECUTABLE)
+
+
+MESSAGE(" Cleanup"...)
+EXECUTE_PROCESS(
+ COMMAND @CMAKE_COMMAND@ -E remove_directory "@CMAKE_CURRENT_BINARY_DIR@/${_base_name}"
+ OUTPUT_VARIABLE _out
+ RESULT_VARIABLE _res
+)
+
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/config.h.cmake
^
|
| @@ -1,6 +1,6 @@
// version
#define PACKAGE "sim"
-#define VERSION "0.9.5"
+#define VERSION "${Sim-IM_VERSION}"
#define REVISION_NUMBER "${Sim-IM_WC_REVISION}"
#define PREFIX "${CMAKE_INSTALL_PREFIX}"
#define PLUGIN_PATH "${SIM_PLUGIN_DIR}"
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/__homedir/CMakeLists.txt
^
|
| @@ -2,28 +2,14 @@
# __homedir library #
#####################
-#conditional sources
-IF(WIN32)
- SET (__homedir_SRCS homedircfg.cpp)
- SET (__homedir_HDRS homedircfg.h)
- SET (__homedir_UICS homedircfgbase.ui)
-ENDIF(WIN32)
+SET(__homedir_PLATFORMS COMMON WIN32)
-SET(__homedir_SRCS
- homedir.cpp
- ${__homedir_SRCS}
-)
+SET (__homedir_SRCS_COMMON homedir.cpp )
+SET (__homedir_SRCS_WIN32 homedircfg.cpp)
-SET(__homedir_HDRS
- homedir.h
- ${__homedir_HDRS}
-)
+SET (__homedir_HDRS_COMMON homedir.h )
+SET (__homedir_HDRS_WIN32 homedircfg.h)
-SET(__homedir_MESSAGE_SOURCES ${__homedir_SRCS} ${__homedir_UICS})
-IF(NOT WIN32)
- SET(__homedir_MESSAGE_SOURCES ${__homedir_MESSAGE_SOURCES} homedircfgbase.ui homedircfg.cpp PARENT_SCOPE)
-ELSE(NOT WIN32)
- SET(__homedir_MESSAGE_SOURCES ${__homedir_MESSAGE_SOURCES} PARENT_SCOPE)
-ENDIF(NOT WIN32)
+SET (__homedir_UICS_WIN32 homedircfgbase.ui)
SIM_ADD_PLUGIN(__homedir)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/__migrate/CMakeLists.txt
^
|
| @@ -1,20 +1,18 @@
#####################
# __migrate library #
#####################
-SET(__migrate_SRCS
- migrate.cpp
- migratedlg.cpp
-)
-SET(__migrate_HDRS
- migrate.h
- migratedlg.h
+
+SET(__migrate_PLATFORMS COMMON)
+
+SET(__migrate_SRCS_COMMON migrate.cpp
+ migratedlg.cpp
)
-SET(__migrate_UICS
- migratedlgbase.ui
+SET(__migrate_HDRS_COMMON migrate.h
+ migratedlg.h
)
-SET(__migrate_MESSAGE_SOURCES ${__migrate_SRCS} ${__migrate_UICS} PARENT_SCOPE)
+SET(__migrate_UICS_COMMON migratedlgbase.ui)
SIM_ADD_PLUGIN(__migrate)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/_core/CMakeLists.txt
^
|
| @@ -4,197 +4,169 @@
ADD_SUBDIRECTORY(pict)
ADD_SUBDIRECTORY(styles)
-SET(_core_SRCS
- arcfg.cpp
- autoreply.cpp
- cfgdlg.cpp
- cmenu.cpp
- commands.cpp
- connectionsettings.cpp
- connectwnd.cpp
- container.cpp
- core.cpp
- declinedlg.cpp
- editmail.cpp
- editphone.cpp
- filecfg.cpp
- filetransfer.cpp
- history.cpp
- historycfg.cpp
- historywnd.cpp
- interfacecfg.cpp
- kpopup.cpp
- logindlg.cpp
- maininfo.cpp
- mainwin.cpp
- manager.cpp
- msgauth.cpp
- msgcfg.cpp
- msgcontacts.cpp
- msgedit.cpp
- msgfile.cpp
- msggen.cpp
- msgrecv.cpp
- msgsms.cpp
- msgurl.cpp
- msgview.cpp
- msgview_menu.cpp
- newprotocol.cpp
- nonim.cpp
- pagerdetails.cpp
- phonedetails.cpp
- plugincfg.cpp
- prefcfg.cpp
- search.cpp
- searchall.cpp
- smscfg.cpp
- status.cpp
- statuswnd.cpp
- textedit_menu.cpp
- tmpl.cpp
- toolbar_container.cpp
- toolbar_history.cpp
- toolbar_main.cpp
- toolbar_msgedit.cpp
- toolbar_textedit.cpp
- toolbarcfg.cpp
- toolsetup.cpp
- usercfg.cpp
- userhistorycfg.cpp
- userlist.cpp
- userview.cpp
- userviewcfg.cpp
- userwnd.cpp
-)
-
-# is this really needed?
-IF(NOT WIN32)
-SET(_core_SRCS
- ${_core_SRCS}
- libintl.cpp
- )
-ENDIF(NOT WIN32)
-
-SET(_core_HDRS
- arcfg.h
- autoreply.h
- cfgdlg.h
- cmenu.h
- commands.h
- connectionsettings.h
- connectwnd.h
- container.h
- core.h
- core_consts.h
- core_events.h
- declinedlg.h
- editmail.h
- editphone.h
- filecfg.h
- filetransfer.h
- history.h
- historycfg.h
- historywnd.h
- interfacecfg.h
- kpopup.h
- logindlg.h
- maininfo.h
- mainwin.h
- manager.h
- msgauth.h
- msgcfg.h
- msgcontacts.h
- msgedit.h
- msgfile.h
- msggen.h
- msgrecv.h
- msgsms.h
- msgurl.h
- msgview.h
- newprotocol.h
- nonim.h
- pagerdetails.h
- phonedetails.h
- plugincfg.h
- prefcfg.h
- search.h
- searchall.h
- smscfg.h
- status.h
- statuswnd.h
- tmpl.h
- toolbarcfg.h
- toolsetup.h
- usercfg.h
- userhistorycfg.h
- userlist.h
- userview.h
- userviewcfg.h
- userwnd.h
-)
-
-SET(_core_UICS
- arcfgbase.ui
- autoreplybase.ui
- cfgdlgbase.ui
- connectionsettingsbase.ui
- connectwndbase.ui
- declinedlgbase.ui
- editmailbase.ui
- editphonebase.ui
- filecfgbase.ui
- filetransferbase.ui
- fontconfigbase.ui
- historycfgbase.ui
- interfacecfgbase.ui
- logindlgbase.ui
- maininfobase.ui
- managerbase.ui
- msgcfgbase.ui
- newprotocolbase.ui
- nonimbase.ui
- pagerbase.ui
- phonebase.ui
- plugincfgbase.ui
- prefcfgbase.ui
- searchallbase.ui
- searchbase.ui
- smscfgbase.ui
- toolsetupbase.ui
- userhistorycfgbase.ui
- userviewcfgbase.ui
-)
+SET(_core_PLATFORMS COMMON NON_WIN32)
-# so we don't need an extra CMakeLists.txt in every subdirectory
-ADD_JISP_ARCHIVE(jisp sim.jisp _core_SRCS)
+SET(_core_SRCS_COMMON arcfg.cpp
+ autoreply.cpp
+ cfgdlg.cpp
+ cmenu.cpp
+ commands.cpp
+ connectionsettings.cpp
+ connectwnd.cpp
+ container.cpp
+ core.cpp
+ declinedlg.cpp
+ editmail.cpp
+ editphone.cpp
+ filecfg.cpp
+ filetransfer.cpp
+ history.cpp
+ historycfg.cpp
+ historywnd.cpp
+ interfacecfg.cpp
+ kpopup.cpp
+ logindlg.cpp
+ maininfo.cpp
+ mainwin.cpp
+ manager.cpp
+ msgauth.cpp
+ msgcfg.cpp
+ msgcontacts.cpp
+ msgedit.cpp
+ msgfile.cpp
+ msggen.cpp
+ msgrecv.cpp
+ msgsms.cpp
+ msgurl.cpp
+ msgview.cpp
+ msgview_menu.cpp
+ newprotocol.cpp
+ nonim.cpp
+ pagerdetails.cpp
+ phonedetails.cpp
+ plugincfg.cpp
+ prefcfg.cpp
+ search.cpp
+ searchall.cpp
+ smscfg.cpp
+ status.cpp
+ statuswnd.cpp
+ textedit_menu.cpp
+ tmpl.cpp
+ toolbar_container.cpp
+ toolbar_history.cpp
+ toolbar_main.cpp
+ toolbar_msgedit.cpp
+ toolbar_textedit.cpp
+ toolbarcfg.cpp
+ toolsetup.cpp
+ usercfg.cpp
+ userhistorycfg.cpp
+ userlist.cpp
+ userview.cpp
+ userviewcfg.cpp
+ userwnd.cpp )
+SET(_core_SRCS_NON_WIN32 libintl.cpp ) # is this really needed? _core (at least without KDE support) is successfully built without it
+
+SET(_core_HDRS_COMMON arcfg.h
+ autoreply.h
+ cfgdlg.h
+ cmenu.h
+ commands.h
+ connectionsettings.h
+ connectwnd.h
+ container.h
+ core.h
+ core_consts.h
+ core_events.h
+ declinedlg.h
+ editmail.h
+ editphone.h
+ filecfg.h
+ filetransfer.h
+ history.h
+ historycfg.h
+ historywnd.h
+ interfacecfg.h
+ kpopup.h
+ logindlg.h
+ maininfo.h
+ mainwin.h
+ manager.h
+ msgauth.h
+ msgcfg.h
+ msgcontacts.h
+ msgedit.h
+ msgfile.h
+ msggen.h
+ msgrecv.h
+ msgsms.h
+ msgurl.h
+ msgview.h
+ newprotocol.h
+ nonim.h
+ pagerdetails.h
+ phonedetails.h
+ plugincfg.h
+ prefcfg.h
+ search.h
+ searchall.h
+ smscfg.h
+ status.h
+ statuswnd.h
+ tmpl.h
+ toolbarcfg.h
+ toolsetup.h
+ usercfg.h
+ userhistorycfg.h
+ userlist.h
+ userview.h
+ userviewcfg.h
+ userwnd.h )
+
+SET(_core_UICS_COMMON arcfgbase.ui
+ autoreplybase.ui
+ cfgdlgbase.ui
+ connectionsettingsbase.ui
+ connectwndbase.ui
+ declinedlgbase.ui
+ editmailbase.ui
+ editphonebase.ui
+ filecfgbase.ui
+ filetransferbase.ui
+ fontconfigbase.ui
+ historycfgbase.ui
+ interfacecfgbase.ui
+ logindlgbase.ui
+ maininfobase.ui
+ managerbase.ui
+ msgcfgbase.ui
+ newprotocolbase.ui
+ nonimbase.ui
+ pagerbase.ui
+ phonebase.ui
+ plugincfgbase.ui
+ prefcfgbase.ui
+ searchallbase.ui
+ searchbase.ui
+ smscfgbase.ui
+ toolsetupbase.ui
+ userhistorycfgbase.ui
+ userviewcfgbase.ui )
+
+
+IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GPL-Icons/icondef.xml)
+ ADD_JISP_ARCHIVE(GPL-Icons GPL-Icons.jisp _core_NON_SRC_TARGETS)
+ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GPL-Icons/icondef.xml)
IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/jisp/icondef.xml)
- message( "Using non-GPL icons" )
- ADD_JISP_ARCHIVE(GPL-Icons GPL-Icons.jisp _core_SRCS)
-ELSE (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/jisp/icondef.xml)
- message( "Using GPL icons" )
- # substitute with gpl icons
- ADD_JISP_ARCHIVE(GPL-Icons sim.jisp _core_SRCS)
+ ADD_JISP_ARCHIVE(jisp sim.jisp _core_NON_SRC_TARGETS non-free)
ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/jisp/icondef.xml)
-#ADD_JISP_ARCHIVE(smiles smiles.jisp _core_SRCS)
-#ADD_JISP_ARCHIVE(additional additional.jisp _core_SRCS)
-#ADD_JISP_ARCHIVE(icq5 icq5.jisp _core_SRCS)
-#ADD_JISP_ARCHIVE(icq5.1 icq5.1.jisp _core_SRCS)
-#ADD_JISP_ARCHIVE(icqlite icqlite.jisp _core_SRCS)
-#ADD_JISP_ARCHIVE(qip-icons qip-icons.jisp _core_SRCS)
-#ADD_JISP_ARCHIVE(lovenmoney lovenmoney.jisp _core_SRCS)
-#ADD_JISP_ARCHIVE(yahoo yahoo.jisp _core_SRCS)
-#ADD_JISP_ARCHIVE(msn msn.jisp _core_SRCS)
-
FILE(GLOB _prebuilt emoticons_prebuilt/*.jisp)
INSTALL(FILES ${_prebuilt} DESTINATION ${SIM_ICONS_DIR})
-
-SET(_core_MESSAGE_SOURCES ${_core_SRCS} ${_core_UICS})
-IF(WIN32)
- SET(_core_MESSAGE_SOURCES ${_core_MESSAGE_SOURCES} libintl.cpp PARENT_SCOPE)
-ELSE(WIN32)
- SET(_core_MESSAGE_SOURCES ${_core_MESSAGE_SOURCES} PARENT_SCOPE)
-ENDIF(WIN32)
+FOREACH(file ${_prebuilt})
+ ADD_TO_DIST_TARGET(${file} non-free)
+ENDFOREACH(file ${_prebuilt})
SIM_ADD_PLUGIN(_core)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/Makefile.in
^
|
| @@ -572,7 +572,7 @@
.NOEXPORT:
#>+ 2
-KDE_DIST=grp_off.png collapsed.png floating.png gadu_away.png auth.png group_collapsed.png work.png filesave.png unknown_icon_1.png fax.png file.png no_phone.png run.png yahoo_away.png online_on.png button_ok.png home.png SMS-protocol.png fonts.png group_expanded.png empty.png gadu_invisible.png fileopen.png gadu_dnd.png yahoo_offline.png mail_generic.png def_status_away.png network.png jabber_offline.png yahoo_invisible.png icq_online.png non-im-contact.png 1leftarrow.png exit.png contacts.png message.png security.png grp_on.png 1uparrow.png icondef.xml yahoo_online.png grp_rename.png gadu_online.png phone.png online_off.png sms.png jabber.png configure.png find_user.png msn_online.png 1rightarrow.png def_status_ffc.png error.png birthday.png webpress.png yahoo_dnd.png grp_create.png expanded.png remove.png Makefile.in pager.png cell.png def_status_dnd.png gadu_offline.png 1downarrow.png url.png aim_online.png sim.png yahoo_na.png def_status_na.png Makefile.am button_cancel.png def_status_occupied.png
+KDE_DIST=grp_off.png collapsed.png floating.png gadu_away.png unknown_icon_4.png auth.png group_collapsed.png work.png filesave.png unknown_icon_1.png fax.png file.png no_phone.png more_info.png run.png yahoo_away.png online_on.png button_ok.png home.png SMS-protocol.png fonts.png education.png unknown_icon_6.png group_expanded.png empty.png gadu_invisible.png fileopen.png gadu_dnd.png yahoo_offline.png mail_generic.png interest.png icq-phone.png msn_onphone.png def_status_away.png connect.png network.png jabber_offline.png icq-phone-busy.png register.png yahoo_invisible.png icq_online.png non-im-contact.png 1leftarrow.png exit.png contacts.png message.png security.png grp_on.png 1uparrow.png icondef.xml yahoo_online.png grp_rename.png gadu_online.png phone.png online_off.png sms.png jabber.png configure.png find_user.png msn_online.png 1rightarrow.png msn_lunch.png def_status_ffc.png web-panel.png msn_onback.png error.png birthday.png webpress.png yahoo_dnd.png grp_create.png expanded.png remove.png unknown_icon_5.png Makefile.in cell.png pager.png unknown_icon_3.png def_status_dnd.png gadu_offline.png 1downarrow.png url.png aim_online.png sim.png yahoo_na.png def_status_na.png unknown_icon_2.png Makefile.am button_cancel.png def_status_occupied.png
#>+ 2
docs-am:
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/connect.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/education.png
^
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/icondef.xml
^
|
| @@ -427,11 +427,112 @@
<!-- Author: Nikolay Shaplov N@shaplov.ru -->
<!-- Sources: http://websvn.kde.org/tags/KDE/3.5.9/kdebase/kcontrol/pics/cr16-app-cookie.png -->
<!-- http://websvn.kde.org/tags/KDE/3.5.9/kdebase/kcontrol/pics/cr64-app-cookie.png -->
-
</icon>
-
-
-
-
-
+
+ <icon name="more">
+ <object mime="image/png">more_info.png</object>
+ <!-- Licence: GNU/LGPL -->
+ <!-- Author: Everaldo Coelho -->
+ <!-- Source: http://shaplov.ru/files/crystal-clear-icons/CrystalClear_2006-10-28_01:14:48.tar.gz 16x16/apps/access.png -->
+
+ <!--FIXME: icon "more" is alse used as a button icon for date picker. We should use two different icons for
+ "ICQ more info" and for "date picker" -->
+ </icon>
+ <icon name="interest">
+ <object mime="image/png">interest.png</object>
+ <!-- Licence: GNU/LGPL -->
+ <!-- Authors: Daria Mihailova, Nikolay Shaolov -->
+ <!-- Sources: http://shaplov.ru/files/crystal-clear-icons/CrystalClear_2006-10-28_01:14:48.tar.gz 16x16/apps/kguitar.png -->
+ <!-- Socker Ball drawn by Daria Mihailova -->
+
+ </icon>
+ <icon name="past">
+ <object mime="image/png">education.png</object>
+ <!-- Licence: GNU/LGPL -->
+ <!-- Author: David Vignoni -->
+ <!-- Source: http://www.icon-king.com/files/nuvola-1.0.tar.gz 16x16/apps/package_edutainment.png -->
+ </icon>
+
+ <icon name="useronline">
+ <object mime="image/png">unknown_icon_2.png</object>
+ <!-- "useronline" icon is mentioned in original Sim-IM jisp set, but I do not know where it is used -->
+ <!-- there is no such icon entry in source code (at least I didn't find it) -->
+ <!-- So this icon entry will be associated with black square with number 2 on it, for a while -->
+ <!-- and if nobody managed to find where it is used, it should be removed from here -->
+ </icon>
+
+ <icon name="useroffline">
+ <object mime="image/png">unknown_icon_3.png</object>
+ <!-- "useroffline" icon is mentioned in original Sim-IM jisp set, but I do not know where it is used -->
+ <!-- there is no such icon entry in source code (at least I didn't find it) -->
+ <!-- So this icon entry will be associated with black square with number 3 on it, for a while -->
+ <!-- and if nobody managed to find where it is used, it should be removed from here -->
+ </icon>
+ <icon name="userunknown">
+ <object mime="image/png">unknown_icon_4.png</object>
+ <!-- "userunknown" icon is mentioned in original Sim-IM jisp set, but I do not know where it is used -->
+ <!-- there is no such icon entry in source code (at least I didn't find it) -->
+ <!-- So this icon entry will be associated with black square with number 4 on it, for a while -->
+ <!-- and if nobody managed to find where it is used, it should be removed from here -->
+ </icon>
+ <icon name="web">
+ <object mime="image/png">web-panel.png</object>
+ <!-- Licence: GNU/LGPL -->
+ <!-- Author: Everaldo Coelho -->
+ <!-- Source: http://shaplov.ru/files/crystal-clear-icons/CrystalClear_2006-10-28_01:14:48.tar.gz 16x16/actions/agt_web.png -->
+ </icon>
+ <icon name="mailpager">
+ <object mime="image/png">unknown_icon_5.png</object>
+ <!-- Mail-pager feature should be removed from Sim-IM, see bug #16318. So, no real icon here -->
+ </icon>
+ <icon name="icqphone">
+ <object mime="image/png">icq-phone.png</object>
+ <!-- Licence: GNU/LGPL -->
+ <!-- Author: Everaldo Coelho -->
+ <!-- Source: http://shaplov.ru/files/crystal-clear-icons/CrystalClear_2006-10-28_01:14:48.tar.gz 16x16/apps/sipphone.png -->
+ <!-- FIXME: Do not know where and when this icon is shown -->
+ </icon>
+ <icon name="icqphonebusy">
+ <object mime="image/png">icq-phone-busy.png</object>
+ <!-- Licence: GNU/LGPL -->
+ <!-- Author: Nikolay Shaplov N@shaplov.ru -->
+ <!-- Sources: http://shaplov.ru/files/crystal-clear-icons/CrystalClear_2006-10-28_01:14:48.tar.gz 16x16/apps/sipphone.png -->
+ <!-- http://shaplov.ru/files/crystal-clear-icons/CrystalClear_2006-10-28_01:14:48.tar.gz 16x16/actions/yahoo_busy.png -->
+ <!-- FIXME: Do not know where and when this icon is shown -->
+ </icon>
+ <icon name="sharedfiles">
+ <object mime="image/png">unknown_icon_6.png</object>
+ <!-- Shared files feature seems to be disabled at AOL, see bug #16423 -->
+ <!-- So this icon should never appeared in Sim-IM-->
+ </icon>
+ <icon name="reg">
+ <object mime="image/png">register.png</object>
+ <!-- Licence: GNU/LGPL -->
+ <!-- Author: David Vignoni -->
+ <!-- Source: http://www.icon-king.com/files/nuvola-1.0.tar.gz 16x16/apps/cache.png -->
+ </icon>
+ <icon name="connect">
+ <object mime="image/png">connect.png</object>
+ <!-- Licence: GNU/GPL -->
+ <!-- Source: http://websvn.kde.org/tags/KDE/3.5.9/kdelibs/pics/crystalsvg/cr16-action-connect_established.png -->
+ </icon>
+ <icon name="lunch">
+ <object mime="image/png">msn_lunch.png</object>
+ <!-- Licence: GNU/LGPL -->
+ <!-- Author: Everaldo Coelho -->
+ <!-- Source: http://shaplov.ru/files/crystal-clear-icons/CrystalClear_2006-10-28_01:14:48.tar.gz 16x16/actions/msn_lunch.png -->
+ </icon>
+ <icon name="onback">
+ <object mime="image/png">msn_onback.png</object>
+ <!-- Licence: GNU/LGPL -->
+ <!-- Author: Everaldo Coelho -->
+ <!-- Source: http://shaplov.ru/files/crystal-clear-icons/CrystalClear_2006-10-28_01:14:48.tar.gz 16x16/actions/msn_away.png -->
+ </icon>
+ <icon name="onphone">
+ <object mime="image/png">msn_onphone.png</object>
+ <!-- Licence: GNU/LGPL -->
+ <!-- Author: Everaldo Coelho -->
+ <!-- Source: http://shaplov.ru/files/crystal-clear-icons/CrystalClear_2006-10-28_01:14:48.tar.gz 16x16/actions/msn_phone.png -->
+ </icon>
+
</icondef>
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/icq-phone-busy.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/icq-phone.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/interest.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/more_info.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/msn_lunch.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/msn_onback.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/msn_onphone.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/register.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/unknown_icon_2.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/unknown_icon_3.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/unknown_icon_4.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/unknown_icon_5.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/unknown_icon_6.png
^
|
|
|
Added |
sim-0.9.5.tar.bz2/plugins/_core/GPL-Icons/web-panel.png
^
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/_core/pict/CMakeLists.txt
^
|
| @@ -1,7 +1,9 @@
-# install only
-
FILE(GLOB mng *.mng)
-FILE(GLOB png *.png)
INSTALL(FILES ${mng} DESTINATION ${SIM_PICT_DIR})
-INSTALL(FILES ${png} DESTINATION ${SIM_PICT_DIR})
+
+FOREACH(file ${mng})
+ ADD_TO_DIST_TARGET("${file}")
+ENDFOREACH(file)
+
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt")
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/_core/styles/CMakeLists.txt
^
|
| @@ -20,3 +20,8 @@
ENDFOREACH(FILE)
INSTALL(FILES ${styles} DESTINATION ${SIM_STYLES_DIR})
+
+FOREACH(file ${styles})
+ ADD_TO_DIST_TARGET("${file}")
+ENDFOREACH(file)
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt")
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/about/CMakeLists.txt
^
|
| @@ -2,20 +2,15 @@
# about library #
#################
-SET(about_SRCS
- about.cpp
- aboutdlg.cpp
-)
-
-SET(about_HDRS
- about.h
- aboutdlg.h
-)
-
-SET(about_UICS
- aboutdlgbase.ui
-)
+SET(about_PLATFORMS COMMON)
-SET(about_MESSAGE_SOURCES ${about_SRCS} ${about_UICS} PARENT_SCOPE)
+
+SET(about_SRCS_COMMON about.cpp
+ aboutdlg.cpp)
+
+SET(about_HDRS_COMMON about.h
+ aboutdlg.h)
+
+SET(about_UICS_COMMON aboutdlgbase.ui)
SIM_ADD_PLUGIN(about)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/action/CMakeLists.txt
^
|
| @@ -1,27 +1,21 @@
##################
# action library #
##################
-SET(action_SRCS
- action.cpp
- actioncfg.cpp
- additem.cpp
- menucfg.cpp
-)
-SET(action_HDRS
- action.h
- actioncfg.h
- additem.h
- menucfg.h
-)
+SET(action_PLATFORMS COMMON)
-SET(action_UICS
- actioncfgbase.ui
- additembase.ui
- menucfgbase.ui
-)
+SET(action_SRCS_COMMON action.cpp
+ actioncfg.cpp
+ additem.cpp
+ menucfg.cpp)
-SET(action_MESSAGE_SOURCES ${action_SRCS} ${action_UICS} PARENT_SCOPE)
+SET(action_HDRS_COMMON action.h
+ actioncfg.h
+ additem.h
+ menucfg.h)
+SET(action_UICS_COMMON actioncfgbase.ui
+ additembase.ui
+ menucfgbase.ui)
SIM_ADD_PLUGIN(action)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/autoaway/CMakeLists.txt
^
|
| @@ -1,3 +1,21 @@
+####################
+# autoaway library #
+####################
+
+SET(autoaway_PLATFORMS COMMON WIN32)
+
+SET(autoaway_SRCS_COMMON autoaway.cpp
+ autoawaycfg.cpp)
+SET(autoaway_SRCS_WIN32 idleui.cpp)
+
+
+SET(autoaway_HDRS_COMMON autoaway.h
+ autoawaycfg.h)
+SET(autoaway_HDRS_WIN32 idleui.h)
+
+
+SET(autoaway_UICS_COMMON autoawaycfgbase.ui)
+
IF(NOT WIN32)
INCLUDE(CheckFunctionExists)
INCLUDE(FindX11)
@@ -29,40 +47,12 @@
ENDIF(NOT WIN32)
IF(COMPILE_PLUGIN)
- ####################
- # autoaway library #
- ####################
- SET(autoaway_SRCS
- autoaway.cpp
- autoawaycfg.cpp
- )
-
- SET(autoaway_HDRS
- autoaway.h
- autoawaycfg.h
- )
-
- SET(autoaway_UICS
- autoawaycfgbase.ui
- )
-
- IF(WIN32)
- SET(autoaway_SRCS
- ${autoaway_SRCS}
- idleui.cpp
- )
- SET(autoaway_HDRS
- ${autoaway_HDRS}
- idleui.h
- )
- ENDIF(WIN32)
-
LINK_DIRECTORIES(${X11_LIBRARY_DIR})
INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
SIM_ADD_PLUGIN(autoaway)
TARGET_LINK_LIBRARIES(autoaway ${XSS_LIB})
ELSE(COMPILE_PLUGIN)
MESSAGE(STATUS "XScreenSaver library not found, autoaway plugin disabled")
+ SET(autoaway_PLUGIN_FORBIDDEN 1)
+ SIM_ADD_PLUGIN(autoaway) # for update-messages and make dist purposes
ENDIF(COMPILE_PLUGIN)
-
-SET(autoaway_MESSAGE_SOURCES autoaway.cpp autoawaycfg.cpp autoawaycfgbase.ui idleui.cpp PARENT_SCOPE)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/background/CMakeLists.txt
^
|
| @@ -1,20 +1,14 @@
######################
# background library #
######################
-SET(background_SRCS
- background.cpp
- bkgndcfg.cpp
-)
+SET(background_PLATFORMS COMMON)
-SET(background_HDRS
- background.h
- bkgndcfg.h
-)
+SET(background_SRCS_COMMON background.cpp
+ bkgndcfg.cpp)
-SET(background_UICS
- bkgndcfgbase.ui
-)
+SET(background_HDRS_COMMON background.h
+ bkgndcfg.h)
-SET(background_MESSAGE_SOURCES ${background_SRCS} ${background_UICS} PARENT_SCOPE)
+SET(background_UICS_COMMON bkgndcfgbase.ui)
SIM_ADD_PLUGIN(background)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/dock/CMakeLists.txt
^
|
| @@ -1,22 +1,17 @@
################
# dock library #
################
-SET(dock_SRCS
- dock.cpp
- dockcfg.cpp
- dockwnd.cpp
-)
-SET(dock_HDRS
- dock.h
- dockcfg.h
- dockwnd.h
-)
+SET(dock_PLATFORMS COMMON)
-SET(dock_UICS
- dockcfgbase.ui
-)
+SET(dock_SRCS_COMMON dock.cpp
+ dockcfg.cpp
+ dockwnd.cpp)
-SET(dock_MESSAGE_SOURCES ${dock_SRCS} ${dock_UICS} PARENT_SCOPE)
+SET(dock_HDRS_COMMON dock.h
+ dockcfg.h
+ dockwnd.h)
+
+SET(dock_UICS_COMMON dockcfgbase.ui)
SIM_ADD_PLUGIN(dock)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/filter/CMakeLists.txt
^
|
| @@ -1,23 +1,18 @@
##################
# filter library #
##################
-SET(filter_SRCS
- filter.cpp
- filtercfg.cpp
- ignorelist.cpp
-)
-SET(filter_HDRS
- filter.h
- filtercfg.h
- ignorelist.h
-)
+SET(filter_PLATFORMS COMMON)
-SET(filter_UICS
- filtercfgbase.ui
- ignorelistbase.ui
-)
+SET(filter_SRCS_COMMON filter.cpp
+ filtercfg.cpp
+ ignorelist.cpp)
-SET(filter_MESSAGE_SOURCES ${filter_SRCS} ${filter_UICS} PARENT_SCOPE)
+SET(filter_HDRS_COMMON filter.h
+ filtercfg.h
+ ignorelist.h)
+
+SET(filter_UICS_COMMON filtercfgbase.ui
+ ignorelistbase.ui)
SIM_ADD_PLUGIN(filter)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/floaty/CMakeLists.txt
^
|
| @@ -1,16 +1,12 @@
##################
# floaty library #
##################
-SET(floaty_SRCS
- floaty.cpp
- floatywnd.cpp
-)
+SET(floaty_PLATFORMS COMMON)
-SET(floaty_HDRS
- floaty.h
- floatywnd.h
-)
+SET(floaty_SRCS_COMMON floaty.cpp
+ floatywnd.cpp)
-SET(floaty_MESSAGE_SOURCES ${floaty_SRCS} PARENT_SCOPE)
+SET(floaty_HDRS_COMMON floaty.h
+ floatywnd.h)
SIM_ADD_PLUGIN(floaty)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/forward/CMakeLists.txt
^
|
| @@ -1,20 +1,15 @@
###################
# forward library #
###################
-SET(forward_SRCS
- forward.cpp
- forwardcfg.cpp
-)
-SET(forward_HDRS
- forward.h
- forwardcfg.h
-)
+SET(forward_PLATFORMS COMMON)
-SET(forward_UICS
- forwardcfgbase.ui
-)
+SET(forward_SRCS_COMMON forward.cpp
+ forwardcfg.cpp)
-SET(forward_MESSAGE_SOURCES ${forward_SRCS} ${forward_UICS} PARENT_SCOPE)
+SET(forward_HDRS_COMMON forward.h
+ forwardcfg.h)
+
+SET(forward_UICS_COMMON forwardcfgbase.ui)
SIM_ADD_PLUGIN(forward)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/gpg/CMakeLists.txt
^
|
| @@ -1,46 +1,29 @@
###############
# gpg library #
###############
-IF(WIN32)
- SET (gpg_SRCS gpgfind.cpp)
- SET (gpg_HDRS gpgfind.h)
- SET (gpg_UICS gpgfindbase.ui)
-ENDIF(WIN32)
+SET(gpg_PLATFORMS COMMON WIN32)
-SET(gpg_SRCS
- gpg.cpp
- gpgadv.cpp
- gpgcfg.cpp
- gpggen.cpp
- gpguser.cpp
- passphrase.cpp
- ${gpg_SRCS}
-)
+SET(gpg_SRCS_COMMON gpg.cpp
+ gpgadv.cpp
+ gpgcfg.cpp
+ gpggen.cpp
+ gpguser.cpp
+ passphrase.cpp)
+SET(gpg_SRCS_WIN32 gpgfind.cpp)
-SET(gpg_HDRS
- gpg.h
- gpgadv.h
- gpgcfg.h
- gpggen.h
- gpguser.h
- passphrase.h
- ${gpg_HDRS}
-)
+SET(gpg_HDRS_COMMON gpg.h
+ gpgadv.h
+ gpgcfg.h
+ gpggen.h
+ gpguser.h
+ passphrase.h)
+SET(gpg_HDRS_WIN32 gpgfind.h)
-SET(gpg_UICS
- gpgadvbase.ui
- gpgcfgbase.ui
- gpggenbase.ui
- gpguserbase.ui
- passphrasebase.ui
- ${gpg_UICS}
-)
-
-SET(gpg_MESSAGE_SOURCES ${gpg_SRCS} ${gpg_UICS})
-IF(NOT WIN32)
- SET(gpg_MESSAGE_SOURCES ${gpg_MESSAGE_SOURCES} gpgfind.cpp gpgfindbase.ui PARENT_SCOPE)
-ELSE(NOT WIN32)
- SET(gpg_MESSAGE_SOURCES ${gpg_MESSAGE_SOURCES} PARENT_SCOPE)
-ENDIF(NOT WIN32)
+SET(gpg_UICS_COMMON gpgadvbase.ui
+ gpgcfgbase.ui
+ gpggenbase.ui
+ gpguserbase.ui
+ passphrasebase.ui)
+SET(gpg_UICS_WIN32 gpgfindbase.ui)
SIM_ADD_PLUGIN(gpg)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/icons/CMakeLists.txt
^
|
| @@ -1,20 +1,16 @@
#################
# icons library #
#################
-SET(icons_SRCS
- icon.cpp
- iconcfg.cpp
-)
-
-SET(icons_HDRS
- icon.h
- iconcfg.h
-)
-
-SET(icons_UICS
- iconcfgbase.ui
-)
-SET(icons_MESSAGE_SOURCES ${icons_SRCS} ${icons_UICS} PARENT_SCOPE)
+SET(icons_PLATFORMS COMMON)
+
+SET(icons_SRCS_COMMON icon.cpp
+ iconcfg.cpp)
+
+SET(icons_HDRS_COMMON icon.h
+ iconcfg.h)
+
+SET(icons_UICS_COMMON iconcfgbase.ui)
+
SIM_ADD_PLUGIN(icons)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/icq/CMakeLists.txt
^
|
| @@ -1,107 +1,104 @@
###############
# icq library #
###############
-SET(icq_SRCS
- aboutinfo.cpp
- advsearch.cpp
- aimconfig.cpp
- aiminfo.cpp
- aimsearch.cpp
- aimservices.cpp
- encodingdlg.cpp
- homeinfo.cpp
- icq.cpp
- icqbos.cpp
- icqbuddy.cpp
- icqbuffer.cpp
- icqclient.cpp
- icqconfig.cpp
- icqdirect.cpp
- icqicmb.cpp
- icqinfo.cpp
- icqlists.cpp
- icqlocation.cpp
- icqlogin.cpp
- icqmessage.cpp
- icqpicture.cpp
- icqping.cpp
- icqsearch.cpp
- icqsecure.cpp
- icqservice.cpp
- icqssbi.cpp
- icqvarious.cpp
- interestsinfo.cpp
- moreinfo.cpp
- pastinfo.cpp
- polling.cpp
- rtfgen.cpp
- securedlg.cpp
- verifydlg.cpp
- warndlg.cpp
- workinfo.cpp
- xml.cpp
- snac.cpp
-)
-
-SET(icq_HDRS
- aboutinfo.h
- advsearch.h
- aimconfig.h
- aiminfo.h
- aimsearch.h
- encodingdlg.h
- homeinfo.h
- icq.h
- icqbuffer.h
- icqclient.h
- icqconfig.h
- icqicmb.h
- icqinfo.h
- icqlocation.h
- icqmessage.h
- icqdirect.h
- icqpicture.h
- icqsearch.h
- icqsecure.h
- icqservice.h
- icqssbi.h
- interestsinfo.h
- moreinfo.h
- pastinfo.h
- polling.h
- securedlg.h
- verifydlg.h
- warndlg.h
- workinfo.h
- xml.h
- snac.h
-)
-
-SET(icq_UICS
- aboutinfobase.ui
- advsearchbase.ui
- aimconfigbase.ui
- aiminfobase.ui
- aimsearchbase.ui
- encodingdlgbase.ui
- homeinfobase.ui
- icqconfigbase.ui
- icqinfobase.ui
- icqpicturebase.ui
- icqsearchbase.ui
- icqsecurebase.ui
- interestsinfobase.ui
- moreinfobase.ui
- pastinfobase.ui
- securedlgbase.ui
- verifydlgbase.ui
- warndlgbase.ui
- workinfobase.ui
-)
-SET(icq_MESSAGE_SOURCES ${icq_SRCS} ${icq_UICS} PARENT_SCOPE)
+SET(icq_PLATFORMS COMMON)
-ADD_FLEX_FILES(icq_SRCS rtf.ll)
+SET(icq_SRCS_COMMON aboutinfo.cpp
+ advsearch.cpp
+ aimconfig.cpp
+ aiminfo.cpp
+ aimsearch.cpp
+ aimservices.cpp
+ encodingdlg.cpp
+ homeinfo.cpp
+ icq.cpp
+ icqbos.cpp
+ icqbuddy.cpp
+ icqbuffer.cpp
+ icqclient.cpp
+ icqconfig.cpp
+ icqdirect.cpp
+ icqicmb.cpp
+ icqinfo.cpp
+ icqlists.cpp
+ icqlocation.cpp
+ icqlogin.cpp
+ icqmessage.cpp
+ icqpicture.cpp
+ icqping.cpp
+ icqsearch.cpp
+ icqsecure.cpp
+ icqservice.cpp
+ icqssbi.cpp
+ icqvarious.cpp
+ interestsinfo.cpp
+ moreinfo.cpp
+ pastinfo.cpp
+ polling.cpp
+ rtfgen.cpp
+ securedlg.cpp
+ verifydlg.cpp
+ warndlg.cpp
+ workinfo.cpp
+ xml.cpp
+ snac.cpp)
+
+SET(icq_HDRS_COMMON aboutinfo.h
+ advsearch.h
+ aimconfig.h
+ aiminfo.h
+ aimsearch.h
+ encodingdlg.h
+ homeinfo.h
+ icq_events.h
+ icq.h
+ icqbuddy.h
+ icqbuffer.h
+ icqclient.h
+ icqconfig.h
+ icqicmb.h
+ icqinfo.h
+ icqlocation.h
+ icqmessage.h
+ icqdirect.h
+ icqpicture.h
+ icqsearch.h
+ icqsecure.h
+ icqservice.h
+ icqssbi.h
+ interestsinfo.h
+ moreinfo.h
+ pastinfo.h
+ polling.h
+ securedlg.h
+ verifydlg.h
+ warndlg.h
+ workinfo.h
+ xml.h
+ snac.h)
+
+SET(icq_UICS_COMMON aboutinfobase.ui
+ advsearchbase.ui
+ aimconfigbase.ui
+ aiminfobase.ui
+ aimsearchbase.ui
+ encodingdlgbase.ui
+ homeinfobase.ui
+ icqconfigbase.ui
+ icqinfobase.ui
+ icqpicturebase.ui
+ icqsearchbase.ui
+ icqsecurebase.ui
+ interestsinfobase.ui
+ moreinfobase.ui
+ pastinfobase.ui
+ securedlgbase.ui
+ verifydlgbase.ui
+ warndlgbase.ui
+ workinfobase.ui)
+
+SET(icq_FLEX_COMMON rtf.ll)
SIM_ADD_PLUGIN(icq)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/jabber/CMakeLists.txt
^
|
| @@ -1,68 +1,62 @@
##################
# jabber library #
##################
-SET(jabber_SRCS
- discoinfo.cpp
- httppoll.cpp
- infoproxy.cpp
- jabber.cpp
- jabber_auth.cpp
- jabber_rosters.cpp
- jabber_ssl.cpp
- jabberaboutinfo.cpp
- jabberadd.cpp
- jabberbrowser.cpp
- jabberbuffer.cpp
- jabberclient.cpp
- jabberconfig.cpp
- jabberfiletransfer.cpp
- jabberhomeinfo.cpp
- jabberinfo.cpp
- jabbermessage.cpp
- jabberpicture.cpp
- jabbersearch.cpp
- jabberworkinfo.cpp
- jidadvsearch.cpp
- jidsearch.cpp
-)
+SET(jabber_PLATFORMS COMMON)
-SET(jabber_HDRS
- discoinfo.h
- infoproxy.h
- jabber.h
- jabber_events.h
- jabber_ssl.h
- jabberaboutinfo.h
- jabberadd.h
- jabberbrowser.h
- jabberbuffer.h
- jabberclient.h
- jabberconfig.h
- jabberhomeinfo.h
- jabberinfo.h
- jabbermessage.h
- jabberpicture.h
- jabbersearch.h
- jabberworkinfo.h
- jidadvsearch.h
- jidsearch.h
-)
+SET(jabber_SRCS_COMMON discoinfo.cpp
+ httppoll.cpp
+ infoproxy.cpp
+ jabber.cpp
+ jabber_auth.cpp
+ jabber_rosters.cpp
+ jabber_ssl.cpp
+ jabberaboutinfo.cpp
+ jabberadd.cpp
+ jabberbrowser.cpp
+ jabberbuffer.cpp
+ jabberclient.cpp
+ jabberconfig.cpp
+ jabberfiletransfer.cpp
+ jabberhomeinfo.cpp
+ jabberinfo.cpp
+ jabbermessage.cpp
+ jabberpicture.cpp
+ jabbersearch.cpp
+ jabberworkinfo.cpp
+ jidadvsearch.cpp
+ jidsearch.cpp)
-SET(jabber_UICS
- discoinfobase.ui
- infoproxybase.ui
- jabberaboutinfobase.ui
- jabberaddbase.ui
- jabberconfigbase.ui
- jabberhomeinfobase.ui
- jabberinfobase.ui
- jabberpicturebase.ui
- jabberworkinfobase.ui
- jidadvsearchbase.ui
- jidsearchbase.ui
-)
+SET(jabber_HDRS_COMMON discoinfo.h
+ infoproxy.h
+ jabber.h
+ jabber_events.h
+ jabber_ssl.h
+ jabberaboutinfo.h
+ jabberadd.h
+ jabberbrowser.h
+ jabberbuffer.h
+ jabberclient.h
+ jabberconfig.h
+ jabberhomeinfo.h
+ jabberinfo.h
+ jabbermessage.h
+ jabberpicture.h
+ jabbersearch.h
+ jabberworkinfo.h
+ jidadvsearch.h
+ jidsearch.h)
-SET(jabber_MESSAGE_SOURCES ${jabber_SRCS} ${jabber_UICS} PARENT_SCOPE)
+SET(jabber_UICS_COMMON discoinfobase.ui
+ infoproxybase.ui
+ jabberaboutinfobase.ui
+ jabberaddbase.ui
+ jabberconfigbase.ui
+ jabberhomeinfobase.ui
+ jabberinfobase.ui
+ jabberpicturebase.ui
+ jabberworkinfobase.ui
+ jidadvsearchbase.ui
+ jidsearchbase.ui)
SIM_ADD_PLUGIN(jabber)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/livejournal/CMakeLists.txt
^
|
| @@ -1,26 +1,21 @@
#######################
# livejournal library #
#######################
-SET(livejournal_SRCS
- journalsearch.cpp
- livejournal.cpp
- livejournalcfg.cpp
- msgjournal.cpp
-)
+SET(livejournal_PLATFORMS COMMON)
-SET(livejournal_HDRS
- journalsearch.h
- livejournal.h
- livejournalcfg.h
- msgjournal.h
-)
-SET(livejournal_UICS
- journalsearchbase.ui
- livejournalcfgbase.ui
- msgjournalbase.ui
-)
+SET(livejournal_SRCS_COMMON journalsearch.cpp
+ livejournal.cpp
+ livejournalcfg.cpp
+ msgjournal.cpp)
-SET(livejournal_MESSAGE_SOURCES ${livejournal_SRCS} ${livejournal_UICS} PARENT_SCOPE)
+SET(livejournal_HDRS_COMMON journalsearch.h
+ livejournal.h
+ livejournalcfg.h
+ msgjournal.h)
+
+SET(livejournal_UICS_COMMON journalsearchbase.ui
+ livejournalcfgbase.ui
+ msgjournalbase.ui)
SIM_ADD_PLUGIN(livejournal)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/logger/CMakeLists.txt
^
|
| @@ -1,19 +1,14 @@
##################
# logger library #
##################
-SET(logger_SRCS
- logconfig.cpp
- logger.cpp
-)
+SET(logger_PLATFORMS COMMON)
-SET(logger_HDRS
- logconfig.h
- logger.h
-)
+SET(logger_SRCS_COMMON logconfig.cpp
+ logger.cpp)
-SET(logger_UICS
- logconfigbase.ui
-)
-SET(logger_MESSAGE_SOURCES ${logger_SRCS} ${logger_UICS} PARENT_SCOPE)
+SET(logger_HDRS_COMMON logconfig.h
+ logger.h)
+
+SET(logger_UICS_COMMON logconfigbase.ui)
SIM_ADD_PLUGIN(logger)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/msn/CMakeLists.txt
^
|
| @@ -1,33 +1,28 @@
###############
# msn library #
###############
-SET(msn_SRCS
- msn.cpp
- msnclient.cpp
- msnconfig.cpp
- msnfiletransfer.cpp
- msnhttp.cpp
- msninfo.cpp
- msnpacket.cpp
- msnsearch.cpp
-)
-SET(msn_HDRS
- msn.h
- msnclient.h
- msnconfig.h
- msnhttp.h
- msninfo.h
- msnpacket.h
- msnsearch.h
-)
+SET(msn_PLATFORMS COMMON)
-SET(msn_UICS
- msnconfigbase.ui
- msninfobase.ui
- msnsearchbase.ui
-)
+SET(msn_SRCS_COMMON msn.cpp
+ msnclient.cpp
+ msnconfig.cpp
+ msnfiletransfer.cpp
+ msnhttp.cpp
+ msninfo.cpp
+ msnpacket.cpp
+ msnsearch.cpp)
-SET(msn_MESSAGE_SOURCES ${msn_SRCS} ${msn_UICS} PARENT_SCOPE)
+SET(msn_HDRS_COMMON msn.h
+ msnclient.h
+ msnconfig.h
+ msnhttp.h
+ msninfo.h
+ msnpacket.h
+ msnsearch.h)
+
+SET(msn_UICS_COMMON msnconfigbase.ui
+ msninfobase.ui
+ msnsearchbase.ui)
SIM_ADD_PLUGIN(msn)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/navigate/CMakeLists.txt
^
|
| @@ -1,23 +1,17 @@
####################
# navigate library #
####################
-SET(navigate_SRCS
- navcfg.cpp
- navigate.cpp
-)
-
-SET(navigate_HDRS
- navcfg.h
- navigate.h
-)
-
-SET(navigate_UICS
- navcfgbase.ui
-)
+SET(navigate_PLATFORMS COMMON)
-SET(navigate_MESSAGE_SOURCES ${navigate_SRCS} ${navigate_UICS} PARENT_SCOPE)
-ADD_FLEX_FILES(navigate_SRCS parseurl.ll)
+SET(navigate_SRCS_COMMON navcfg.cpp
+ navigate.cpp)
+SET(navigate_HDRS_COMMON navcfg.h
+ navigate.h)
+
+SET(navigate_UICS_COMMON navcfgbase.ui)
+
+SET(navigate_FLEX_COMMON parseurl.ll)
SIM_ADD_PLUGIN(navigate)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/netmonitor/CMakeLists.txt
^
|
| @@ -1,18 +1,12 @@
######################
# netmonitor library #
######################
-PROJECT(netmonitor)
+SET(netmonitor_PLATFORMS COMMON)
-SET(netmonitor_SRCS
- monitor.cpp
- netmonitor.cpp
-)
+SET(netmonitor_SRCS_COMMON monitor.cpp
+ netmonitor.cpp)
-SET(netmonitor_HDRS
- monitor.h
- netmonitor.h
-)
-
-SET(netmonitor_MESSAGE_SOURCES ${netmonitor_SRCS} PARENT_SCOPE)
+SET(netmonitor_HDRS_COMMON monitor.h
+ netmonitor.h)
SIM_ADD_PLUGIN(netmonitor)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/ontop/CMakeLists.txt
^
|
| @@ -1,20 +1,17 @@
#################
# ontop library #
#################
-SET(ontop_SRCS
- ontop.cpp
- ontopcfg.cpp
-)
-SET(ontop_HDRS
- ontop.h
- ontopcfg.h
-)
+SET(ontop_PLATFORMS COMMON)
+
+SET(ontop_SRCS_COMMON ontop.cpp
+ ontopcfg.cpp)
-SET(ontop_UICS
+SET(ontop_HDRS_COMMON ontop.h
+ ontopcfg.h)
+
+SET(ontop_UICS_COMMON
ontopcfgbase.ui
)
-SET(ontop_MESSAGE_SOURCES ${ontop_SRCS} ${ontop_UICS} PARENT_SCOPE)
-
SIM_ADD_PLUGIN(ontop)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/osd/CMakeLists.txt
^
|
| @@ -1,23 +1,18 @@
###############
# osd library #
###############
-SET(osd_SRCS
- osd.cpp
- osdconfig.cpp
- osdiface.cpp
-)
-SET(osd_HDRS
- osd.h
- osdconfig.h
- osdiface.h
-)
+SET(osd_PLATFORMS COMMON)
-SET(osd_UICS
- osdconfigbase.ui
- osdifacebase.ui
-)
+SET(osd_SRCS_COMMON osd.cpp
+ osdconfig.cpp
+ osdiface.cpp)
-SET(osd_MESSAGE_SOURCES ${osd_SRCS} ${osd_UICS} PARENT_SCOPE)
+SET(osd_HDRS_COMMON osd.h
+ osdconfig.h
+ osdiface.h)
+
+SET(osd_UICS_COMMON osdconfigbase.ui
+ osdifacebase.ui)
SIM_ADD_PLUGIN(osd)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/proxy/CMakeLists.txt
^
|
| @@ -3,28 +3,22 @@
#################
PROJECT(proxy)
-SET(proxy_SRCS
- proxy.cpp
- proxycfg.cpp
- proxyerror.cpp
-)
-
-SET(proxy_HDRS
- proxy.h
- proxycfg.h
- proxyerror.h
-)
-
-SET(proxy_UICS
- proxycfgbase.ui
- proxyerrorbase.ui
-)
+SET(proxy_PLATFORMS COMMON)
+
+SET(proxy_SRCS_COMMON proxy.cpp
+ proxycfg.cpp
+ proxyerror.cpp)
+
+SET(proxy_HDRS_COMMON proxy.h
+ proxycfg.h
+ proxyerror.h)
+
+SET(proxy_UICS_COMMON proxycfgbase.ui
+ proxyerrorbase.ui)
# some needed include dirs
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/plugins/_core)
-SET(proxy_MESSAGE_SOURCES ${proxy_SRCS} ${proxy_UICS} PARENT_SCOPE)
-
SIM_ADD_PLUGIN(proxy)
ADD_DEPENDENCIES(proxy _core)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/remote/CMakeLists.txt
^
|
| @@ -1,42 +1,28 @@
-##################
-# remote library #
-##################
-PROJECT(remote)
+#################
+# remote plugin #
+#################
-SET(remote_LIB_SRCS
- remote.cpp
- remotecfg.cpp
-)
+SET(remote_PLATFORMS COMMON)
-SET(remote_UI_FILES
- remotecfgbase.ui
-)
+SET(remote_SRCS_COMMON remote.cpp
+ remotecfg.cpp)
-SET(remote_MESSAGE_SOURCES ${remote_LIB_SRCS} ${remote_UI_FILES} PARENT_SCOPE)
+SET(remote_HDRS_COMMON remote.h
+ remotecfg.h)
-# moc, if needed
-KDE3_AUTOMOC(${remote_LIB_SRCS})
+SET(remote_UICS_COMMON remotecfgbase.ui)
-# don't forget our ui's
-QT3_ADD_UI_FILES(remote_LIB_SRCS ${remote_UI_FILES})
-
-ADD_LIBRARY(remote SHARED ${remote_LIB_SRCS})
-
-# some needed include dirs
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
-TARGET_LINK_LIBRARIES(remote simlib)
-
-SET_TARGET_PROPERTIES(remote PROPERTIES PREFIX "")
-
-# install target
-INSTALL(TARGETS remote LIBRARY DESTINATION ${SIM_PLUGIN_DIR} RUNTIME DESTINATION ${SIM_PLUGIN_DIR})
+SIM_ADD_PLUGIN(remote)
#########################
# next target - simctrl #
#########################
+PROJECT(remote_ctrl)
+
ADD_EXECUTABLE(simctrl simctrl.cpp)
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/simctrl.cpp")
+
IF(SIM_ENABLE_FPIE)
SET_TARGET_PROPERTIES(simctrl PROPERTIES COMPILE_FLAGS "${SIM_CXX_FPIE_FLAGS}")
SET_TARGET_PROPERTIES(simctrl PROPERTIES LINK_FLAGS "${SIM_PIE_LDFLAGS}")
@@ -46,7 +32,8 @@
IF(NOT WIN32)
INSTALL(FILES simctrl.desktop DESTINATION ${SERVICES_INSTALL_DIR})
ENDIF(NOT WIN32)
-
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/simctrl.desktop")
+
IF(0)
#doesn't work yet
########################
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/remote/simctrl.cpp
^
|
| @@ -1,36 +1,36 @@
#ifdef HAVE_CONFIG_H
-#include "config.h"
+ #include "config.h"
#endif
#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
+ #include <stdlib.h>
#endif
#ifdef HAVE_STDDEF_H
-#include <stddef.h>
+ #include <stddef.h>
#endif
#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
+ #include <inttypes.h>
#else
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
#endif
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+ #include <unistd.h>
#endif
#include <stdio.h>
-#include <signal.h>
#include <errno.h>
#ifndef WIN32
-#include <sys/socket.h>
-#include <unistd.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <pwd.h>
+ #include <sys/socket.h>
+ #include <unistd.h>
+ #include <sys/un.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <pwd.h>
+ #include <signal.h>
#endif
#include <string>
@@ -38,13 +38,13 @@
#include <memory>
#ifdef WIN32
-#include <windows.h>
-#define socklen_t int
-#define in_addr_t int
+ #include <windows.h>
+ #define socklen_t int
+ #define in_addr_t int
#endif
#ifndef INADDR_NONE
-#define INADDR_NONE 0xFFFFFFFF
+ #define INADDR_NONE 0xFFFFFFFF
#endif
using namespace std;
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/replace/CMakeLists.txt
^
|
| @@ -1,19 +1,15 @@
###################
# replace library #
###################
-SET(replace_SRCS
- replace.cpp
- replacecfg.cpp
-)
-SET(replace_HDRS
- replace.h
- replacecfg.h
-)
+SET(replace_PLATFORMS COMMON)
-SET(replace_UICS
- replacecfgbase.ui
-)
-SET(replace_MESSAGE_SOURCES ${replace_SRCS} ${replace_UICS} PARENT_SCOPE)
+SET(replace_SRCS_COMMON replace.cpp
+ replacecfg.cpp)
+
+SET(replace_HDRS_COMMON replace.h
+ replacecfg.h)
+
+SET(replace_UICS_COMMON replacecfgbase.ui)
SIM_ADD_PLUGIN(replace)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/shortcuts/CMakeLists.txt
^
|
| @@ -1,23 +1,18 @@
#####################
# shortcuts library #
#####################
-SET(shortcuts_SRCS
- mousecfg.cpp
- shortcutcfg.cpp
- shortcuts.cpp
-)
-SET(shortcuts_HDRS
- mousecfg.h
- shortcutcfg.h
- shortcuts.h
-)
+SET(shortcuts_PLATFORMS COMMON)
-SET(shortcuts_UICS
- mousecfgbase.ui
- shortcutcfgbase.ui
-)
+SET(shortcuts_SRCS_COMMON mousecfg.cpp
+ shortcutcfg.cpp
+ shortcuts.cpp)
-SET(shortcuts_MESSAGE_SOURCES ${shortcuts_SRCS} ${shortcuts_UICS} PARENT_SCOPE)
+SET(shortcuts_HDRS_COMMON mousecfg.h
+ shortcutcfg.h
+ shortcuts.h)
+
+SET(shortcuts_UICS_COMMON mousecfgbase.ui
+ shortcutcfgbase.ui)
SIM_ADD_PLUGIN(shortcuts)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/sms/CMakeLists.txt
^
|
| @@ -1,29 +1,30 @@
###############
# sms library #
###############
-SET(sms_SRCS
- gsm_ta.cpp
- serial.cpp
- sms.cpp
- smssetup.cpp
-)
-
-SET(sms_HDRS
- gsm_ta.h
- serial.h
- sms.h
- smssetup.h
-)
-
-SET(sms_UICS
- smssetupbase.ui
-)
+
+SET(sms_PLATFORMS COMMON)
+
+
+SET(sms_SRCS_COMMON gsm_ta.cpp
+ serial.cpp
+ sms.cpp
+ smssetup.cpp)
+
+SET(sms_HDRS_COMMON gsm_ta.h
+ serial.h
+ sms.h
+ smssetup.h)
+
+SET(sms_UICS_COMMON smssetupbase.ui)
+
+# Do not know where xpm/simcard.xpm is used... it is not mentioned anywhere exept
+# Makefile.am
+# So I desided not to add it to make dist filelist. If I am wrong, please correct the code
+# N. Shaplov
# some needed include dirs
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/plugins/_core)
-SET(sms_MESSAGE_SOURCES ${sms_SRCS} ${sms_UICS} PARENT_SCOPE)
-
SIM_ADD_PLUGIN(sms)
ADD_DEPENDENCIES(sms _core)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/sound/CMakeLists.txt
^
|
| @@ -1,44 +1,44 @@
#################
# sound library #
#################
-SET(sound_SRCS
- sound.cpp
- soundconfig.cpp
- sounduser.cpp
-)
-
-SET(sound_HDRS
- sound.h
- soundconfig.h
- sounduser.h
-)
-
-SET(sound_UICS
- soundconfigbase.ui
- sounduserbase.ui
-)
-SET(sound_MESSAGE_SOURCES ${sound_SRCS} ${sound_UICS} PARENT_SCOPE)
+SET(sound_PLATFORMS COMMON)
+
+SET(sound_SRCS_COMMON sound.cpp
+ soundconfig.cpp
+ sounduser.cpp)
+
+SET(sound_HDRS_COMMON sound.h
+ soundconfig.h
+ sounduser.h)
+
+SET(sound_UICS_COMMON soundconfigbase.ui
+ sounduserbase.ui)
SIM_ADD_PLUGIN(sound)
-# install new sounds with known licence
-INSTALL(FILES sounds/added.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/alert.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/auth.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/authrequest.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/contacts.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/contactrequest.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/deleted.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/error.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/file.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/filedone.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/mailpager.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/message.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/msgsent.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/refused.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/sms.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/startup.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/url.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/vip-online.ogg DESTINATION ${SIM_SOUND_DIR})
-INSTALL(FILES sounds/web.ogg DESTINATION ${SIM_SOUND_DIR})
+SET(oggs added.ogg
+ alert.ogg
+ auth.ogg
+ authrequest.ogg
+ contacts.ogg
+ contactrequest.ogg
+ deleted.ogg
+ error.ogg
+ file.ogg
+ filedone.ogg
+ mailpager.ogg
+ message.ogg
+ msgsent.ogg
+ refused.ogg
+ sms.ogg
+ startup.ogg
+ url.ogg
+ vip-online.ogg
+ web.ogg)
+
+FOREACH(ogg ${oggs})
+ INSTALL(FILES sounds/${ogg} DESTINATION ${SIM_SOUND_DIR})
+ ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/sounds/${ogg}")
+ENDFOREACH(ogg)
+
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/spell/CMakeLists.txt
^
|
| @@ -1,38 +1,19 @@
-SET(spell_SRCS
- spell.cpp
- spellcfg.cpp
- speller.cpp
- spellhighlight.cpp
-)
-
-SET(spell_UICS
- spellcfgbase.ui
- spellfindbase.ui
-)
-
-SET(spell_HDRS
- spell.h
- spellcfg.h
- speller.h
- spellhighlight.h
-)
-
-IF(WIN32)
- SET(spell_SRCS
- ${spell_SRCS}
- spellfind.cpp
- )
- SET(spell_HDRS
- ${spell_HDRS}
- spellfind.h
- )
-ENDIF(WIN32)
-
-SET(spell_MESSAGE_SOURCES ${spell_SRCS} ${spell_UICS})
-IF(NOT WIN32)
- SET(spell_MESSAGE_SOURCES ${spell_MESSAGE_SOURCES} spellfind.cpp)
-ENDIF(NOT WIN32)
-SET(spell_MESSAGE_SOURCES ${spell_MESSAGE_SOURCES} PARENT_SCOPE)
+SET(spell_PLATFORMS COMMON WIN32)
+
+SET(spell_SRCS_COMMON spell.cpp
+ spellcfg.cpp
+ speller.cpp
+ spellhighlight.cpp)
+SET(spell_SRCS_WIN32 spellfind.cpp)
+
+SET(spell_UICS_COMMON spellcfgbase.ui
+ spellfindbase.ui)
+
+SET(spell_HDRS_COMMON spell.h
+ spellcfg.h
+ speller.h
+ spellhighlight.h)
+SET(spell_HDRS_WIN32 spellfind.h)
IF(ASPELL_FOUND AND NOT ENABLE_KDE3)
@@ -40,9 +21,7 @@
# spell library #
#################
-
-
- SET(spell_LIBS
+ SET(spell_LIBS_COMMON
${ASPELL_LIBRARIES}
)
@@ -57,4 +36,8 @@
ELSE(ENABLE_KDE3)
MESSAGE(STATUS "Cannot build spell plugin because aspell is missing on your system")
ENDIF(ENABLE_KDE3)
+
+ # Adding plugin for update-messages and make dist purposes
+ SET(spell_PLUGIN_FORBIDDEN 1)
+ SIM_ADD_PLUGIN(spell)
ENDIF(ASPELL_FOUND AND NOT ENABLE_KDE3)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/splash/CMakeLists.txt
^
|
| @@ -1,16 +1,15 @@
##################
# splash library #
##################
-SET(splash_SRCS
- splash.cpp
-)
-SET(splash_HDRS
- splash.h
-)
-SET(splash_MESSAGE_SOURCES ${splash_SRCS} PARENT_SCOPE)
+SET(splash_PLATFORMS COMMON)
+
+SET(splash_SRCS_COMMON splash.cpp)
+
+SET(splash_HDRS_COMMON splash.h)
SIM_ADD_PLUGIN(splash)
# splash.png
INSTALL(FILES splash.png DESTINATION ${SIM_PICT_DIR})
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/splash.png")
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/styles/CMakeLists.txt
^
|
| @@ -1,26 +1,20 @@
##################
# styles library #
##################
-ADD_SUBDIRECTORY(metal)
-ADD_SUBDIRECTORY(wood)
+SET(styles_PLATFORMS COMMON)
-SET(styles_SRCS
- fontconfig.cpp
- styles.cpp
- stylescfg.cpp
-)
+SET(styles_SRCS_COMMON fontconfig.cpp
+ styles.cpp
+ stylescfg.cpp)
-SET(styles_HDRS
- fontconfig.h
- styles.h
- stylescfg.h
-)
+SET(styles_HDRS_COMMON fontconfig.h
+ styles.h
+ stylescfg.h)
-SET(styles_UICS
- fontconfigbase.ui
- stylescfgbase.ui
-)
+SET(styles_UICS_COMMON fontconfigbase.ui
+ stylescfgbase.ui)
-SET(styles_MESSAGE_SOURCES ${styles_SRCS} ${styles_UICS} PARENT_SCOPE)
+ADD_SUBDIRECTORY(metal) #FIXME these files should be also added to make dist!!!
+ADD_SUBDIRECTORY(wood) #FIXME these files should be also added to make dist!!!
SIM_ADD_PLUGIN(styles)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/styles/metal/CMakeLists.txt
^
|
| @@ -29,3 +29,19 @@
IF(WIN32)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/plugins/styles)
ENDIF(WIN32)
+
+FILE(GLOB xpm *.xpm) # I am not sure that all these xpm is really needed but I am not able to test
+ # this feature of a plugin because of a bug, and so will add all of them
+ # shaplov
+
+FOREACH(_var metal_LIB_HDRS metal_LIB_SRCS xpm)
+ FOREACH(file ${${_var}})
+ IF(IS_ABSOLUTE ${file})
+ ADD_TO_DIST_TARGET("${file}")
+ ELSE(IS_ABSOLUTE ${file})
+ ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/${file}")
+ ENDIF(IS_ABSOLUTE ${file})
+ ENDFOREACH(file)
+ENDFOREACH(_var)
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt")
+
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/styles/wood/CMakeLists.txt
^
|
| @@ -29,3 +29,10 @@
IF(WIN32)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/plugins/styles)
ENDIF(WIN32)
+
+FOREACH(_var wood_LIB_HDRS wood_LIB_SRCS)
+ FOREACH(file ${${_var}})
+ ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/${file}")
+ ENDFOREACH(file)
+ENDFOREACH(_var)
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt")
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/transparent/CMakeLists.txt
^
|
| @@ -1,35 +1,25 @@
#######################
# transparent library #
#######################
-SET(transparent_SRCS
- transparent.cpp
- transparentcfg.cpp
-)
-
-SET(transparent_HDRS
- transparent.h
- transparentcfg.h
-)
-
-SET(transparent_UICS
- transparentcfgbase.ui
-)
-
-IF(NOT WIN32)
- SET(transparent_SRCS
- ${transparent_SRCS}
- transtop.cpp
- )
-ENDIF(NOT WIN32)
-
-SET(transparent_MESSAGE_SOURCES ${transparent_SRCS} ${transparent_UICS} )
-IF(WIN32)
- SET( transparent_MESSAGE_SOURCES ${transparent_MESSAGE_SOURCES} transtop.cpp )
-ENDIF(WIN32)
-SET( transparent_MESSAGE_SOURCES ${transparent_MESSAGE_SOURCES} PARENT_SCOPE )
+
+SET(transparent_PLATFORMS COMMON NON_WIN32)
+
+SET(transparent_SRCS_COMMON transparent.cpp
+ transparentcfg.cpp)
+SET(transparent_SRCS_NON_WIN32 transtop.cpp)
+
+SET(transparent_HDRS_COMMON transparent.h
+ transparentcfg.h)
+SET(transparent_HDRS_NON_WIN32 transtop.h)
+
+SET(transparent_UICS_COMMON transparentcfgbase.ui)
IF(WIN32 OR ENABLE_KDE3)
SIM_ADD_PLUGIN(transparent)
ELSE(WIN32 OR ENABLE_KDE3)
MESSAGE(STATUS "This plugin can only be used on windows or KDE")
+
+ #Adding plugin for update-messages and make dist purposes olny
+ SET(transparent_PLUGIN_FORBIDDEN 1)
+ SIM_ADD_PLUGIN(transparent)
ENDIF(WIN32 OR ENABLE_KDE3)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/update/CMakeLists.txt
^
|
| @@ -1,16 +1,15 @@
-SET(update_SRCS
- update.cpp
-)
+SET(update_PLATFORMS COMMON)
-SET(update_HDRS
- update.h
-)
+SET(update_SRCS_COMMON update.cpp)
-SET(update_MESSAGE_SOURCES ${update_SRCS} PARENT_SCOPE)
+SET(update_HDRS_COMMON update.h)
##################
# update library #
##################
-IF(FALSE) # Update plugin is disabled in cmake builds because it really works only in noragen's MSVC builds
- SIM_ADD_PLUGIN(update)
-ENDIF(FALSE)
+
+# Update plugin is disabled in cmake builds because it really works only in noragen's MSVC builds
+# Adding it only for make dist and update-messages purposes
+SET(update_PLUGIN_FORBIDDEN 1)
+SIM_ADD_PLUGIN(update)
+
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/update/update.cpp
^
|
| @@ -127,7 +127,7 @@
this->CHECK_INTERVAL=60*60*12; //checking every half day for an update, after first time
//url = "http://sim-im.org/index.php?v=" + VERSION;
#ifdef WIN32
- versionurl = "http://www.sim.gosign.de/update.php?";
+ versionurl = "http://www.sim-icq.de/update.php?";
versionurl += "os=1";
#else
#ifdef QT_MACOSX_VERSION
@@ -141,7 +141,7 @@
versionurl += date;
versionurl.replace(' ',"%20");
#ifdef WIN32
- location="http://www.sim.gosign.de";
+ location="http://www.sim-icq.de";
#endif
#else
versionurl += "&release";
@@ -163,7 +163,7 @@
versionurl += (char)c;
}
}*/
- QUrl um(QString("http://www.sim.gosign.de/updatemsg.php"));
+ QUrl um(QString("http://www.sim-icq.de/updatemsg.php"));
httpmsg = new QHttp(this);
connect(httpmsg, SIGNAL(requestFinished(int, bool)),this, SLOT(UpdateMsgDownloadFinished(int, bool)));
QBuffer *buffer_um = new QBuffer(bytes_um);
@@ -227,7 +227,7 @@
i18n("I can now DOWNLOAD the Update\navailable at: %1\nIN BACKROUND and install the update\nfor Sim-IM, automatically after finishing.\n\nWould like you to ALLOW to carry out THE UPDATE?").arg(location),
QMessageBox::Yes,QMessageBox::No);
- address=QString("http://sim.gosign.de/setup.exe");
+ address=QString("http://www.sim-icq.de/setup.exe");
if (msgret == QMessageBox::Yes)
download_and_install();
@@ -298,7 +298,7 @@
//remote=dremote->toString();
if (dlocal.daysTo(dremote)>0)
{
- log(L_DEBUG, "Update::There is a new Version on www.sim.gosign.de");
+ log(L_DEBUG, "Update::There is a new Version on www.sim-icq.de");
return true;
}
else
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/weather/CMakeLists.txt
^
|
| @@ -1,25 +1,20 @@
###################
# weather library #
###################
-SET(weather_SRCS
- weather.cpp
- weathercfg.cpp
- wifacecfg.cpp
-)
-
-SET(weather_HDRS
- weather.h
- weathercfg.h
- wifacecfg.h
-)
-
-SET(weather_UICS
- weathercfgbase.ui
- wifacecfgbase.ui
-)
-SET(weather_MESSAGE_SOURCES ${weather_SRCS} ${weather_UICS} PARENT_SCOPE)
+SET(weather_PLATFORMS COMMON)
-ADD_JISP_ARCHIVE(jisp weather.jisp weather_SRCS)
+SET(weather_SRCS_COMMON weather.cpp
+ weathercfg.cpp
+ wifacecfg.cpp)
+
+SET(weather_HDRS_COMMON weather.h
+ weathercfg.h
+ wifacecfg.h)
+
+SET(weather_UICS_COMMON weathercfgbase.ui
+ wifacecfgbase.ui)
+
+ADD_JISP_ARCHIVE(jisp weather.jisp weather_NON_SRC_TARGETS non-free)
SIM_ADD_PLUGIN(weather)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/windock/CMakeLists.txt
^
|
| @@ -1,12 +1,8 @@
-SET(windock_SRCS
- windock.cpp
-)
-
-SET(windock_HDRS
- windock.h
-)
+SET(windock_PLATFORMS WIN32)
-SET(windock_MESSAGE_SOURCES ${windock_SRCS} ${windock_UICS} PARENT_SCOPE)
+SET(windock_SRCS_WIN32 windock.cpp)
+
+SET(windock_HDRS_WIN32 windock.h)
IF(WIN32)
###################
@@ -19,4 +15,8 @@
SIM_ADD_PLUGIN(windock)
ELSE(WIN32)
MESSAGE(STATUS "Windock plugin can only be used on windows")
+
+ # Adding plugin for make dist and update-messages purposes
+ SET(windock_PLUGIN_FORBIDDEN 1)
+ SIM_ADD_PLUGIN(windock)
ENDIF(WIN32)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/yahoo/CMakeLists.txt
^
|
| @@ -1,35 +1,28 @@
#################
# yahoo library #
#################
-SET(yahoo_SRCS
- crypt.cpp
- yahoo.cpp
- yahooauth.cpp
- yahoocfg.cpp
- yahooclient.cpp
- yahoofiletransfer.cpp
- yahoohttp.cpp
- yahooinfo.cpp
- yahoosearch.cpp
- yahootransformtables.c
-)
+SET(yahoo_PLATFORMS COMMON)
-SET(yahoo_HDRS
- yahoo.h
- yahoocfg.h
- yahooclient.h
- yahooinfo.h
- yahoosearch.h
-)
+SET(yahoo_SRCS_COMMON crypt.cpp
+ yahoo.cpp
+ yahooauth.cpp
+ yahoocfg.cpp
+ yahooclient.cpp
+ yahoofiletransfer.cpp
+ yahoohttp.cpp
+ yahooinfo.cpp
+ yahoosearch.cpp
+ yahootransformtables.c)
-SET(yahoo_UICS
- yahoocfgbase.ui
- yahooinfobase.ui
- yahoosearchbase.ui
-)
-
-SET(yahoo_MESSAGE_SOURCES ${yahoo_SRCS} ${yahoo_UICS} PARENT_SCOPE)
+SET(yahoo_HDRS_COMMON yahoo.h
+ yahoocfg.h
+ yahooclient.h
+ yahooinfo.h
+ yahoosearch.h)
+SET(yahoo_UICS_COMMON yahoocfgbase.ui
+ yahooinfobase.ui
+ yahoosearchbase.ui)
if(OPENSSL_FOUND)
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
@@ -38,4 +31,8 @@
TARGET_LINK_LIBRARIES(yahoo ${OPENSSL_LIBRARIES} ${OPENSSL_EAY_LIBRARIES})
else(OPENSSL_FOUND)
MESSAGE(STATUS "OpenSSL library not found, yahoo plugin disabled")
+ # Adding plugin for make dist and update-messages purposes
+ SET(yahoo_PLUGIN_FORBIDDEN 1)
+ SIM_ADD_PLUGIN(yahoo)
+
endif(OPENSSL_FOUND)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/yahoo/yahooclient.cpp
^
|
| @@ -83,35 +83,35 @@
static DataDef yahooUserData[] =
{
- { "", DATA_ULONG, 1, DATA(9) }, // Sign
- { "LastSend", DATA_ULONG, 1, 0 },
- { "Login", DATA_UTF, 1, 0 },
- { "Nick", DATA_UTF, 1, 0 },
- { "First", DATA_UTF, 1, 0 },
- { "Last", DATA_UTF, 1, 0 },
- { "EMail", DATA_UTF, 1, 0 },
- { "", DATA_ULONG, 1, DATA(-1) }, // Status
- { "", DATA_BOOL, 1, 0 }, // bAway
- { "", DATA_UTF, 1, 0 }, // AwayMessage
- { "StatusTime", DATA_ULONG, 1, 0 },
- { "OnlineTime", DATA_ULONG, 1, 0 },
- { "Group", DATA_STRING, 1, 0 },
- { "", DATA_BOOL, 1, 0 }, // bChecked
- { "", DATA_BOOL, 1, 0 }, // bTyping
- { NULL, DATA_UNKNOWN, 0, 0 }
+ { "" , DATA_ULONG , 1, DATA(9) }, // Sign
+ { "LastSend" , DATA_ULONG , 1, 0 },
+ { "Login" , DATA_UTF , 1, 0 },
+ { "Nick" , DATA_UTF , 1, 0 },
+ { "First" , DATA_UTF , 1, 0 },
+ { "Last" , DATA_UTF , 1, 0 },
+ { "EMail" , DATA_UTF , 1, 0 },
+ { "" , DATA_ULONG , 1, DATA(-1) }, // Status
+ { "" , DATA_BOOL , 1, 0 }, // bAway
+ { "" , DATA_UTF , 1, 0 }, // AwayMessage
+ { "StatusTime" , DATA_ULONG , 1, 0 },
+ { "OnlineTime" , DATA_ULONG , 1, 0 },
+ { "Group" , DATA_STRING , 1, 0 },
+ { "" , DATA_BOOL , 1, 0 }, // bChecked
+ { "" , DATA_BOOL , 1, 0 }, // bTyping
+ { NULL , DATA_UNKNOWN , 0, 0 }
};
static DataDef yahooClientData[] =
{
- { "Server", DATA_STRING, 1, "scs.msg.yahoo.com" },
- { "Port", DATA_ULONG, 1, DATA(5050) },
- { "MinPort", DATA_ULONG, 1, DATA(1024) },
- { "MaxPort", DATA_ULONG, 1, DATA(0xFFFE) },
- { "UseHTTP", DATA_BOOL, 1, 0 },
- { "AutoHTTP", DATA_BOOL, 1, DATA(1) },
- { "ListRequests", DATA_STRING, 1, 0 },
- { "", DATA_STRUCT, sizeof(YahooUserData) / sizeof(Data), DATA(yahooUserData) },
- { NULL, DATA_UNKNOWN, 0, 0 }
+ { "Server" , DATA_STRING , 1, "scs.msg.yahoo.com" },
+ { "Port" , DATA_ULONG , 1, DATA(5050) },
+ { "MinPort" , DATA_ULONG , 1, DATA(1024) },
+ { "MaxPort" , DATA_ULONG , 1, DATA(0xFFFE) },
+ { "UseHTTP" , DATA_BOOL , 1, 0 },
+ { "AutoHTTP" , DATA_BOOL , 1, DATA(1) },
+ { "ListRequests", DATA_STRING , 1, 0 },
+ { "" , DATA_STRUCT , sizeof(YahooUserData) / sizeof(Data), DATA(yahooUserData) },
+ { NULL , DATA_UNKNOWN , 0, 0 }
};
const DataDef *YahooProtocol::userDataDef()
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/plugins/zodiak/CMakeLists.txt
^
|
| @@ -1,13 +1,15 @@
##################
# zodiak library #
##################
-SET(zodiak_SRCS
- zodiak.cpp
-)
+SET(zodiak_PLATFORMS COMMON)
-SET(zodiak_HDRS
- zodiak.h
-)
-SET(zodiak_MESSAGE_SOURCES ${zodiak_SRCS} ${zodiak_UICS} PARENT_SCOPE)
+SET(zodiak_SRCS_COMMON zodiak.cpp)
+
+SET(zodiak_HDRS_COMMON zodiak.h)
SIM_ADD_PLUGIN(zodiak)
+
+FILE(GLOB xpm xpm/*.xpm)
+FOREACH(file ${xpm})
+ ADD_TO_DIST_TARGET("${file}")
+ENDFOREACH(file)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/po/bg.po
^
|
| @@ -1,15 +1,15 @@
# translation of bg.po to Bulgarian
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
#
# Атанас Мавров <bugar@mail.bg>, 2003.
# Атанас Мавров <bugar@developer.bg>, 2004.
-# Atanas Mavrov <bugar@developer.bg>, 2005, 2006, 2007, 2008.
+# Atanas Mavrov <bugar@developer.bg>, 2005, 2006, 2007, 2008, 2009.
msgid ""
msgstr ""
"Project-Id-Version: bg\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-24 13:39+0100\n"
-"PO-Revision-Date: 2008-07-06 01:54+0300\n"
+"PO-Revision-Date: 2009-08-27 22:12+0300\n"
"Last-Translator: Atanas Mavrov <bugar@developer.bg>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"MIME-Version: 1.0\n"
@@ -715,8 +715,7 @@
#: plugins/_core/core.cpp:1240 plugins/_core/core.cpp:3224
msgid "Sorry, I'm busy right now, and can not respond to your request"
-msgstr ""
-"Съжалявам, в момента съм зает и не мога да отговоря на Вашето запитване"
+msgstr "Съжалявам, в момента съм зает и не мога да отговоря на Вашето запитване"
#: plugins/_core/core.cpp:1245 plugins/_core/core.cpp:3228
msgid "Sorry, I'm busy right now, but I'll be able to respond to you later"
@@ -825,8 +824,7 @@
#: plugins/_core/core.cpp:1667
msgid "`<command>` - call <command> and substitute command output\n"
-msgstr ""
-"`<command>` - обръщение към <command> и извеждане на резултата на изхода\n"
+msgstr "`<command>` - обръщение към <command> и извеждане на резултата на изхода\n"
#: plugins/_core/core.cpp:2197 plugins/_core/interfacecfg.cpp:106
msgid "System"
@@ -866,8 +864,7 @@
#: plugins/_core/core.cpp:3523
msgid "Add new ICQ UIN to profile. You need to specify uin:password"
-msgstr ""
-"Добавяне на нов ICQ потребител към профила. Трябва да въведете номер:парола"
+msgstr "Добавяне на нов ICQ потребител към профила. Трябва да въведете номер:парола"
#: plugins/_core/core.cpp:3580 plugins/_core/core.cpp:3590
#: plugins/_core/core.cpp:3594
@@ -879,15 +876,12 @@
msgstr "Моля въведете име за профилът."
#: plugins/_core/core.cpp:3590 plugins/_core/logindlg.cpp:419
-msgid ""
-"There is already another profile with this name. Please choose another."
+msgid "There is already another profile with this name. Please choose another."
msgstr "Има друг профил със същото име. Моля изберете друго име."
#: plugins/_core/core.cpp:3594
-msgid ""
-"Unable to create the profile. Please do not use any special characters."
-msgstr ""
-"Профилът не може да бъде създаден. Моля не използвате специални символи."
+msgid "Unable to create the profile. Please do not use any special characters."
+msgstr "Профилът не може да бъде създаден. Моля не използвате специални символи."
#. i18n: file ./plugins/_core/managerbase.ui line 20
#: plugins/_core/core.cpp:4087 plugins/_core/core.cpp:4108
@@ -1497,8 +1491,7 @@
msgstr "Преименуване на профил"
#: plugins/_core/logindlg.cpp:423
-msgid ""
-"Unable to rename the profile. Please do not use any special characters."
+msgid "Unable to rename the profile. Please do not use any special characters."
msgstr "Не може да преименува профила. Моля не използвайте специални символи."
#: plugins/_core/logindlg.cpp:523 plugins/jabber/jabberclient.cpp:944
@@ -2476,9 +2469,8 @@
msgstr "&Съобщения за грешки"
#: plugins/about/about.cpp:74
-#, fuzzy
msgid "&About Sim-IM"
-msgstr "&Относно SIM"
+msgstr "&Относно Sim-IM"
#: plugins/about/about.cpp:81
msgid "About &KDE"
@@ -2498,9 +2490,9 @@
#. i18n: file ./plugins/about/aboutdlgbase.ui line 20
#: plugins/about/aboutdlgbase.cpp:116 rc.cpp:593
-#, fuzzy, no-c-format
+#, no-c-format
msgid "About Sim-IM"
-msgstr "Относно SIM"
+msgstr "Относно Sim-IM"
#. i18n: file ./plugins/about/aboutdlgbase.ui line 73
#: plugins/about/aboutdlgbase.cpp:118 rc.cpp:599
@@ -2526,8 +2518,7 @@
#: plugins/action/action.cpp:40
msgid "Plugin execute external programs on event or from contact menu"
-msgstr ""
-"Приставката изпълнява външна програма при събитие или от потребителския лист"
+msgstr "Приставката изпълнява външна програма при събитие или от потребителския лист"
#: plugins/action/action.cpp:78
msgid "&Action"
@@ -2644,8 +2635,7 @@
#. i18n: file ./plugins/autoaway/autoawaycfgbase.ui line 138
#: plugins/autoaway/autoawaycfgbase.cpp:108 rc.cpp:505
#, no-c-format
-msgid ""
-"Disable online alert in \"Away\", \"N/A\", \"DND\" and \"Occupied\" List"
+msgid "Disable online alert in \"Away\", \"N/A\", \"DND\" and \"Occupied\" List"
msgstr ""
"Изключва известяване при \"Не съм пред компютъра\", \"Няма ме\", \"Моля не "
"ме безпокойте\" и \"Зает съм\""
@@ -2742,9 +2732,8 @@
msgstr "Приставка осигурява скриване на главния прозорец в системния поднос"
#: plugins/dock/dock.cpp:103 sim/sim.cpp:215
-#, fuzzy
msgid "Sim-IM"
-msgstr "SIM"
+msgstr "Sim-IM"
#: plugins/dock/dock.cpp:138
msgid "Toggle main window"
@@ -2822,15 +2811,13 @@
#: plugins/filter/filtercfgbase.cpp:69 rc.cpp:689
#, no-c-format
msgid "&Receive authorization and system messages only from contacts from list"
-msgstr ""
-"&Получавай удостоверяване и системни съобщения само от контакти в листа"
+msgstr "&Получавай удостоверяване и системни съобщения само от контакти в листа"
#. i18n: file ./plugins/filter/filtercfgbase.ui line 61
#: plugins/filter/filtercfgbase.cpp:70 rc.cpp:692
#, no-c-format
msgid "Reject messages from unknown users contains this words or phrases:"
-msgstr ""
-"Отхвърля съобщения от неизвестен потребител, съдържащи думи или фрази като:"
+msgstr "Отхвърля съобщения от неизвестен потребител, съдържащи думи или фрази като:"
#. i18n: file ./plugins/filter/filtercfgbase.ui line 90
#: plugins/filter/filtercfgbase.cpp:71 rc.cpp:695
@@ -3359,8 +3346,7 @@
#: rc.cpp:1409 rc.cpp:2461
#, no-c-format
msgid "Note: For HTTP-polling using proxy settings for HTTP"
-msgstr ""
-"Забележка: за HTTP запитване се използват настройките на проксито за HTTP"
+msgstr "Забележка: за HTTP запитване се използват настройките на проксито за HTTP"
#. i18n: file ./plugins/icq/icqconfigbase.ui line 431
#: plugins/icq/aimconfigbase.cc:151 plugins/icq/icqconfigbase.cc:273
@@ -4315,8 +4301,7 @@
#: plugins/icq/icqsecurebase.cc:109 rc.cpp:1062
#, no-c-format
msgid "My &authorization is required before users add me to Contact List"
-msgstr ""
-"Изискване на удостоверяване &преди да ме добавят в списък с потребители"
+msgstr "Изискване на удостоверяване &преди да ме добавят в списък с потребители"
#. i18n: file ./plugins/icq/icqsecurebase.ui line 75
#: plugins/icq/icqsecurebase.cc:110 rc.cpp:1065
@@ -5658,8 +5643,7 @@
msgid ""
"Complete the form to submit your searchable attributes in the Jabber User "
"Directory"
-msgstr ""
-"Попълнете всички данни за търсеният от вас потребител в каталога на Jabber"
+msgstr "Попълнете всички данни за търсеният от вас потребител в каталога на Jabber"
#: plugins/jabber/jabbersearch.cpp:321
msgid "Fill in all of the fields to add yourself to the JUD."
@@ -6608,8 +6592,7 @@
msgstr "Препратки към външни програми"
#: plugins/navigate/navigate.cpp:305
-msgid ""
-"Plugin provides navigation on hyperlinks, call an external browser and mailer"
+msgid "Plugin provides navigation on hyperlinks, call an external browser and mailer"
msgstr ""
"Приставката осигурява управление на препратките - свързва се с външен "
"интернет четец или програма за електронна поща"
@@ -6725,8 +6708,7 @@
msgstr "OSD"
#: plugins/osd/osd.cpp:103
-msgid ""
-"Plugin provides on screen notification about messages and contacts status"
+msgid "Plugin provides on screen notification about messages and contacts status"
msgstr ""
"Приставката поддържа известяване на състоянието на съобщенията и "
"потребителите"
@@ -6857,8 +6839,7 @@
#: plugins/osd/osdconfigbase.cpp:125 rc.cpp:1028
#, no-c-format
msgid "Enable keyboard LED-notification in N/A state"
-msgstr ""
-"Разрешаване на светлинно уведомяване чрез клавиатурата в режим \"Няма ме\""
+msgstr "Разрешаване на светлинно уведомяване чрез клавиатурата в режим \"Няма ме\""
#: plugins/osd/osdiface.cpp:41
msgid "Left-bottom"
@@ -9920,3 +9901,4 @@
#: sim/textshow.cpp:603
msgid "Custom"
msgstr "Потребителски"
+
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/sim/CMakeLists.txt
^
|
| @@ -1,10 +1,10 @@
-IF(NOT WIN32)
- ADD_SUBDIRECTORY(png)
-ENDIF(NOT WIN32)
+ADD_SUBDIRECTORY(png)
######################
# target sim library #
######################
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt")
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/sim.desktop")
SET(sim_LIB_SRCS
aboutdata.cpp
@@ -47,7 +47,9 @@
qzip/unzip.c
)
SET(sim_LIB_MESSAGE_SOURCES ${sim_LIB_SRCS} PARENT_SCOPE)
-
+FOREACH(_file ${sim_LIB_SRCS})
+ ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/${_file}")
+ENDFOREACH(_file)
SET(sim_LIB_HDRS
aboutdata.h
@@ -55,6 +57,7 @@
buffer.h
builtinlogger.h
cfg.h
+ cjk_variants.h
cmddef.h
contacts.h
country.h
@@ -64,8 +67,11 @@
exec.h
fetch.h
fontedit.h
+ html.h
icons.h
intedit.h
+ johab_hangul.h
+ kdeisversion.h
linklabel.h
listview.h
log.h
@@ -89,12 +95,16 @@
qzip/qzip.h
qzip/unzip.h
)
+FOREACH(_file ${sim_LIB_HDRS})
+ ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/${_file}")
+ENDFOREACH(_file)
# moc the sources
KDE3_AUTOMOC(${sim_LIB_SRCS})
# don't forget flex
ADD_FLEX_FILES(sim_LIB_SRCS html.ll)
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/html.ll")
# our target
ADD_LIBRARY(simlib SHARED ${sim_LIB_SRCS} ${sim_LIB_HDRS})
@@ -153,6 +163,7 @@
SET(sim_EXE_SRCS
sim.cpp
)
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/sim.cpp")
if(WIN32)
if(MINGW)
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/sim/contacts.cpp
^
|
| @@ -2044,15 +2044,67 @@
return encodings;
}
-QTextCodec *ContactList::getCodecByName(const char *encoding)
+const ENCODING *ContactList::getEncoding(Contact *contact){
+ if( NULL == contact )
+ return NULL;
+
+ QString sEncoding = contact->getEncoding();
+ if( sEncoding.isEmpty() )
+ sEncoding = owner()->getEncoding();
+
+ const ENCODING *e = NULL;
+
+ if( sEncoding.isEmpty() ) {
+ QTextCodec *codec = QTextCodec::codecForLocale();
+ int mib = codec->mibEnum();
+ if( mib != 0 ) {
+ for (e = encodings; e->language; e++){
+ if ( mib == e->mib )
+ break;
+ }
+ }
+ else {
+#ifdef WIN32
+ int iSize = ::GetLocaleInfoA( LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE, NULL, 0 );
+ char *sTemp = new char[iSize];
+ ::GetLocaleInfoA( LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE, sTemp, iSize );
+ QString sAnsiCP = QString::fromLatin1( sTemp );
+ int iCP = sAnsiCP.toUInt();
+ for (e = encodings; e->language; e++){
+ if ( iCP == e->cp_code )
+ break;
+ }
+#endif
+ }
+ }
+ else {
+ for (e = encodings; e->language; e++){
+ if ( sEncoding == e->codec )
+ break;
+ }
+ if (e->language && !e->bMain){
+ for (e++; e->language; e++){
+ if (e->bMain){
+ break;
+ }
+ }
+ }
+
+ if( e->language == NULL )
+ e = NULL;
+ }
+
+ return e;
+}
+
+QTextCodec *ContactList::getCodecByName(const QString &encoding)
{
- QTextCodec *codec = NULL;
- if (encoding && *encoding){
- codec = QTextCodec::codecForName(encoding);
+ if (!encoding.isEmpty()){
+ QTextCodec *codec = QTextCodec::codecForName(encoding.utf8());
if (codec)
return codec;
}
- codec = QTextCodec::codecForLocale();
+ QTextCodec *codec = QTextCodec::codecForLocale();
const ENCODING *e;
const char *codecName = codec->name();
for (e = encodings; e->language; e++){
@@ -2072,6 +2124,17 @@
return codec;
}
+
+QTextCodec *ContactList::getCodecByCodePage(const int iCP) {
+ const ENCODING *e;
+ for (e = encodings; e->language; e++){
+ if ( iCP == e->cp_code )
+ return ContactList::getCodecByName(e->codec);
+ }
+
+ return NULL;
+}
+
QTextCodec *ContactList::getCodec(Contact *contact)
{
QTextCodec *codec = NULL;
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/sim/contacts.h
^
|
| @@ -414,8 +414,10 @@
QString toUnicode(Contact *contact, const QCString &str, int length=-1);
QCString fromUnicode(Contact *contact, const QString &str);
QTextCodec *getCodec(Contact *contact);
- QTextCodec *getCodecByName(const char *encoding);
+ static QTextCodec *getCodecByName(const QString &encoding);
+ static QTextCodec *getCodecByCodePage(const int iCP);
static const ENCODING *getEncodings();
+ const ENCODING *getEncoding(Contact *contact);
protected:
class ContactListPrivate *p;
friend class Contact;
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/sim/plugins.cpp
^
|
| @@ -363,9 +363,15 @@
for (size_t n = plugins.size() - 1; n > 0; n--){
pluginInfo &info = plugins[n];
if (to && (info.plugin == to))
- break;
- if (to && info.info && (info.info->flags & (PLUGIN_PROTOCOL & ~PLUGIN_NOLOAD_DEFAULT)))
- continue;
+ continue; // Were: break;
+ // Now unload all plugins exept one passed as arg
+
+///////////////////////////////////////////////////
+// I do not know why Shutov ignored protocol plugins here
+// but on changing profile we should release protocol that no longer in use
+///////////////////////////////////////////////////
+// if (to && info.info && (info.info->flags & (PLUGIN_PROTOCOL & ~PLUGIN_NOLOAD_DEFAULT))) //FIXME Compleatly remove these two lines
+// continue;
release(info, to != NULL);
info.bDisabled = false;
info.bFromCfg = false;
|
|
[-]
[+]
|
Changed |
sim-0.9.5.tar.bz2/sim/png/CMakeLists.txt
^
|
| @@ -1,3 +1,11 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
-INCLUDE(KDE4InstallIcons)
-KDE4_INSTALL_ICONS( ${CMAKE_INSTALL_PREFIX}/share/icons )
+IF(NOT WIN32)
+ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+ INCLUDE(KDE4InstallIcons)
+ KDE4_INSTALL_ICONS( ${CMAKE_INSTALL_PREFIX}/share/icons )
+ENDIF(NOT WIN32)
+
+FILE(GLOB _icons *.png)
+FOREACH(_file ${_icons})
+ ADD_TO_DIST_TARGET("${_file}")
+ENDFOREACH(_file)
+ADD_TO_DIST_TARGET("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt")
|
