aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/dists
diff options
context:
space:
mode:
Diffstat (limited to 'cmake/dists')
-rw-r--r--cmake/dists/cmake/Modules/FindPPC.cmake9
-rw-r--r--cmake/dists/cmake/Modules/MacOSXBundle.cmake99
-rw-r--r--cmake/dists/gentoo/ultrastardx-1.1.0_alpha1.ebuild (renamed from cmake/dists/gentoo/ultrastardx-1.1_alpha.ebuild)39
-rw-r--r--cmake/dists/gentoo/ultrastardx-9999.ebuild47
4 files changed, 157 insertions, 37 deletions
diff --git a/cmake/dists/cmake/Modules/FindPPC.cmake b/cmake/dists/cmake/Modules/FindPPC.cmake
index 2c4f2da3..d016763f 100644
--- a/cmake/dists/cmake/Modules/FindPPC.cmake
+++ b/cmake/dists/cmake/Modules/FindPPC.cmake
@@ -88,7 +88,7 @@ foreach(once 1)
"$ENV{SystemDrive}/lazarus/fpc/*/bin/*"
"$ENV{ProgramFiles}/lazarus/fpc/*/bin/*"
)
- find_program(PASCAL_COMPILER fpc PATHS ${ppc_bin_path})
+ find_program(PASCAL_COMPILER NAMES fpc ppc386 ppc PATHS ${ppc_bin_path})
if(NOT PASCAL_COMPILER)
set(ppc_error "Executable not found")
break()
@@ -102,6 +102,7 @@ foreach(once 1)
execute_process(COMMAND ${PASCAL_COMPILER} -iV
OUTPUT_VARIABLE FPC_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(FPC_VERSION ${FPC_VERSION} CACHE INTERNAL "")
# check version
if(${current_pkg}_FIND_VERSION_EXACT)
@@ -121,16 +122,20 @@ foreach(once 1)
execute_process(COMMAND ${PASCAL_COMPILER} -iTO
OUTPUT_VARIABLE FPC_PLATFORM
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(FPC_PLATFORM ${FPC_PLATFORM} CACHE INTERNAL "")
execute_process(COMMAND ${PASCAL_COMPILER} -iTP
OUTPUT_VARIABLE FPC_PROCESSOR
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(FPC_PROCESSOR ${FPC_PROCESSOR} CACHE INTERNAL "")
execute_process(COMMAND ${PASCAL_COMPILER} -iSO
OUTPUT_VARIABLE FPC_CPLATFORM
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(FPC_CPLATFORM ${FPC_CPLATFORM} CACHE INTERNAL "")
execute_process(COMMAND ${PASCAL_COMPILER} -iSP
OUTPUT_VARIABLE FPC_CPROCESSOR
OUTPUT_STRIP_TRAILING_WHITESPACE)
- set(FPC_TARGET "${FPC_PROCESSOR}-${FPC_PLATFORM}")
+ set(FPC_CPROCESSOR ${FPC_CPROCESSOR} CACHE INTERNAL "")
+ set(FPC_TARGET "${FPC_PROCESSOR}-${FPC_PLATFORM}" CACHE INTERNAL "")
##
# Compiler checks
diff --git a/cmake/dists/cmake/Modules/MacOSXBundle.cmake b/cmake/dists/cmake/Modules/MacOSXBundle.cmake
new file mode 100644
index 00000000..bffe8b1f
--- /dev/null
+++ b/cmake/dists/cmake/Modules/MacOSXBundle.cmake
@@ -0,0 +1,99 @@
+# otool: Mac OS X object file displaying tool
+find_program(OTOOL otool)
+# install_name_tool: Mac OS X tool to change dynamic shared library install names
+find_program(INSTALL_NAME_TOOL install_name_tool)
+# hdiutil: Mac OS X disk image tool
+find_program(HDIUTIL hdiutil)
+
+set(macosx_bundle_path "${PROJECT_BINARY_DIR}/UltraStarDeluxe.app/Contents")
+
+add_custom_target(macosx-switch-installdir
+ COMMAND mkdir -p "${macosx_bundle_path}"
+ COMMAND ${CMAKE_COMMAND}
+ -DCMAKE_INSTALL_DIR=${PROJECT_BINARY_DIR}
+ -DBINDIR=${macosx_bundle_path}/MacOS
+ -DDATADIR=${macosx_bundle_path}
+ ${PROJECT_SOURCE_DIR}
+)
+
+add_custom_target(macosx-app
+ COMMENT "Creating Mac OS X application"
+
+ COMMAND mkdir -p "${macosx_bundle_path}/Resources"
+
+ # copy the icon (MUST be done BEFORE info.plist is created)
+ COMMAND install "${PROJECT_SOURCE_DIR}/icons/ultrastardx.icns" "${macosx_bundle_path}/Resources/"
+ COMMAND install "${PROJECT_SOURCE_DIR}/src/macosx/Info.plist" "${macosx_bundle_path}/"
+
+ # copy the resources
+ COMMAND ${CMAKE_BUILD_TOOL} install
+
+ # create the song directory
+ COMMAND mkdir -p "${macosx_bundle_path}/songs"
+)
+add_dependencies(macosx-app macosx-switch-installdir all)
+
+
+#define install_osx_libraries
+# # copy the dylib and change its install names
+# $(shell $(INSTALL) -m 755 $(dylib) $(macosx_bundle_path)/MacOS)
+# $(shell $(INSTALL_NAME_TOOL) -change $(dylib) @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/ultrastardx)
+# $(shell $(INSTALL_NAME_TOOL) -id @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
+# $(foreach linked_dylibs_2,$(shell $(OTOOL) -L $(dylib) | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \usr\/lib | grep -v executable_path),$(rename_secondary_osx_libraries))
+#endef
+#
+#define rename_secondary_osx_libraries
+# $(shell $(INSTALL_NAME_TOOL) -change $(linked_dylibs_2) @executable_path/$(notdir $(linked_dylibs_2)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
+#endef
+#
+#$(foreach dylib,$(shell $(OTOOL) -L $(macosx_bundle_path)/MacOS/ultrastardx | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+#$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libavcodec.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
+
+# Create double clickable standalone (does not need fink) Mac OS X
+# application. Not fully test, but should work on 10.5.
+add_custom_target(macosx-standalone-app
+ COMMENT "Creating standalone Mac OS X application"
+
+ # install fink libs
+
+ include(AnalyzeDylibDeps)
+ analyze_dylib_deps(${usdx_exe} libdeps)
+ set(USDX_DYLIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/dylib)
+
+ # install() does not follow symlinks so we have to copy the libs at cmake time
+ file(MAKE_DIRECTORY ${USDX_DYLIB_DIR})
+ foreach(dylib ${libdeps})
+ get_filename_component(dylib_name ${dylib} NAME)
+ file_copy_if_different(${dylib} ${USDX_DYLIB_DIR}/${dylib_name})
+ endforeach()
+
+ install(DIRECTORY ${USDX_DYLIB_DIR}/ DESTINATION dylib USE_SOURCE_PERMISSIONS)
+)
+add_dependencies(macosx-standalone-app macosx-app)
+
+add_custom_target(macosx-dmg
+ COMMENT "Creating Mac OS X DMG-image"
+
+ COMMAND rm UltraStarDeluxe.dmg
+ COMMAND ${HDIUTIL} create -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
+ COMMAND cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe
+ #cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
+ #/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
+ COMMAND ${HDIUTIL} detach /Volumes/UltraStarDeluxe
+ COMMAND ${HDIUTIL} convert UltraStarDeluxe.sparseimage -format UDBZ -o UltraStarDeluxe.dmg
+ COMMAND rm UltraStarDeluxe.sparseimage
+)
+add_dependencies(macosx-dmg macosx-standalone-app)
+
+# remove Mac OS X apllication bundle and disk image
+add_custom_target(clean-macosx)
+add_dependencies(clean-macosx clean-macosx-app clean-macosx-dmg)
+
+add_custom_target(clean-macosx-app
+ COMMAND rm -r UltraStarDeluxe.app
+)
+
+add_custom_target(clean-macosx-dmg
+ COMMAND rm UltraStarDeluxe.dmg
+)
diff --git a/cmake/dists/gentoo/ultrastardx-1.1_alpha.ebuild b/cmake/dists/gentoo/ultrastardx-1.1.0_alpha1.ebuild
index 7170fcdb..2b2ea032 100644
--- a/cmake/dists/gentoo/ultrastardx-1.1_alpha.ebuild
+++ b/cmake/dists/gentoo/ultrastardx-1.1.0_alpha1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header $
-inherit eutils games
+inherit cmake-utils games
SONGS_PKG=USDX-SongPackage
SONGS_VER=01
@@ -19,7 +19,7 @@ LICENSE="GPL-2
)"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="projectm debug songs"
+IUSE="projectm debug songs plugins"
RDEPEND="virtual/opengl
virtual/glu
@@ -33,33 +33,46 @@ RDEPEND="virtual/opengl
projectm? ( media-libs/libprojectm )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
- >=dev-lang/fpc-2.2.0"
+ >=dev-lang/fpc-2.2.2"
S=${WORKDIR}/${P}-src
pkg_setup() {
- games_pkg_setup
- built_with_use media-libs/libsdl opengl \
- || die "You need to compile media-libs/libsdl with USE=opengl."
+ games_pkg_setup
+ built_with_use media-libs/libsdl opengl \
+ || die "You need to compile media-libs/libsdl with USE=opengl."
}
src_compile() {
- egamesconf \
- $(use_with projectm libprojectM) \
- $(use_enable debug) \
- || die
- emake || die "emake failed"
+ # set build-type as the "Gentoo" build-type does not work with
+ # Pascal (no optimization, etc.)
+ if use debug ; then
+ CMAKE_BUILD_TYPE="Debug"
+ else
+ CMAKE_BUILD_TYPE="Release"
+ fi
+
+ # set PREFIX so that CMAKE_INSTALL_PREFIX will be set to GAMES_PREFIX
+ PREFIX="${GAMES_PREFIX}"
+
+ # configure flags
+ local mycmakeargs="$(cmake-utils_use_enable projectm PROJECTM) \
+ $(cmake-utils_use_build plugins PLUGINS) \
+ -DBINDIR=${GAMES_BINDIR} \
+ -DDATADIR=${GAMES_DATADIR}/${PN}"
+
+ cmake-utils_src_compile
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ cmake-utils_src_install
if use songs; then
insinto "${GAMES_DATADIR}"/${PN}/songs
doins -r ${WORKDIR}/Songs/* || die "doins songs failed"
fi
- dodoc AUTHORS.txt ChangeLog.german.txt ChangeLog.txt README.txt
+ dodoc AUTHORS.txt ChangeLog.GERMAN.txt ChangeLog.txt README.txt
doicon icons/${PN}-icon.svg
make_desktop_entry ${PN} "UltraStar Deluxe"
diff --git a/cmake/dists/gentoo/ultrastardx-9999.ebuild b/cmake/dists/gentoo/ultrastardx-9999.ebuild
index b1ffb5a4..51c8c91b 100644
--- a/cmake/dists/gentoo/ultrastardx-9999.ebuild
+++ b/cmake/dists/gentoo/ultrastardx-9999.ebuild
@@ -9,7 +9,7 @@ SONGS_VER=01
DESCRIPTION="An open-source karaoke game"
HOMEPAGE="http://www.ultrastardeluxe.org/"
-ESVN_REPO_URI="https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/trunk"
+ESVN_REPO_URI="https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/branches/experimental/cmake"
ESVN_PROJECT="ultrastardx"
SRC_URI="songs? ( mirror://sourceforge/${PN}/${SONGS_PKG}-${SONGS_VER}.zip )"
@@ -20,7 +20,7 @@ LICENSE="GPL-2
)"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="projectm debug songs"
+IUSE="projectm debug songs plugins"
RDEPEND="virtual/opengl
virtual/glu
@@ -39,45 +39,48 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P}-src
pkg_setup() {
- games_pkg_setup
- built_with_use media-libs/libsdl opengl \
- || die "You need to compile media-libs/libsdl with USE=opengl."
+ games_pkg_setup
+ built_with_use media-libs/libsdl opengl \
+ || die "You need to compile media-libs/libsdl with USE=opengl."
}
src_unpack() {
- unpack ${A}
+ if use songs; then
+ unpack ${A}
+ fi
subversion_src_unpack
}
src_compile() {
- if use projectm ; then
- enable_projectm="ON"
- else
- enable_projectm="OFF"
- fi
+ # set build-type as the "Gentoo" build-type does not work with
+ # Pascal (no optimization, etc.)
if use debug ; then
- build_type="Debug"
+ CMAKE_BUILD_TYPE="Debug"
else
- build_type="Release"
+ CMAKE_BUILD_TYPE="Release"
fi
- cmake \
- -DCMAKE_BUILD_TYPE=$build_type \
- -DENABLE_PROJECTM=$enable_projectm \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- . \
- || die "cmake failed"
- emake || die "emake failed"
+
+ # set PREFIX so that CMAKE_INSTALL_PREFIX will be set to GAMES_PREFIX
+ PREFIX="${GAMES_PREFIX}"
+
+ # configure flags
+ local mycmakeargs="$(cmake-utils_use_enable projectm PROJECTM) \
+ $(cmake-utils_use_build plugins PLUGINS) \
+ -DBINDIR=${GAMES_BINDIR} \
+ -DDATADIR=${GAMES_DATADIR}/${PN}"
+
+ cmake-utils_src_compile
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ cmake-utils_src_install
if use songs; then
insinto "${GAMES_DATADIR}"/${PN}/songs
doins -r ${WORKDIR}/Songs/* || die "doins songs failed"
fi
- dodoc AUTHORS.txt ChangeLog.german.txt ChangeLog.txt README.txt
+ dodoc AUTHORS.txt ChangeLog.GERMAN.txt ChangeLog.txt README.txt
doicon icons/${PN}-icon.svg
make_desktop_entry ${PN} "UltraStar Deluxe"