Merge pull request #25 from Tom94/better-deployment

Improve deployment process

Author: Tom94

CMakeLists.txt

@@ -3,7 +3,17 @@
 cmake_minimum_required(VERSION 2.8.3)
 
 project(tev)
-set(VERSION "1.5.dev")
+set(TEV_VERSION "1.5")
+
+if (NOT TEV_DEPLOY)
+    set(TEV_VERSION "${TEV_VERSION}dev")
+endif()
+
+if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(TEV_VERSION "${TEV_VERSION} (64 bit)")
+elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set(TEV_VERSION "${TEV_VERSION} (32 bit)")
+endif()
 
 # Set ourselves as the startup project in visual studio.
 # Not available until cmake 3.6, but doesn't break older versions.
@@ -111,9 +121,9 @@ if (APPLE)
     set_target_properties(tev PROPERTIES
         MACOSX_BUNDLE TRUE
         MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/resources/Info.plist"
-        MACOSX_BUNDLE_BUNDLE_VERSION ${VERSION}
-        MACOSX_BUNDLE_SHORT_VERSION_STRING ${VERSION}
-        MACOSX_BUNDLE_LONG_VERSION_STRING ${VERSION}
+        MACOSX_BUNDLE_BUNDLE_VERSION ${TEV_VERSION}
+        MACOSX_BUNDLE_SHORT_VERSION_STRING ${TEV_VERSION}
+        MACOSX_BUNDLE_LONG_VERSION_STRING ${TEV_VERSION}
         RESOURCE "${RESOURCE_FILES}"
     )
 endif()
@@ -130,7 +140,7 @@ include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/include"
 )
 
-add_definitions(${NANOGUI_EXTRA_DEFS})
+add_definitions(-DTEV_VERSION="${TEV_VERSION}" ${NANOGUI_EXTRA_DEFS})
 
 target_link_libraries(tev ${TEV_LIBS})
 

resources/screenshot.png

@@ -3,19 +3,23 @@
 cd "$(dirname ${BASH_SOURCE[0]})"
 
 echo "Building backwards-compatible tev..."
-mkdir build-dmg && cd build-dmg
+
+BUILD_DIR="build-dmg"
+
+mkdir $BUILD_DIR && cd $BUILD_DIR
 MACOSX_DEPLOYMENT_TARGET=10.9
 cmake \
     -DCMAKE_OSX_SYSROOT=/Users/tom94/Projects/MacOSX-SDKs/MacOSX10.9.sdk/ \
     -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 \
+    -DTEV_DEPLOY=1 \
     ../..
 make -j
 cd ..
 
 echo "Creating dmg..."
 RESULT="../tev.dmg"
 test -f $RESULT && rm $RESULT
-./create-dmg/create-dmg --window-size 500 300 --icon-size 96 --volname "tev Installer" --app-drop-link 360 105 --icon tev.app 130 105 $RESULT ./build-dmg/tev.app
+./create-dmg/create-dmg --window-size 500 300 --icon-size 96 --volname "tev Installer" --app-drop-link 360 105 --icon tev.app 130 105 $RESULT $BUILD_DIR/tev.app
 
 echo "Removing temporary build dir..."
-rm -rf build-dmg
+rm -rf $BUILD_DIR

scripts/create-dmg.sh

@@ -0,0 +1,33 @@
+@echo off
+
+set cwd=%cd%
+cd /D %~dp0
+
+set DevCmd="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
+set MSBuildOptions=/v:m /p:Configuration=Release
+set BuildDir64="build-exe-64"
+set BuildDir32="build-exe-32"
+
+call %DevCmd%
+
+echo Building 64-bit tev...
+mkdir %BuildDir64%
+cd %BuildDir64%
+cmake -DTEV_DEPLOY=1 -G "Visual Studio 15 2017 Win64" ..\..
+msbuild %MSBuildOptions% tev.sln
+move "Release\tev.exe" "..\..\tev.exe"
+cd ..
+rmdir /S /Q %BuildDir64%
+
+echo Building 32-bit tev...
+mkdir %BuildDir32%
+cd %BuildDir32%
+cmake -DTEV_DEPLOY=1 -G "Visual Studio 15 2017" ..\..
+msbuild %MSBuildOptions% tev.sln
+move "Release\tev.exe" "..\..\tev-32bit.exe"
+cd ..
+rmdir /S /Q %BuildDir32%
+
+echo Returning to original directory.
+cd /D %cwd%
+pause

scripts/create-exe.bat

@@ -126,10 +126,10 @@ HelpWindow::HelpWindow(Widget *parent, function<void()> closeCallback)
         Widget* about = tabWidget->createTab("About");
         about->setLayout(new GroupLayout{});
 
-        auto addText = [](Widget* current, string text) {
+        auto addText = [](Widget* current, string text, string font = "sans", int fontSize = 18) {
             auto row = new Widget{current};
             row->setLayout(new BoxLayout{Orientation::Vertical, Alignment::Middle, 0, 10});
-            new Label{row, text, "sans", 18};
+            new Label{row, text, font, fontSize };
         };
 
         auto addLibrary = [](Widget* current, string name, string license, string desc) {
@@ -148,7 +148,12 @@ HelpWindow::HelpWindow(Widget *parent, function<void()> closeCallback)
             row->setHeight(space);
         };
 
-        addSpacer(about, 20);
+        addSpacer(about, 15);
+
+        addText(about, "tev — The EXR Viewer", "sans-bold", 46);
+        addText(about, "version " TEV_VERSION, "sans", 26);
+
+        addSpacer(about, 60);
 
         addText(about, "tev was developed by Thomas Müller and is released under the BSD 3-Clause License.");
         addText(about, "It was built directly or indirectly upon the following amazing third-party libraries.");