Merge lp:~stellarium/stellarium/splash-icon into lp:stellarium

[Alexander Wolf]

This feature is introducing cosmetic difference between releases and packages for testing.

[gzotti (georg-zotti)]

Do I see it right: You would have to specify BZR_REVISION at cmake configure time, manually? This is far from really applicable. In most cases when building with qtcreator, you don't even see the cmake options.

Is it possible to call bzr in the configuration phase (in the cmake script) to create a header? E.g.

http://doc.bazaar.canonical.com/latest/en/user-guide/version_info.html

indicates the following:

bzr version-info --custom \
     --template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n" \
     > version_info.h

This could be included then in main.cpp and StelUtils.cpp.

In addition, for this scenario (and IMHO this should be done in any case), STELLARIUM_RELEASE_BUILD should be 0 by default and only set to 1 for real builds.

review: Needs Information

[Alexander Wolf (alexwolf)]

1) EXECUTE_PROCESS available since CMake 3.0.2 and previous version of determination of revision number will cause a broken compile of source code

2) Windows installer will never install release 0.15.0.0 because any snapshot has more high version, e.g. 0.15.0.8410

[gzotti (georg-zotti)]

(1) You mean, we should not use execute_process to keep cmake 2.8 compatibility? Sorry.
(2) Oops, I never saw the installer checks this. (I can install whatever version I want!) Maybe Stellarium dev.version should not be called 0.15.0.x before release of 0.15.0? Something like 0.14.9?
In any case, PACKAGE_VERSION_RC with a bzr string in front breaks compilation on Windows, the components must be integers.

[Alexander Wolf (alexwolf)]

(1) I added support of both versions now, it's fixed already
(2) Wrong place of editing :)

I changed of numbering of versions now. And we need a new rule for numbering of versions at the moment.

[gzotti (georg-zotti)]

Good! It builds, and I think this numbering system with keeping high 0.14.X is better. Even a release could have a bzr number IMHO, but I don't insist on that.
What about showing branch name (i.e. name of branch directory) on the dev splash? It may be extracted as last part of CMAKE_CURRENT_SOURCE_DIR. Only releases should not show branch names.

But I came to one thought: Is there a scenario of building without BZR connection? Do we offer Tarball downloads? There would have to be a workaround. (The execute_process line can be enriched with fallbacks, or BZR_REVISION must be tested.) Or some header/config must be created before wrapping the tar. :-(

review: Needs Information

[lp:~stellarium/stellarium/splash-icon]

8413. By Alexander Wolf on 2016-05-31

Added branch info

[Alexander Wolf (alexwolf)]

Forced set CMAKE_BUILD_TYPE=Release and STELLARIUM_RELEASE_BUILD=1 in tarball of source code and no problems

[gzotti (georg-zotti)]

Ah right. Perfect, and thanks for the branch name :-)

review: Approve

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-28 18:04:32 +0000
+++ CMakeLists.txt	2016-05-31 18:55:35 +0000
@@ -19,8 +19,8 @@
 ########### Project name ###########
 PROJECT(Stellarium)
 SET(STELLARIUM_MAJOR "0")
-SET(STELLARIUM_MINOR "15")
-SET(STELLARIUM_PATCH "0")
+SET(STELLARIUM_MINOR "14")
+SET(STELLARIUM_PATCH "90")
 SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}")
 SET(PACKAGE stellarium)
 SET(COPYRIGHT_YEARS "2000-2016")
@@ -39,6 +39,11 @@
     SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: None Debug GProf Valgrind Release RelWithDebInfo MinSizeRel." FORCE)
 ENDIF()
 
+SET(STELLARIUM_RELEASE_BUILD 0 CACHE BOOL "Set 1 to build as an official release (0 for development snapshots).")
+IF(STELLARIUM_RELEASE_BUILD)
+     ADD_DEFINITIONS(-DSTELLARIUM_RELEASE_BUILD)
+ENDIF()
+
 # GZ I had seen that some releases (e.g. 0.13.3 Ubuntu/ARM) were not compiled with NDEBUG defined. Maybe a bug in compilatation setup? 
 # Hint from http://public.kitware.com/Bug/view.php?id=14292. Actually fixed with CMake 2.8.12, but maybe we have other effects?
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -135,10 +140,6 @@
      ADD_DEFINITIONS(-DENABLE_NLS)
 ENDIF()
 
-SET(STELLARIUM_RELEASE_BUILD 1 CACHE BOOL "Flag this build as an official release.")
-IF(STELLARIUM_RELEASE_BUILD)
-     ADD_DEFINITIONS(-DSTELLARIUM_RELEASE_BUILD)
-ENDIF()
 
 # Activate media support
 SET(ENABLE_MEDIA 1 CACHE BOOL "Define whether media support should be activated.")
@@ -287,11 +288,15 @@
 
 ########### Get revision number for non-release builds ###########
 IF(NOT STELLARIUM_RELEASE_BUILD)
-    #Hack until CMake detection for Bazaar is finished
+    # Hack until CMake detection for Bazaar is finished
+    EXECUTE_PROCESS(COMMAND bzr revno WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} TIMEOUT 30 OUTPUT_VARIABLE BZR_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE)
+    EXECUTE_PROCESS(COMMAND bzr version-info --custom --template={branch_nick} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} TIMEOUT 30 OUTPUT_VARIABLE BZR_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
     IF(BZR_REVISION)
-        SET(PACKAGE_VERSION "bzr${BZR_REVISION}")
+        SET(PACKAGE_VERSION "${VERSION}.${BZR_REVISION}")
         ADD_DEFINITIONS(-DBZR_REVISION="${BZR_REVISION}")
+        ADD_DEFINITIONS(-DBZR_BRANCH="${BZR_BRANCH}")
     ENDIF()
+#    MESSAGE(STATUS "Branch: ${BZR_BRANCH}; Revision: ${BZR_REVISION}")
     IF(STELLARIUM_VERSION)
         SET(PACKAGE_VERSION "${STELLARIUM_VERSION}")
         ADD_DEFINITIONS(-DSTELLARIUM_VERSION="${STELLARIUM_VERSION}")
@@ -301,6 +306,16 @@
 
 IF(WIN32)
     #######################################################
+    ### Generate icon file name                         ###
+    #######################################################
+
+    IF(STELLARIUM_RELEASE_BUILD)
+       SET(PACKAGE_ICON "stellarium")
+    ELSE()
+       SET(PACKAGE_ICON "stellarium-gray")
+    ENDIF()
+
+    #######################################################
     ### Generate a VersionInfo file                     ###
     #######################################################
 

=== modified file 'cmake/stellarium.iss.cmake'
--- cmake/stellarium.iss.cmake	2016-05-28 18:04:32 +0000
+++ cmake/stellarium.iss.cmake	2016-05-31 18:55:35 +0000
@@ -19,7 +19,7 @@
 AppUpdatesURL=http://www.stellarium.org/
 VersionInfoVersion=@PACKAGE_VERSION@
 MinVersion=0,@MIN_VERSION@
-SetupIconFile=@CMAKE_SOURCE_DIR@\data\stellarium.ico
+SetupIconFile=@CMAKE_SOURCE_DIR@\data\@PACKAGE_ICON@.ico
 OutputBaseFilename=stellarium-@PACKAGE_VERSION@-@ISS_PACKAGE_PLATFORM@
 OutputDir=@CMAKE_SOURCE_DIR@\installers
 ; In 64-bit mode, {pf} is equivalent to {pf64},

=== modified file 'cmake/stellarium.rc.cmake'
--- cmake/stellarium.rc.cmake	2016-05-28 18:04:32 +0000
+++ cmake/stellarium.rc.cmake	2016-05-31 18:55:35 +0000
@@ -1,4 +1,4 @@
-stellarium-icon ICON "@CMAKE_SOURCE_DIR@/data/stellarium.ico"
+stellarium-icon ICON "@CMAKE_SOURCE_DIR@/data/@PACKAGE_ICON@.ico"
 1 VERSIONINFO
 FILEVERSION     @PACKAGE_VERSION_RC@
 PRODUCTVERSION  @PACKAGE_VERSION_RC@

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-05-28 18:04:32 +0000
+++ data/CMakeLists.txt	2016-05-31 18:55:35 +0000
@@ -1,6 +1,56 @@
+
 ########### install files ###############
-
-INSTALL(FILES stellarium.ico ssystem.ini ssystem_1000comets.ini base_locations.bin.gz DejaVuSans.ttf default_config.ini DejaVuSansMono.ttf iso639-1.utf8 iso3166-1-alpha-2.utf8 countryCodes.dat constellations_boundaries.dat DESTINATION share/${PACKAGE}/data)
+INSTALL(FILES ssystem.ini ssystem_1000comets.ini base_locations.bin.gz DejaVuSans.ttf default_config.ini DejaVuSansMono.ttf iso639-1.utf8 iso3166-1-alpha-2.utf8 countryCodes.dat constellations_boundaries.dat DESTINATION share/${PACKAGE}/data)
+
+########### splash target ##############
+ADD_CUSTOM_TARGET(splash ALL)
+SET(_splashFile splash.png)
+SET(_splashDstFile ${CMAKE_CURRENT_BINARY_DIR}/${_splashFile})
+
+IF(NOT STELLARIUM_RELEASE_BUILD)
+	GET_FILENAME_COMPONENT(_splashSrcFile splash-gray.png ABSOLUTE)
+ELSE()
+	GET_FILENAME_COMPONENT(_splashSrcFile splash.png ABSOLUTE)
+ENDIF()
+
+ADD_CUSTOM_COMMAND(
+	TARGET splash
+	COMMAND ${CMAKE_COMMAND} -E copy ${_splashSrcFile} ${_splashDstFile}
+)
+
+########### icon target ###############
+ADD_CUSTOM_TARGET(icon ALL)
+IF(MACOSX)
+	SET(_iconFile Icon.icns)
+	IF(NOT STELLARIUM_RELEASE_BUILD)
+		GET_FILENAME_COMPONENT(_iconSrcFile IconGray.icns ABSOLUTE)
+	ELSE()
+		GET_FILENAME_COMPONENT(_iconSrcFile Icon.icns ABSOLUTE)
+	ENDIF()
+ELSE()
+	SET(_iconFile stellarium.ico)
+	IF(NOT STELLARIUM_RELEASE_BUILD)
+		GET_FILENAME_COMPONENT(_iconSrcFile stellarium-gray.ico ABSOLUTE)
+	ELSE()
+		GET_FILENAME_COMPONENT(_iconSrcFile stellarium.ico ABSOLUTE)
+	ENDIF()	
+ENDIF()
+
+SET(_iconDstFile ${CMAKE_CURRENT_BINARY_DIR}/${_iconFile})
+ADD_CUSTOM_COMMAND(
+	TARGET icon
+	COMMAND ${CMAKE_COMMAND} -E copy ${_iconSrcFile} ${_iconDstFile}
+)
+
+# install splash and icon
+IF(MACOSX)
+	INSTALL(FILES ${_iconDstFile} DESTINATION share RENAME ${_iconFile})
+	INSTALL(FILES ${_splashDstFile} DESTINATION share/data RENAME ${_splashFile})
+	INSTALL(FILES Info.plist PkgInfo DESTINATION .)
+ELSE()
+	INSTALL(FILES ${_iconDstFile} DESTINATION share/${PACKAGE}/data RENAME ${_iconFile})
+	INSTALL(FILES ${_splashDstFile} DESTINATION share/${PACKAGE}/data RENAME ${_splashFile})
+ENDIF()
 
 # install Scenery3d shaders
 INSTALL(DIRECTORY shaders/ DESTINATION share/${PACKAGE}/data/shaders FILES_MATCHING 
@@ -29,8 +79,3 @@
 	INSTALL(FILES icons/512x512/stellarium.png DESTINATION share/icons/hicolor/512x512/apps)
 ENDIF()
 
-IF(MACOSX)
-	INSTALL(FILES Icon.icns DESTINATION share )
-	INSTALL(FILES Info.plist PkgInfo DESTINATION . )
-ENDIF(MACOSX)
-

=== added file 'data/IconGray.icns'
Binary files data/IconGray.icns	1970-01-01 00:00:00 +0000 and data/IconGray.icns	2016-05-31 18:55:35 +0000 differ
=== modified file 'data/mainRes.qrc'
--- data/mainRes.qrc	2015-08-19 09:53:29 +0000
+++ data/mainRes.qrc	2016-05-31 18:55:35 +0000
@@ -4,6 +4,5 @@
     </qresource>
     <qresource prefix="/">
         <file>shaders/xyYToRGB.glsl</file>
-        <file>splash.png</file>
     </qresource>
 </RCC>

=== added file 'data/splash-gray.png'
Binary files data/splash-gray.png	1970-01-01 00:00:00 +0000 and data/splash-gray.png	2016-05-31 18:55:35 +0000 differ
=== modified file 'data/splash.bmp'
Binary files data/splash.bmp	2006-12-16 13:24:58 +0000 and data/splash.bmp	2016-05-31 18:55:35 +0000 differ
=== modified file 'src/core/StelUtils.cpp'
--- src/core/StelUtils.cpp	2016-04-23 15:55:46 +0000
+++ src/core/StelUtils.cpp	2016-05-31 18:55:35 +0000
@@ -47,16 +47,12 @@
 //! Return the version of stellarium, i.e. "0.9.0"
 QString getApplicationVersion()
 {
-#ifdef STELLARIUM_RELEASE_BUILD
+#if defined(STELLARIUM_VERSION)
+	return QString(STELLARIUM_VERSION);
+#elif defined(BZR_REVISION)
+	return QString("%1.%2 [%3]").arg(PACKAGE_VERSION).arg(BZR_REVISION).arg(BZR_BRANCH);
+#else
 	return QString(PACKAGE_VERSION);
-#else
-	#ifdef BZR_REVISION
-	return QString(PACKAGE_VERSION)+" (BZR r"+BZR_REVISION+")";
-	#elif defined(STELLARIUM_VERSION)
-	return QString(STELLARIUM_VERSION);
-	#else
-	return QString(PACKAGE_VERSION)+QChar(0x03B2);
-	#endif
 #endif
 }
 

=== modified file 'src/main.cpp'
--- src/main.cpp	2016-03-29 23:08:37 +0000
+++ src/main.cpp	2016-05-31 18:55:35 +0000
@@ -151,10 +151,6 @@
 	QGuiApplication::setDesktopSettingsAware(false);
 	QGuiApplication app(argc, argv);
 #endif
-	QPixmap pixmap(":/splash.png");
-	QSplashScreen splash(pixmap);
-	splash.show();
-	app.processEvents();
 
 	// QApplication sets current locale, but
 	// we need scanf()/printf() and friends to always work in the C locale,
@@ -164,6 +160,12 @@
 	// Init the file manager
 	StelFileMgr::init();
 
+	QPixmap pixmap(StelFileMgr::findFile("data/splash.png"));
+	QSplashScreen splash(pixmap);
+	splash.show();
+	splash.showMessage(StelUtils::getApplicationVersion() , Qt::AlignLeft, Qt::white);
+	app.processEvents();
+
 	// Log command line arguments.
 	QString argStr;
 	QStringList argList;