Add .gitlab-ci.yml

.gitlab-ci.yml

@@ -0,0 +1,122 @@
+.build:variables:
+  variables: &build_variables
+    GIT_SUBMODULE_STRATEGY: recursive
+    URDE_MACOS_CODESIGN_UID: VMFVV424V2
+
+.build:macos: &macos_definition
+  stage: build
+  tags:
+    - macos
+  script:
+    - mkdir build
+    - cd build
+    - >
+      cmake
+      -GNinja
+      -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      -DLLVM_ROOT_DIR=/opt/urde-llvm
+      -DURDE_DLPACKAGE=urde-$CI_PIPELINE_ID-macos-x86_64-$URDE_VECTOR_ISA
+      -DURDE_VECTOR_ISA=$URDE_VECTOR_ISA
+      ..
+    - ninja urde hecl visigen
+    - cd Editor
+    - cp -R urde.app $CI_PROJECT_DIR/URDE.app
+    - cd $CI_PROJECT_DIR
+    - strip -S -o URDE.app/Contents/MacOS/urde URDE.app/Contents/MacOS/urde
+    - strip -S -o URDE.app/Contents/MacOS/hecl URDE.app/Contents/MacOS/hecl
+    - strip -S -o URDE.app/Contents/MacOS/visigen URDE.app/Contents/MacOS/visigen
+    - codesign -s $URDE_MACOS_CODESIGN_UID -v --deep URDE.app
+  only:
+    - release
+  artifacts:
+    name: "urde-$CI_PIPELINE_ID-macos-x86_64-$URDE_VECTOR_ISA"
+    paths:
+      - URDE.app/
+    expire_in: 1 week
+
+build:macos:sse3:
+  <<: *macos_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: sse3
+
+build:macos:sse41:
+  <<: *macos_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: sse41
+
+build:macos:avx:
+  <<: *macos_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: avx
+
+build:macos:avx2:
+  <<: *macos_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: avx2
+
+.build:linux: &linux_definition
+  stage: build
+  tags:
+    - linux
+  script:
+    - mkdir build
+    - cd build
+    - >
+      cmake
+      -GNinja
+      -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      -DURDE_DLPACKAGE=urde-$CI_PIPELINE_ID-linux-x86_64-$URDE_VECTOR_ISA
+      -DURDE_VECTOR_ISA=$URDE_VECTOR_ISA
+      ..
+    - ninja urde hecl visigen
+    - cp Editor/urde $CI_PROJECT_DIR
+    - strip --strip-debug -o $CI_PROJECT_DIR/urde Editor/urde
+    - rm -r $CI_PROJECT_DIR/hecl
+    - strip --strip-debug -o $CI_PROJECT_DIR/hecl hecl/driver/hecl
+    - rm -r $CI_PROJECT_DIR/visigen
+    - strip --strip-debug -o $CI_PROJECT_DIR/visigen visigen/visigen
+  only:
+    - release
+  artifacts:
+    name: "urde-$CI_PIPELINE_ID-linux-x86_64-$URDE_VECTOR_ISA"
+    paths:
+      - urde
+      - hecl
+      - visigen
+    expire_in: 1 week
+
+build:linux:sse3:
+  <<: *linux_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: sse3
+
+build:linux:sse41:
+  <<: *linux_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: sse41
+
+build:linux:avx:
+  <<: *linux_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: avx
+
+build:linux:avx2:
+  <<: *linux_definition
+  variables:
+    <<: *build_variables
+    URDE_VECTOR_ISA: avx2
+
+deploy:
+  stage: deploy
+  dependencies: []
+  tags:
+    - server
+  script:
+    - python3 /var/lib/gitlab-runner/deploy_urde.py $CI_PIPELINE_ID

.vsts-index-linux.bash

@@ -1,5 +0,0 @@
-#!/bin/bash
-echo urde-$1-linux-$2-sse3.tar.xz > $3
-echo urde-$1-linux-$2-sse41.tar.xz >> $3
-echo urde-$1-linux-$2-avx.tar.xz >> $3
-echo urde-$1-linux-$2-avx2.tar.xz >> $3

.vsts-index-macos.bash

@@ -1,5 +0,0 @@
-#!/bin/bash
-echo urde-$1-macos-$2-sse3.app.tar.xz > $3
-echo urde-$1-macos-$2-sse41.app.tar.xz >> $3
-echo urde-$1-macos-$2-avx.app.tar.xz >> $3
-echo urde-$1-macos-$2-avx2.app.tar.xz >> $3

.vsts-index-win32.bash

@@ -1,5 +0,0 @@
-#!/bin/bash
-echo urde-$1-win32-$2-sse2.zip > $3
-echo urde-$1-win32-$2-sse41.zip >> $3
-echo urde-$1-win32-$2-avx.zip >> $3
-echo urde-$1-win32-$2-avx2.zip >> $3

DataSpec/CMakeLists.txt

@@ -73,5 +73,6 @@ if(COMMAND add_sanitizers)
   add_sanitizers(RetroDataSpec)
 endif()
 if(COMMAND cotire)
+  set_target_properties(RetroDataSpec PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
   cotire(RetroDataSpec)
 endif()

DataSpec/DNACommon/DNACommon.hpp

@@ -9,8 +9,6 @@
 #include "boo/ThreadLocalPtr.hpp"
 #include "zeus/CColor.hpp"
 
-namespace hecl { class BlenderToken; }
-
 namespace DataSpec
 {
 struct SpecBase;

Editor/CMakeLists.txt

@@ -100,7 +100,8 @@ if(COMMAND add_sanitizers)
   add_sanitizers(urde)
 endif()
 if(COMMAND cotire)
-  cotire(urde)
+    set_target_properties(urde PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
+    cotire(urde)
 endif()
 
 set_target_properties(urde PROPERTIES

Editor/SplashScreen.cpp

@@ -41,7 +41,11 @@ SplashScreen::SplashScreen(ViewManager& vm, specter::ViewResources& res)
         GIT_BRANCH[0]      != '\0')
     {
         m_buildInfoStr = hecl::Format("%s: %s\n%s: %s\n%s: %s",
+#ifdef URDE_DLPACKAGE
+                                      vm.translateOr("release", "Release").data(), URDE_DLPACKAGE,
+#else
                                       vm.translateOr("branch", "Branch").data(), GIT_BRANCH,
+#endif
                                       vm.translateOr("commit", "Commit").data(), GIT_COMMIT_HASH,
                                       vm.translateOr("date", "Date").data(), GIT_COMMIT_DATE);
     }

Editor/badging/CMakeLists.txt

@@ -3,6 +3,9 @@ if(NOT CMAKE_CROSSCOMPILING)
 include_directories(${LIBPNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 add_executable(packbadge packbadge.c)
 find_library(M_LIB m)
+if(NOT M_LIB)
+  unset(M_LIB CACHE)
+endif()
 target_link_libraries(packbadge ${PNG_LIB} ${ZLIB_LIBRARIES} ${M_LIB})
 
 ##################

Editor/icons/CMakeLists.txt

@@ -2,6 +2,9 @@ if(NOT CMAKE_CROSSCOMPILING)
 include_directories(${LIBPNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 add_executable(packicons packicons.c)
 find_library(M_LIB m)
+if(NOT M_LIB)
+  unset(M_LIB CACHE)
+endif()
 target_link_libraries(packicons ${PNG_LIB} ${ZLIB_LIBRARIES} ${M_LIB})
 
 ##################

Runtime/CMakeLists.txt

@@ -121,6 +121,7 @@ if(COMMAND add_sanitizers)
   add_sanitizers(RuntimeCommon)
 endif()
 if(COMMAND cotire)
+  set_target_properties(RuntimeCommon PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
   cotire(RuntimeCommon)
 endif()
 

amuse

@@ -1 +1 @@
-Subproject commit 985994a291d0e6e971d9c7fe07c2d4a22037bdb7
+Subproject commit 3f9a91b0ab960f6f4581343645fa4c2e871a0694

hecl

@@ -1 +1 @@
-Subproject commit 23850bb06d6affaf57379f5a8bcfd5a624bf8d04
+Subproject commit 3005d50ead7e443eb82297aad49aeb1b47ea0c47