Changeset 710

Show
Ignore:
Timestamp:
08/21/07 14:24:56 (12 months ago)
Author:
daelstorm
Message:

rearrange some icons and desktop files; fix path issue with executing the python-site-packages.py script; added NO_MUSEEKD, NO_MUSCAN, NO_SETUP

Location:
museek+/trunk/sources
Files:
6 modified
6 moved

Legend:

Unmodified
Added
Removed

  • museek+/trunk/sources/CMakeLists.txt

    r709 r710  
    1 project(museekd) 
    2  
     1project(museek-plus) 
     2set(MUSEEK_PLUS " 
     3python-site-packages.py 
     4") 
    35# Include some cmake checks. 
    46include(CheckIncludeFiles) 
    … …  
    810include(CheckCXXSourceCompiles) 
    911SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) 
    10 MESSAGE("DECLARATIONS: PREFIX, BINDINGS, MURMUR, MUCOUS, CLIENTS 
    11 Prefix declarations with -D and set them with either 1, 0 or a path") 
     12MESSAGE("DECLARATIONS: PREFIX, EVERYTHING, NO_MUSEEKD, NO_MUSCAN, NO_SETUP, BINDINGS, MURMUR, MUCOUS, CLIENTS, SETUP 
     13Prefix declarations with -D and set them with either 1, 0 or a path. 
     14Set -DEVERYTHING=1 if you want it all") 
    1215IF(PREFIX) 
    1316  SET(CMAKE_INSTALL_PREFIX ${PREFIX}) 
    … …  
    3336  set(PYBIND 0) 
    3437ENDIF (NOT BINDINGS) 
     38 
     39set(PYSETUP 1) 
     40IF (NO_SETUP) 
     41  set(PYSETUP 0) 
     42ENDIF (NO_SETUP) 
     43 
     44set(C_MUSEEKD 1) 
     45IF (NO_MUSEEKD) 
     46  set(C_MUSEEKD 0) 
     47ENDIF (NO_MUSEEKD) 
     48 
     49set(C_MUSCAN 1) 
     50IF (NO_MUSCAN) 
     51  set(C_MUSCAN 0) 
     52ENDIF (NO_MUSCAN) 
     53 
     54set(PYSETUP 1) 
     55IF (NO_SETUP) 
     56  set(PYSETUP 0) 
     57ENDIF (NO_SETUP) 
     58 
     59IF (EVERYTHING) 
     60  set(PYBIND 1) 
     61  set(PYCLIENTS 1) 
     62  set(PYMURMUR 1) 
     63  set(PYMUCOUS 1) 
     64  set(PYSETUP 1) 
     65  set(C_MUSEEKD 1) 
     66  set(C_MUSCAN 1) 
     67ENDIF (EVERYTHING) 
     68 
    3569# # Enable NewNet's smart-pointer debugging capabilities. 
    3670# add_definitions(-DNN_PTR_DEBUG -DNN_PTR_DEBUG_ASSERT) 
    … …  
    230264 
    231265# Where the wild things are... 
    232 add_subdirectory(Tools) 
     266 
    233267add_subdirectory(Mucipher) 
    234 add_subdirectory(Muhelp) 
    235 add_subdirectory(Museekal) 
    236 add_subdirectory(Museek) 
    237 add_subdirectory(museekd) 
    238  
     268if (C_MUSCAN) 
     269  add_subdirectory(Muhelp) 
     270  add_subdirectory(Tools) 
     271else (C_MUSCAN) 
     272  message("!!! museekd will NOT be installed [NO_MUSEEKD=0]") 
     273endif (C_MUSCAN) 
     274if (C_MUSEEKD) 
     275  if (NOT C_MUSCAN) 
     276    add_subdirectory(Muhelp) 
     277  endif (NOT C_MUSCAN) 
     278  add_subdirectory(Museekal) 
     279  add_subdirectory(Museek) 
     280  add_subdirectory(museekd) 
     281else (C_MUSEEKD) 
     282  message("!!! museekd will NOT be installed [NO_MUSEEKD=0]") 
     283endif (C_MUSEEKD) 
    239284if (PYBIND) 
    240285  add_subdirectory(python-bindings) 
    … …  
    247292  message("!!! mulog, museekchat, museekcontrol, musIRC will NOT be installed [CLIENTS=1]") 
    248293endif (PYCLIENTS) 
     294if (PYSETUP) 
     295  add_subdirectory(setup) 
     296else (PYSETUP) 
     297  message("!!! musetup, musetup-gtk, musetup-qt will NOT be installed [NO_SETUP=0]") 
     298endif (PYSETUP) 
    249299if (PYMUCOUS) 
    250300  add_subdirectory(mucous) 

  • museek+/trunk/sources/Tools/CMakeLists.txt

    r704 r710  
    99  scanner.cc 
    1010) 
     11 
     12add_library(Tools STATIC ${TOOLS_SOURCES}) 
     13 
     14if (C_MUSCAN) 
     15 
    1116set(MUSCAN_SOURCES 
    1217  muscan.cc 
    … …  
    1722  ${TOOLS_SOURCES} 
    1823) 
    19 add_library(Tools STATIC ${TOOLS_SOURCES}) 
    2024 
    2125add_executable(muscan ${MUSCAN_SOURCES}) 
    … …  
    7983  DESTINATION "man/man1" 
    8084) 
     85endif  (C_MUSCAN) 

  • museek+/trunk/sources/mucous/CMakeLists.txt

    r704 r710  
    1414  ${PYMUCOUS_FILES} 
    1515) 
    16 EXECUTE_PROCESS(COMMAND python ../python-site-packages.py pymucous OUTPUT_VARIABLE version OUTPUT_STRIP_TRAILING_WHITESPACE) 
    17  
     16EXECUTE_PROCESS(COMMAND python ../python-site-packages.py museek OUTPUT_VARIABLE version OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) 
     17if (NOT version OR error) 
     18        EXECUTE_PROCESS(COMMAND python python-site-packages.py museek OUTPUT_VARIABLE version OUTPUT_STRIP_TRAILING_WHITESPACE) 
     19endif (NOT version OR error) 
    1820install( 
    1921  FILES ${PYMUCOUS_SOURCES} 

  • museek+/trunk/sources/murmur/CMakeLists.txt

    r708 r710  
    1212  ${PYMURMUR_FILES} 
    1313) 
    14 EXECUTE_PROCESS(COMMAND python ../python-site-packages.py pymurmur OUTPUT_VARIABLE version OUTPUT_STRIP_TRAILING_WHITESPACE) 
    15  
     14EXECUTE_PROCESS(COMMAND python ../python-site-packages.py museek OUTPUT_VARIABLE version OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) 
     15if (NOT version OR error) 
     16        EXECUTE_PROCESS(COMMAND python python-site-packages.py museek OUTPUT_VARIABLE version OUTPUT_STRIP_TRAILING_WHITESPACE) 
     17endif (NOT version OR error) 
    1618install( 
    1719  FILES ${PYMURMUR_SOURCES} 

  • museek+/trunk/sources/murmur/Makefile

    r423 r710  
    1 # Copyright (C) 2007, Adam Cécile (Le_Vert) <gandalf@le-vert.net> 
    2 # 
    3 # This program is free software. It comes without any warranty, to 
    4 # the extent permitted by applicable law. You can redistribute it 
    5 # and/or modify it under the terms of the Do What The Fuck You Want 
    6 # To Public License, Version 2, as published by Sam Hocevar. 
     1# CMAKE generated file: DO NOT EDIT! 
     2# Generated by "Unix Makefiles" Generator, CMake Version 2.4 
    73 
    8 # DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE  
    9 # Version 2, December 2004  
    10 #                           
    11 # Copyright (C) 2004 Sam Hocevar  
    12 # 22 rue de Plaisance, 75014 Paris, France  
    13 # Everyone is permitted to copy and distribute verbatim or modified  
    14 # copies of this license document, and changing it is allowed as long  
    15 # as the name is changed.  
    16 #                                 
    17 # DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE  
    18 # TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION  
    19 #                                                  
    20 # 0. You just DO WHAT THE FUCK YOU WANT TO.  
    21 # 
    22 # You could choose, at your convenience, WTFPL 2 license or 3-clause 
    23 # BSD-style license. 
     4# Default target executed when no arguments are given to make. 
     5default_target: all 
     6 
     7#============================================================================= 
     8# Special targets provided by cmake. 
     9 
     10# Disable implicit rules so canoncical targets will work. 
     11.SUFFIXES: 
     12 
     13.SUFFIXES: .hpux_make_needs_suffix_list 
     14 
     15# Suppress display of executed commands. 
     16$(VERBOSE).SILENT: 
     17 
     18# A target that is always out of date. 
     19cmake_force: 
     20 
     21#============================================================================= 
     22# Set environment variables for the build. 
     23 
     24# The shell in which to execute make rules. 
     25SHELL = /bin/sh 
     26 
     27# The CMake executable. 
     28CMAKE_COMMAND = /usr/bin/cmake 
     29 
     30# The command to remove a file. 
     31RM = /usr/bin/cmake -E remove -f 
     32 
     33# The program to use to edit the cache. 
     34CMAKE_EDIT_COMMAND = /usr/bin/ccmake 
     35 
     36# The top-level source directory on which CMake was run. 
     37CMAKE_SOURCE_DIR = /home/daelstorm/Soulseek/msvn/museek+/trunk/sources 
     38 
     39# The top-level build directory on which CMake was run. 
     40CMAKE_BINARY_DIR = /home/daelstorm/Soulseek/msvn/museek+/trunk/sources 
     41 
     42# Include the progress variables for this target. 
     43include CMakeFiles/progress.make 
     44 
     45#============================================================================= 
     46# Targets provided globally by CMake. 
     47 
     48# Special rule for the target edit_cache 
     49edit_cache: 
     50        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." 
     51        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources/murmur && /usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) 
     52 
     53# Special rule for the target edit_cache 
     54edit_cache/fast: edit_cache 
     55 
     56# Special rule for the target install 
     57install: preinstall 
     58        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." 
     59        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources/murmur && /usr/bin/cmake -P cmake_install.cmake 
     60 
     61# Special rule for the target install 
     62install/fast: preinstall/fast 
     63        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." 
     64        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources/murmur && /usr/bin/cmake -P cmake_install.cmake 
     65 
     66# Special rule for the target install/local 
     67install/local: preinstall 
     68        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." 
     69        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources/murmur && /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake 
     70 
     71# Special rule for the target install/local 
     72install/local/fast: install/local 
     73 
     74# Special rule for the target list_install_components 
     75list_install_components: 
     76        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Only default component available" 
     77 
     78# Special rule for the target list_install_components 
     79list_install_components/fast: list_install_components 
     80 
     81# Special rule for the target rebuild_cache 
     82rebuild_cache: 
     83        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." 
     84        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources/murmur && /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) 
     85 
     86# Special rule for the target rebuild_cache 
     87rebuild_cache/fast: rebuild_cache 
     88 
     89# The main all target 
     90all: cmake_check_build_system 
     91        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources && $(CMAKE_COMMAND) -E cmake_progress_start /home/daelstorm/Soulseek/msvn/museek+/trunk/sources/CMakeFiles $(CMAKE_ALL_PROGRESS) 
     92        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources && $(MAKE) -f CMakeFiles/Makefile2 murmur/all 
     93        $(CMAKE_COMMAND) -E cmake_progress_start /home/daelstorm/Soulseek/msvn/museek+/trunk/sources/CMakeFiles 0 
     94 
     95# The main clean target 
     96clean: 
     97        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources && $(MAKE) -f CMakeFiles/Makefile2 murmur/clean 
     98 
     99# The main clean target 
     100clean/fast: clean 
     101 
     102# Prepare targets for installation. 
     103preinstall: all 
     104        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources && $(MAKE) -f CMakeFiles/Makefile2 murmur/preinstall 
     105 
     106# Prepare targets for installation. 
     107preinstall/fast: 
     108        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources && $(MAKE) -f CMakeFiles/Makefile2 murmur/preinstall 
     109 
     110# clear depends 
     111depend: 
     112        $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 
     113 
     114# Help Target 
     115help:: 
     116        @echo "The following are some of the valid targets for this Makefile:" 
     117        @echo "... all (the default if no target is provided)" 
     118        @echo "... clean" 
     119        @echo "... depend" 
     120        @echo "... edit_cache" 
     121        @echo "... install" 
     122        @echo "... install/local" 
     123        @echo "... list_install_components" 
     124        @echo "... rebuild_cache" 
    24125 
    25126 
    26 # Optional flags you may use 
    27 CFLAGS   = -Wall -g -O2 
    28 PYTHON   = python 
    29 CC       = gcc 
    30 INSTALL  = install 
    31 PREFIX   = /usr/local 
    32 DESTDIR  = / 
    33127 
    34 all: build 
     128#============================================================================= 
     129# Special targets to cleanup operation of make. 
    35130 
    36 build: build-python build-trayicon 
     131# Special rule to run CMake to check the build system integrity. 
     132# No rule that depends on this can have commands that come from listfiles 
     133# because they might be regenerated. 
     134cmake_check_build_system: 
     135        cd /home/daelstorm/Soulseek/msvn/museek+/trunk/sources && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 
    37136 
    38 build-python: setup.py 
    39         $(PYTHON) setup.py build 
    40  
    41 # Build trayicon python module and pass all variables to its Makefile 
    42 build-trayicon: trayicon/Makefile 
    43         $(MAKE) -C trayicon CFLAGS="$(CFLAGS)" \ 
    44                             PYTHON="$(PYTHON)" \ 
    45                             PREFIX="$(PREFIX)" \ 
    46                             DESTDIR="$(DESTDIR)" \ 
    47                             INSTALL="$(INSTALL)" \ 
    48                             CC="$(CC)" 
    49  
    50 install: install-python install-trayicon 
    51  
    52 install-python: 
    53         $(PYTHON) setup.py install --prefix $(PREFIX) \ 
    54                                    --root $(DESTDIR) 
    55 install-trayicon: 
    56         $(MAKE) -C trayicon install CFLAGS="$(CFLAGS)" \ 
    57                             PYTHON="$(PYTHON)" \ 
    58                             PREFIX="$(PREFIX)" \ 
    59                             DESTDIR="$(DESTDIR)" \ 
    60                             INSTALL="$(INSTALL)" \ 
    61                             CC="$(CC)" 
    62  
    63 clean: clean-python clean-trayicon 
    64  
    65 clean-python: 
    66         $(PYTHON) setup.py clean 
    67         find . -name \*.pyc -exec rm -f {} \; 
    68         rm -rf build/ 
    69  
    70 clean-trayicon: 
    71         $(MAKE) -C trayicon clean 

  • museek+/trunk/sources/python-bindings/CMakeLists.txt

    r704 r710  
    77museek/driver.py 
    88) 
    9 EXECUTE_PROCESS(COMMAND python ../python-site-packages.py museek OUTPUT_VARIABLE version OUTPUT_STRIP_TRAILING_WHITESPACE) 
     9EXECUTE_PROCESS(COMMAND python ../python-site-packages.py museek OUTPUT_VARIABLE version OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) 
     10if (NOT version OR error) 
     11        EXECUTE_PROCESS(COMMAND python python-site-packages.py museek OUTPUT_VARIABLE version OUTPUT_STRIP_TRAILING_WHITESPACE) 
     12endif (NOT version OR error) 
    1013 
    1114install(