[Performous-commit] Vincent Le Ligeour : Always build launcher script, renamed performous binanary to performous.bin

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: 18defa3839d0a9361025a99b78372f8429288429

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Oct 17 13:33:48 2009 +0200

Always build launcher script, renamed performous binanary to performous.bin

---

 CMakeLists.txt                                     |   33 +++++--------------
 game/CMakeLists.txt                                |    6 ++--
 .../games-arcade/performous/performous-9999.ebuild |    6 ---
 3 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37833e6..e2ce01e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,27 +49,12 @@ if (ENABLE_TOOLS)
   add_subdirectory(tools)
 endif (ENABLE_TOOLS)
 
-if(NOT WIN32)
-	if(NOT "${CMAKE_INSTALL_PREFIX}" MATCHES "^(/usr|/usr/local)$")
-		message(STATUS "Non-standard installation prefix. Configuring performous.sh.")
-		set(LAUNCHER_SCRIPT TRUE)
-	endif(NOT "${CMAKE_INSTALL_PREFIX}" MATCHES "^(/usr|/usr/local)$")
-
-	if(NOT "${SHARE_INSTALL}" MATCHES "^(share/performous|share/games/performous)$")
-		message(STATUS "Non-standard data file install path. Configuring performous.sh.")
-		set(LAUNCHER_SCRIPT TRUE)
-	endif(NOT "${SHARE_INSTALL}" MATCHES "^(share/performous|share/games/performous)$")
-endif(NOT WIN32)
-
-if(LAUNCHER_SCRIPT)
-	set(FULL_PREFIX ${CMAKE_INSTALL_PREFIX})
-	if(UNIX AND NOT "${FULL_PREFIX}" MATCHES "^/")
-	  set(FULL_PREFIX "${CMAKE_BINARY_DIR}/${FULL_PREFIX}")
-	endif(UNIX AND NOT "${FULL_PREFIX}" MATCHES "^/")	 
-	set(PERFORMOUS_PLUGIN_PATH "${FULL_PREFIX}/lib${LIB_SUFFIX}/libda")
-	set(PERFORMOUS_EXECUTABLE "${FULL_PREFIX}/bin/performous")
-	configure_file("${PROJECT_SOURCE_DIR}/cmake/performous.sh.cmake" "${PROJECT_BINARY_DIR}/performous.sh" ESCAPE_QUOTES @ONLY)
-	install(PROGRAMS "${PROJECT_BINARY_DIR}/performous.sh" DESTINATION bin)
-	install(SCRIPT "${PROJECT_SOURCE_DIR}/cmake/performous-launcher.cmake")
-endif(LAUNCHER_SCRIPT)
-
+set(FULL_PREFIX ${CMAKE_INSTALL_PREFIX})
+if(UNIX AND NOT "${FULL_PREFIX}" MATCHES "^/")
+  set(FULL_PREFIX "${CMAKE_BINARY_DIR}/${FULL_PREFIX}")
+endif(UNIX AND NOT "${FULL_PREFIX}" MATCHES "^/")
+set(PERFORMOUS_PLUGIN_PATH "${FULL_PREFIX}/lib${LIB_SUFFIX}/libda")
+set(PERFORMOUS_EXECUTABLE "${FULL_PREFIX}/bin/performous.bin")
+configure_file("${PROJECT_SOURCE_DIR}/cmake/performous.sh.cmake" "${PROJECT_BINARY_DIR}/performous" ESCAPE_QUOTES @ONLY)
+install(PROGRAMS "${PROJECT_BINARY_DIR}/performous" DESTINATION bin)
+install(SCRIPT "${PROJECT_SOURCE_DIR}/cmake/performous-launcher.cmake")
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 4bca0db..18a4c11 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -35,12 +35,12 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	add_definitions("-D__STDC_CONSTANT_MACROS")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
-add_executable(performous ${SOURCES} ${SDL_SOURCES})
-target_link_libraries(performous da ${LIBS})
+add_executable(performous.bin ${SOURCES} ${SDL_SOURCES})
+target_link_libraries(performous.bin da ${LIBS})
 
 # Generate config.hh
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.hh" "${CMAKE_CURRENT_BINARY_DIR}/config.hh" @ONLY)
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 
-install(TARGETS performous DESTINATION bin)
+install(TARGETS performous.bin DESTINATION bin)
 
diff --git a/portage-overlay/games-arcade/performous/performous-9999.ebuild b/portage-overlay/games-arcade/performous/performous-9999.ebuild
index 39ba488..e858642 100644
--- a/portage-overlay/games-arcade/performous/performous-9999.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-9999.ebuild
@@ -90,12 +90,6 @@ src_compile() {
 src_install() {
 	DOCS="docs/*.txt" cmake-utils_src_install
 
-	if test -f "${D}/usr/bin/performous.sh" ; then
-		perl -pi -e "s+bin/performous+bin/performous.bin+" "${D}/usr/bin/performous.sh"
-		mv "${D}/usr/bin/performous" "${D}/usr/bin/performous.bin"
-		mv "${D}/usr/bin/performous.sh" "${D}/usr/bin/performous"
-	fi
-
 	if use songs; then
 		insinto "/usr/share/games/ultrastar"
 		doins -r "${S}/songs" || die "doins songs failed"