Tweak makefiles to add -delta suffix.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15f4a64534c895f4764a112ac3f12fc05824e7a3..aae390f38221150eb864d5a9a536cb398465cd8c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,11 +5,11 @@ if(${CMAKE_VERSION} STREQUAL "2.8.2")
 endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 
 # This can be read from ${PROJECT_NAME} after project() is called
-project(minetest)
+project(minetest-delta)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 20110704_0)
+set(VERSION_PATCH 20110720_0)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options
@@ -48,15 +48,15 @@ if(WIN32)
        set(EXAMPLE_CONF_DIR ".")
 elseif(APPLE)
        # random placeholders
-       set(DATADIR "share/minetest")
+       set(DATADIR "share/${PROJECT_NAME}")
        set(BINDIR "bin")
-       set(DOCDIR "share/doc/minetest")
+       set(DOCDIR "share/doc/${PROJECT_NAME}")
        set(EXAMPLE_CONF_DIR ".")
 elseif(UNIX) # Linux, BSD etc
-       set(DATADIR "share/minetest")
+       set(DATADIR "share/${PROJECT_NAME}")
        set(BINDIR "bin")
-       set(DOCDIR "share/doc/minetest")
-       set(EXAMPLE_CONF_DIR "share/doc/minetest")
+       set(DOCDIR "share/doc/${PROJECT_NAME}")
+       set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
 endif()
 
 install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
@@ -103,7 +103,7 @@ elseif(APPLE)
        set(CPACK_BUNDLE_NAME ${PROJECT_NAME})
        set(CPACK_BUNDLE_ICON "")
        set(CPACK_BUNDLE_PLIST "")
-       set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/minetest")
+       set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/${PROJECT_NAME}")
        set(CPACK_GENERATOR "Bundle")
 else()
        set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux")

diff --git a/makepackage_binary.sh b/makepackage_binary.sh
index f00ec608c4da58e52374930e1bc2cda42b8dbff7..32d19865ab98e3585f5a52b379267a4209d68347 100755 (executable)
--- a/makepackage_binary.sh
+++ b/makepackage_binary.sh
@@ -1,17 +1,19 @@
 #!/bin/sh
 
-PACKAGEDIR=../minetest-packages
-PACKAGENAME=minetest-c55-binary-`date +%y%m%d%H%M%S`
+PROJECT_NAME=minetest-delta
+PACKAGEDIR=../$PROJECT_NAME-packages
+PACKAGENAME=$PROJECT_NAME-binary-`date +%y%m%d%H%M%S`
 PACKAGEPATH=$PACKAGEDIR/$PACKAGENAME
 
 mkdir -p $PACKAGEPATH
 mkdir -p $PACKAGEPATH/bin
 mkdir -p $PACKAGEPATH/data
 mkdir -p $PACKAGEPATH/doc
+mkdir -p $PACKAGEPATH/locale/de/LC_MESSAGES/
 
 cp minetest.conf.example $PACKAGEPATH/
 
-cp bin/minetest.exe $PACKAGEPATH/bin/
+cp bin/$PROJECT_NAME.exe $PACKAGEPATH/bin/
 cp bin/Irrlicht.dll $PACKAGEPATH/bin/
 cp bin/zlibwapi.dll $PACKAGEPATH/bin/
 #cp bin/test $PACKAGEPATH/bin/
@@ -57,6 +59,8 @@ cp -r data/sand.png $PACKAGEPATH/data/
 
 cp -r doc/README.txt $PACKAGEPATH/doc/README.txt
 
+cp -r locale/de/LC_MESSAGES/$PROJECT_NAME.mo $PACKAGEPATH/locale/de/LC_MESSAGES/
+
 cd $PACKAGEDIR
 rm $PACKAGENAME.zip
 zip -r $PACKAGENAME.zip $PACKAGENAME

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a578eeb7954fb0ea93973dc43e403031985333fa..2e99ec0c98f616e7978c9f72c91c5eea4fc5c505 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(minetest)
+project(minetest-delta)
 cmake_minimum_required( VERSION 2.6 )
 
 if(RUN_IN_PLACE)
@@ -153,9 +153,9 @@ include_directories(
 set(EXECUTABLE_OUTPUT_PATH ../bin)
 
 if(BUILD_CLIENT)
-       add_executable(minetest ${minetest_SRCS})
+       add_executable(${PROJECT_NAME} ${minetest_SRCS})
        target_link_libraries(
-               minetest
+               ${PROJECT_NAME}
                ${ZLIB_LIBRARIES}
                ${IRRLICHT_LIBRARY}
                ${OPENGL_LIBRARIES}
@@ -172,9 +172,9 @@ if(BUILD_CLIENT)
 endif(BUILD_CLIENT)
 
 if(BUILD_SERVER)
-       add_executable(minetestserver ${minetestserver_SRCS})
+       add_executable(${PROJECT_NAME}server ${minetestserver_SRCS})
        target_link_libraries(
-               minetestserver
+               ${PROJECT_NAME}server
                ${ZLIB_LIBRARIES}
                ${PLATFORM_LIBS}
                ${JTHREAD_LIBRARY}
@@ -199,7 +199,7 @@ if(MSVC)
        set(CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Ob0 /Od /RTC1")
        
        if(BUILD_SERVER)
-               set_target_properties(minetestserver PROPERTIES
+               set_target_properties(${PROJECT_NAME}server PROPERTIES
                                COMPILE_DEFINITIONS "SERVER")
        endif(BUILD_SERVER)
 
@@ -233,7 +233,7 @@ else()
        endif()
        
        if(BUILD_SERVER)
-               set_target_properties(minetestserver PROPERTIES
+               set_target_properties(${PROJECT_NAME}server PROPERTIES
                                COMPILE_DEFINITIONS "SERVER")
        endif(BUILD_SERVER)
 
@@ -250,13 +250,13 @@ endif()
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
 
 if(BUILD_CLIENT)
-       install(TARGETS minetest DESTINATION ${BINDIR})
+       install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
        file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/*.png")
 
        install(FILES ${images} DESTINATION ${DATADIR})
 
-       install(FILES ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo DESTINATION locale/de/LC_MESSAGES)
+       install(FILES ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-delta.mo DESTINATION locale/de/LC_MESSAGES)
  
        if(WIN32)
                if(DEFINED IRRLICHT_DLL)
@@ -273,7 +273,7 @@ if(BUILD_CLIENT)
 endif(BUILD_CLIENT)
 
 if(BUILD_SERVER)
-       install(TARGETS minetestserver DESTINATION ${BINDIR})
+       install(TARGETS ${PROJECT_NAME}server DESTINATION ${BINDIR})
 endif(BUILD_SERVER)
 
 if(WIN32)
@@ -287,15 +287,15 @@ endif()
 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES COMMENT "mo-update [de]: Creating locale directory.")
 
 add_custom_command(
-               OUTPUT ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo
-               COMMAND ${GETTEXT_MSGFMT} -o ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo ${CMAKE_SOURCE_DIR}/po/de/minetest-c55.po 
+               OUTPUT ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-delta.mo
+               COMMAND ${GETTEXT_MSGFMT} -o ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-delta.mo ${CMAKE_SOURCE_DIR}/po/de/minetest-c55.po 
                DEPENDS 
                        ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES
                        ${CMAKE_SOURCE_DIR}/po/de/minetest-c55.po
                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/po/de
                COMMENT "mo-update [de]: Creating mo file."
                )
-add_custom_target(translation_de ALL COMMENT "mo update [de]" DEPENDS ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo)
+add_custom_target(translation_de ALL COMMENT "mo update [de]" DEPENDS ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-delta.mo)
 
 # Subdirectories