feat: Prepare build 1

Author: diegomrno

CMakeLists.txt

@@ -7,12 +7,15 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fPIC")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(VORTEX_VERSION "1.0")
-set(VORTEX_FULL_VERSION "1.0.1")
+set(VORTEX_FULL_VERSION "1.0.build1")
 set(VORTEX_BUILDID "1")
-set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/dist/${VORTEX_VERSION} CACHE PATH "Installation directory" FORCE)
+set(VORTEX_BUILDNAME "1.0 [build 1]")
+
+set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/dist/${VORTEX_FULL_VERSION} CACHE PATH "Installation directory" FORCE)
 
 set(VORTEX_DIST "beta")
-set(VORTEX_BUILD "dev")
+set(VORTEX_BUILD "prod")
+
 if (MSVC)
     add_compile_options(/utf-8)
 endif()
@@ -23,6 +26,9 @@ if(VORTEX_BUILD STREQUAL "prod")
     add_compile_definitions(BUILD_DATE_STR="${BUILD_DATE}")
     add_compile_definitions(BUILD_DIST="${BUILD_DATE}")
 
+    add_compile_definitions(VORTEX_BUILDID="${VORTEX_BUILDID}")
+    add_compile_definitions(VORTEX_BUILDNAME="${VORTEX_BUILDNAME}")
+
     execute_process(
         COMMAND git rev-parse --short HEAD  
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -36,6 +42,8 @@ else()
     add_compile_definitions(BUILD_DIST="DEV_BUILD")
     add_compile_definitions(GIT_COMMIT_HASH="0000000")
     add_compile_definitions(VORTEX_BUILD="dev")
+    add_compile_definitions(VORTEX_BUILDID="${VORTEX_BUILDID}")
+    add_compile_definitions(VORTEX_BUILDNAME="${VORTEX_BUILDNAME}")
 endif()
 
 find_package(Vulkan REQUIRED)
@@ -72,15 +80,15 @@ if(UNIX AND NOT APPLE)
 endif()
 
 if(UNIX AND NOT APPLE)
-    set(INSTALL_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/dist/${VORTEX_VERSION})
+    set(INSTALL_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/dist/${VORTEX_FULL_VERSION})
     set(INSTALL_MAIN_DIR ${INSTALL_BASE_DIR}/)
     set(INSTALL_BIN_DIR ${INSTALL_BASE_DIR}/bin)
-    set(INSTALL_LIB_DIR ${INSTALL_BASE_DIR}/lib)
+    set(INSTALL_LIB_DIR ${INSTALL_BASE_DIR}/bin)
     set(INSTALL_INCLUDE_DIR ${INSTALL_BASE_DIR}/include)
 elseif(WIN32)
-    set(INSTALL_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/dist/${VORTEX_VERSION})
+    set(INSTALL_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/dist/${VORTEX_FULL_VERSION})
     set(INSTALL_BIN_DIR ${INSTALL_BASE_DIR}/bin)
-    set(INSTALL_LIB_DIR ${INSTALL_BASE_DIR}/lib)
+    set(INSTALL_LIB_DIR ${INSTALL_BASE_DIR}/bin)
     set(INSTALL_MAIN_DIR ${INSTALL_BASE_DIR}/)
     set(INSTALL_INCLUDE_DIR ${INSTALL_BASE_DIR}/include)
 endif()

assets/images/vortex_banner.png

@@ -9,4 +9,8 @@ PROJECT_PATH="${SCRIPT_DIR}/../tests/project/"
 
 SESSION_ID="editor-$(date +%m-%d-%Y-%H-%M-%S)-$(shuf -i 1000-9999 -n 1)"
 
-cd "$PROJECT_PATH" && bash "$VORTEX_PATH/handle_crash.sh" "~/.vx/sessions/${SESSION_ID}/crash/core_dumped.txt" valgrind "$VORTEX_PATH/vortex --editor --session_id="${SESSION_ID}""
+cd "$PROJECT_PATH" && bash "$VORTEX_PATH/handle_crash.sh" \
+  "$HOME/.vx/sessions/${SESSION_ID}/crash/core_dumped.txt" \
+  "$VORTEX_PATH/vortex" --editor --session_id="\"$SESSION_ID\"" \
+  ::END:: \
+  "$VORTEX_PATH/vortex" --crash --session_id="\"$SESSION_ID\""

build/test_project.sh

@@ -1,5 +1,6 @@
 {
-    "name": "Vortex 1.0 Snapshot 1",
+    "name": "1.0 [build 1]",
+    "build_id": "1",
     "full_version": "1.0.1",
     "version": "1.0",
     "image": "vortex_banner.png"

manifest.json

@@ -11,6 +11,10 @@ std::string getGitCommit() { return GIT_COMMIT_HASH; }
 
 std::string getVortexEditorDist() { return BUILD_DIST; }
 
+std::string getVortexBuildID() { return VORTEX_BUILDID; }
+
+std::string getVortexBuildName() { return VORTEX_BUILDNAME; }
+
 #ifdef _WIN32
 #define VORTEX_EXECUTABLE "vortex_launcher.exe"
 #else
@@ -279,13 +283,17 @@ void AboutVortex::Render() {
   Cherry::SetNextComponentProperty("color_text", "#878787");
   CherryKit::TextSimple("Version: " + vortex_launcher_version);
 
+  CherryGUI::SameLine();
+  Cherry::SetNextComponentProperty("color_text", "#565656");
+  CherryKit::TextSimple(getVortexBuildName());
+
   CherryKit::Space(12.0f);
 
   Cherry::SetNextComponentProperty("color_text", "#878787");
   CherryKit::TextSimple("Cherry version: " + cherry_version);
   Cherry::SetNextComponentProperty("color_text", "#878787");
-  CherryKit::TextSimple("Build: " + getBuildDate() + " (" +
-                        getVortexEditorDist() + ")");
+  CherryKit::TextSimple("Build: " + getVortexBuildID() + " ; " +
+                        getBuildDate() + " (" + getVortexEditorDist() + ")");
   Cherry::SetNextComponentProperty("color_text", "#878787");
   CherryKit::TextSimple("Hash: "
                         " exe(" +

ui/editor/app/core/about/about.cpp

@@ -1 +1 @@
-1.0
+1.0.build1