From d7d6c3a217cbd15fbba13c229eed15d23d4a4812 Mon Sep 17 00:00:00 2001 From: quemy Date: Mon, 27 Aug 2012 15:54:24 +0000 Subject: [PATCH] Clean directories git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2729 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/eo/Packaging.cmake | 84 --------------------------- trunk/eo/build_gcc_linux_debug | 7 --- trunk/eo/build_gcc_linux_pyeo | 7 --- trunk/eo/build_gcc_linux_release | 7 --- trunk/eo/build_gcc_linux_stl_parallel | 7 --- trunk/eo/build_gcc_linux_tutorial | 7 --- trunk/eo/build_gcc_linux_unittest | 7 --- trunk/eo/build_vs2008_release.bat | 5 -- trunk/eo/distclean | 4 -- trunk/eo/eo-conf.cmake | 8 --- trunk/eo/package_deb | 5 -- trunk/eo/package_nsis.bat | 4 -- trunk/eo/package_rpm | 5 -- trunk/smp/src/tagDispatching.h | 68 ---------------------- 14 files changed, 225 deletions(-) delete mode 100644 trunk/eo/Packaging.cmake delete mode 100755 trunk/eo/build_gcc_linux_debug delete mode 100755 trunk/eo/build_gcc_linux_pyeo delete mode 100755 trunk/eo/build_gcc_linux_release delete mode 100755 trunk/eo/build_gcc_linux_stl_parallel delete mode 100755 trunk/eo/build_gcc_linux_tutorial delete mode 100755 trunk/eo/build_gcc_linux_unittest delete mode 100644 trunk/eo/build_vs2008_release.bat delete mode 100755 trunk/eo/distclean delete mode 100644 trunk/eo/eo-conf.cmake delete mode 100755 trunk/eo/package_deb delete mode 100644 trunk/eo/package_nsis.bat delete mode 100755 trunk/eo/package_rpm delete mode 100644 trunk/smp/src/tagDispatching.h diff --git a/trunk/eo/Packaging.cmake b/trunk/eo/Packaging.cmake deleted file mode 100644 index de81fadc3..000000000 --- a/trunk/eo/Packaging.cmake +++ /dev/null @@ -1,84 +0,0 @@ -###################################################################################### -### 1) Check dependencies -###################################################################################### - -IF (NOT DEFINED PROJECT_NAME OR - NOT DEFINED PROJECT_VERSION_MAJOR OR - NOT DEFINED PROJECT_VERSION_MINOR OR - NOT DEFINED PROJECT_VERSION_PATCH OR - NOT DEFINED PROJECT_VERSION) - MESSAGE(FATAL_ERROR "Be sure you have defined PROJECT_NAME and PROJECT_VERSION*.") -ENDIF() - -###################################################################################### - - -###################################################################################### -### 2) Set up components -###################################################################################### - -SET(CPACK_COMPONENTS_ALL libraries test examples) -SET(CPACK_ALL_INSTALL_TYPES Minimal Full) - -SET(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "${PACKAGE_NAME}") -SET(CPACK_COMPONENT_LIBRARIES_DESCRIPTION "${PACKAGE_NAME} library") -SET(CPACK_COMPONENT_LIBRARIES_GROUP "Devel") -SET(CPACK_COMPONENT_LIBRARIES_INSTALL_TYPES Minimal Full) - -SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "${PACKAGE_NAME}") -SET(CPACK_COMPONENT_TEST_DESCRIPTION "${PACKAGE_NAME} test") -SET(CPACK_COMPONENT_TEST_GROUP "Devel") -SET(CPACK_COMPONENT_TEST_INSTALL_TYPES Full) - -SET(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "${PACKAGE_NAME}") -SET(CPACK_COMPONENT_EXAMPLES_DESCRIPTION "${PACKAGE_NAME} examples") -SET(CPACK_COMPONENT_EXAMPLES_GROUP "Devel") -SET(CPACK_COMPONENT_EXAMPLES_INSTALL_TYPES Full) - -###################################################################################### - - -###################################################################################### -### 3) Set up general information about packaging -###################################################################################### - -# For more details: http://www.cmake.org/Wiki/CMake:Component_Install_With_CPack - -#cpack package information -SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") -SET(CPACK_PACKAGE_DESCRIPTION "${PACKAGE_NAME}") -SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE_NAME}") -SET(CPACK_PACKAGE_VENDOR "${PACKAGE_NAME}") -SET(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}") -SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) -SET(CPACK_STRIP_FILES ${PROJECT_NAME}) -SET(CPACK_SOURCE_STRIP_FILES "bin/${PROJECT_NAME}") -SET(CPACK_PACKAGE_EXECUTABLES "${PROJECT_NAME}" "${PROJECT_NAME}") -SET(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}") -SET(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}") -SET(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME} ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") - -###################################################################################### - - -###################################################################################### -### 4) Set up debian packaging information -###################################################################################### - -SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libstdc++6, libgcc1, libc6, g++") - -SET(CPACK_DEBIAN_PACKAGE_SECTION "devel") -SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") - -###################################################################################### - - -###################################################################################### -### 5) And finally, include cpack, this is the last thing to do. -###################################################################################### - -INCLUDE(CPack) - -###################################################################################### diff --git a/trunk/eo/build_gcc_linux_debug b/trunk/eo/build_gcc_linux_debug deleted file mode 100755 index 144a5298a..000000000 --- a/trunk/eo/build_gcc_linux_debug +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -mkdir -p debug -cd debug -cmake -DCMAKE_BUILD_TYPE=Debug .. -make -cd .. diff --git a/trunk/eo/build_gcc_linux_pyeo b/trunk/eo/build_gcc_linux_pyeo deleted file mode 100755 index ec4927878..000000000 --- a/trunk/eo/build_gcc_linux_pyeo +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -mkdir -p release -cd release -cmake -DENABLE_PYEO=1 .. -make -cd .. diff --git a/trunk/eo/build_gcc_linux_release b/trunk/eo/build_gcc_linux_release deleted file mode 100755 index fb220d044..000000000 --- a/trunk/eo/build_gcc_linux_release +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -mkdir -p release -cd release -cmake .. -make -cd .. diff --git a/trunk/eo/build_gcc_linux_stl_parallel b/trunk/eo/build_gcc_linux_stl_parallel deleted file mode 100755 index 7208c2f5a..000000000 --- a/trunk/eo/build_gcc_linux_stl_parallel +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -mkdir -p release -cd release -cmake -D_GLIBCXX_PARALLEL=1 .. -make -cd .. diff --git a/trunk/eo/build_gcc_linux_tutorial b/trunk/eo/build_gcc_linux_tutorial deleted file mode 100755 index 2908e875a..000000000 --- a/trunk/eo/build_gcc_linux_tutorial +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -mkdir -p release -cd release -cmake -DENABLE_EO_TUTORIAL=1 .. -make -cd .. diff --git a/trunk/eo/build_gcc_linux_unittest b/trunk/eo/build_gcc_linux_unittest deleted file mode 100755 index c23049e80..000000000 --- a/trunk/eo/build_gcc_linux_unittest +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -mkdir -p debug -cd debug -cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_CMAKE_TESTING=1 .. -make -cd .. diff --git a/trunk/eo/build_vs2008_release.bat b/trunk/eo/build_vs2008_release.bat deleted file mode 100644 index 13513c147..000000000 --- a/trunk/eo/build_vs2008_release.bat +++ /dev/null @@ -1,5 +0,0 @@ -mkdir release -cd release -cmake -G "Visual Studio 9 2008" .. -cd .. -pause diff --git a/trunk/eo/distclean b/trunk/eo/distclean deleted file mode 100755 index e4a02bc44..000000000 --- a/trunk/eo/distclean +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh - -rm -rf debug -rm -rf release diff --git a/trunk/eo/eo-conf.cmake b/trunk/eo/eo-conf.cmake deleted file mode 100644 index 5ced7fadf..000000000 --- a/trunk/eo/eo-conf.cmake +++ /dev/null @@ -1,8 +0,0 @@ - -# Current version -SET(PROJECT_VERSION_MAJOR 1) -SET(PROJECT_VERSION_MINOR 3) -SET(PROJECT_VERSION_PATCH 0) -SET(PROJECT_VERSION_MISC "-edge") - -ADD_DEFINITIONS(-DDEPRECATED_MESSAGES) # disable warning deprecated function messages diff --git a/trunk/eo/package_deb b/trunk/eo/package_deb deleted file mode 100755 index 1a44d0219..000000000 --- a/trunk/eo/package_deb +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -cd release -cpack -G DEB -cd .. diff --git a/trunk/eo/package_nsis.bat b/trunk/eo/package_nsis.bat deleted file mode 100644 index d372c4340..000000000 --- a/trunk/eo/package_nsis.bat +++ /dev/null @@ -1,4 +0,0 @@ -cd release -cpack -G NSIS -cd .. -pause diff --git a/trunk/eo/package_rpm b/trunk/eo/package_rpm deleted file mode 100755 index 8d46b7d04..000000000 --- a/trunk/eo/package_rpm +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -cd release -cpack -G RPM -cd .. diff --git a/trunk/smp/src/tagDispatching.h b/trunk/smp/src/tagDispatching.h deleted file mode 100644 index 6dbfc2aa7..000000000 --- a/trunk/smp/src/tagDispatching.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - -Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 - -Alexandre Quemy - -This software is governed by the CeCILL license under French law and -abiding by the rules of distribution of free software. You can ue, -modify and/ or redistribute the software under the terms of the CeCILL -license as circulated by CEA, CNRS and INRIA at the following URL -"http://www.cecill.info". - -In this respect, the user's attention is drawn to the risks associated -with loading, using, modifying and/or developing or reproducing the -software by the user in light of its specific status of free software, -that may mean that it is complicated to manipulate, and that also -therefore means that it is reserved for developers and experienced -professionals having in-depth computer knowledge. Users are therefore -encouraged to load and test the software's suitability as regards their -requirements in conditions enabling the security of their systems and/or -data to be ensured and, more generally, to use and operate it in the -same conditions as regards security. -The fact that you are presently reading this means that you have had -knowledge of the CeCILL license and that you accept its terms. - -ParadisEO WebSite : http://paradiseo.gforge.inria.fr -Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include - -namespace paradiseo -{ -namespace smp -{ -/** Tag Dispatching -* The Tag Dispatching enable to choose the algorithm to call at compile time -**/ - -// Main algorithms tags -struct error_tag {}; -struct eoEasyEA_tag {}; -struct eoEasyPSO_tag {}; -struct eoSyncEasyPSO_tag {}; - -template