Finished work on release workflows

Author: michaelrossherron

.github/workflows/linuxRelease.yml

@@ -9,10 +9,10 @@ on:
         type: string
 jobs:
   call_workflow:
-    uses: febiosoftware/febio-workflows/.github/workflows/linux-release.yml@develop
+    uses: febiosoftware/febio-workflows/.github/workflows/linux-release.yml@ci/develop
     with:
       febioVer: ${{inputs.febioVer}}
       fbsVer: ${{inputs.fbsVer}}
-      aws-ami-id: ami-0590ebdb5afffb782
+      aws-ami-id: ami-0b97a2de37c43b9ba
       aws-sg-id: sg-0ca7912782cf1538b
     secrets: inherit

.github/workflows/macOSRelease.yml

@@ -0,0 +1,16 @@
+on:
+  workflow_dispatch:
+    inputs:
+      fbsVer:
+        required: true
+        type: string
+      febioVer:
+        required: true
+        type: string
+jobs:
+  call_workflow:
+    uses: febiosoftware/febio-workflows/.github/workflows/macos-release.yml@ci/develop
+    with:
+      febioVer: ${{inputs.febioVer}}
+      fbsVer: ${{inputs.fbsVer}}
+    secrets: inherit

.github/workflows/windowsRelease.yml

@@ -0,0 +1,18 @@
+on:
+  workflow_dispatch:
+    inputs:
+      fbsVer:
+        required: true
+        type: string
+      febioVer:
+        required: true
+        type: string
+jobs:
+  call_workflow:
+    uses: febiosoftware/febio-workflows/.github/workflows/windows-release.yml@ci/develop
+    with:
+      febioVer: ${{inputs.febioVer}}
+      fbsVer: ${{inputs.fbsVer}}
+      aws-ami-id: ami-0b18c665dbe9efa75
+      aws-sg-id: sg-0ca7912782cf1538b
+    secrets: inherit

CMakeLists.txt

@@ -426,9 +426,6 @@ endforeach(name)
 
 ##### Add binaries #####
 
-# Linking the Qt libraries also pulls in the include files
-link_libraries(Qt6::Core Qt6::Widgets Qt6::Gui Qt6::Network Qt6::OpenGL Qt6::OpenGLWidgets)
-
 # set the name of the executable
 if (WIN32)
     set(FBS_BIN_NAME FEBioStudio2)
@@ -519,6 +516,17 @@ endif()
 
 ##### Link Libraries #####
 
+# Linking the Qt libraries also pulls in the include files
+target_link_libraries(${FBS_BIN_NAME} Qt6::Core Qt6::Widgets Qt6::Gui Qt6::Network Qt6::OpenGL Qt6::OpenGLWidgets)
+target_link_libraries(CUILib Qt6::Widgets)
+target_link_libraries(GLWLib Qt6::Gui Qt6::OpenGLWidgets)
+target_link_libraries(PostGL Qt6::Gui)
+target_link_libraries(GLLib Qt6::OpenGL Qt6::OpenGLWidgets)
+target_link_libraries(FSCore Qt6::Core)
+target_link_libraries(MeshIO Qt6::Core)
+target_link_libraries(MeshTools Qt6::Core)
+target_link_libraries(ImageLib Qt6::Core Qt6::Gui)
+
 if(WIN32)
 elseif(APPLE)
 else()
@@ -700,18 +708,4 @@ if(BUILD_UPDATER)
     findLib(FEBio_LIB_DIR XML_LIB xml)
 
     target_link_libraries(FEBioStudioUpdater Qt6::Widgets Qt6::Network ${XML_LIB} ${LIBZIP_LIB})
-
-    if (APPLE)
-        set(MACOS_SHARED_BINARIES bin/FEBioStudioUpdater bin/mvUtil PARENT_SCOPE)
-    endif()
-
-    if(APPLE)
-        message(STATUS "MACOS_SHARED_BINARIES: ${MACOS_SHARED_BINARIES}")
-
-        add_custom_command(
-            TARGET ${FBS_BIN_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy
-                    ${MACOS_SHARED_BINARIES}
-                    $<TARGET_FILE_DIR:${FBS_BIN_NAME}> ./bin/${FBS_BIN_NAME}.app/Contents/MacOS)
-    endif()
 endif()

FindDependencies.cmake

@@ -440,8 +440,7 @@ elseif(APPLE)
 	find_library(SSL_LIB ssl
         PATHS /opt/openssl /usr/local/opt/ $ENV{HOME}/* $ENV{HOME}/*/*
         PATH_SUFFIXES "lib" "openssl/lib" "build" "build/lib" "Release" "Debug" "homebrew/lib"
-		DOC "OpenSSL library path"
-		NO_DEFAULT_PATH)
+		DOC "OpenSSL library path")
 else()
 	find_path(SSL_INC openssl/aes.h
         PATHS /opt/openssl /usr/local/opt/ $ENV{HOME}/* $ENV{HOME}/*/*
@@ -584,13 +583,11 @@ elseif(APPLE)
 	find_path(FFMPEG_INC libavformat/avformat.h
         PATHS /usr/local/homebrew /usr/local/opt/ /opt/ffmpeg $ENV{HOME}/* $ENV{HOME}/*/*
         PATH_SUFFIXES "include" "ffmpeg/include" "build" "build/include" "homebrew/include"
-		DOC "FFMPEG include directory"
-		NO_DEFAULT_PATH)
+		DOC "FFMPEG include directory")
 	find_library(FFMPEG_LIB avformat
         PATHS /usr/local/homebrew /usr/local/opt/ /opt/ffmpeg $ENV{HOME}/* $ENV{HOME}/*/*
         PATH_SUFFIXES "lib" "ffmpeg/lib" "build" "build/lib" "Release" "Debug" "homebrew/lib"
-		DOC "FFMPEG library path"
-		NO_DEFAULT_PATH)
+		DOC "FFMPEG library path")
 else()
 	find_path(FFMPEG_INC libavformat/avformat.h
         PATHS /usr/local/x86_64 /usr/include/ /opt/ffmpeg $ENV{HOME}/* $ENV{HOME}/*/*

Updater/mvUtil.cpp

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <iostream>
+#include <fstream>
 
 #ifdef WIN32
 #include <Windows.h>
@@ -24,6 +25,18 @@ int main(int argc, char* argv[])
 
     if((argc - start) % 2 != 0) return -1;
 
+    std::ofstream myfile;
+    myfile.open ("mvUtil.log");
+
+    myfile << "Args:" << std::endl;
+
+    for(int index = 0; index < argc; index++)
+    {
+        myfile << argv[index] << std::endl;
+    }
+
+    myfile << std::endl;
+
 	for (int index = start; index < argc; index += 2)
 	{
 
@@ -34,7 +47,11 @@ int main(int argc, char* argv[])
         int n = 0;
 		while (std::remove(argv[index + 1]) != 0)
 		{
-			std::cout << "Let's try again\n";
+            // If the file just doesn't exist, break
+            if(errno == ENOENT) break;
+
+            myfile << "Failed to delete " << argv[index + 1] << ". Error: " << errno << std::endl;
+
 			_sleep(500);
 			n++;
 			if (n > 10) break;
@@ -49,15 +66,17 @@ int main(int argc, char* argv[])
 #endif
     }
 
-    char command[100];
+    myfile.close();
+
+    char command[1000];
 
     if(dev)
     {
-        sprintf(command, "%s --noUpdaterCheck --devChannel", argv[1]);
+        sprintf(command, "\"%s\" --noUpdaterCheck --devChannel", argv[1]);
     }
     else
     {
-        sprintf(command, "%s --noUpdaterCheck", argv[1]);
+        sprintf(command, "\"%s\" --noUpdaterCheck", argv[1]);
     }
 
     std::system(command);