Merge branch 'develop' of https://github.com/febiosoftware/FEBio into…

… develop
febiosoftware · Nov 1, 2024 · c48c925 · c48c925
2 parents e6af0d0 + 4b7ee5c
commit c48c925
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/infrastructure/ami-windows-studio.pkr.hcl b/infrastructure/ami-windows-studio.pkr.hcl
@@ -12,10 +12,12 @@ locals {
   installation_path  = var.installation_path
   src_path           = "${local.installation_path}\\src"
   vcpkg_package_path = "${local.installation_path}\\febio"
+  qt_path = "${local.installation_path}\\Qt"
   environment = {
     "INSTALLATION_PATH"  = local.installation_path
     "SOURCE_PATH"        = local.src_path
     "VCPKG_PACKAGE_PATH" = local.vcpkg_package_path
+    "QT_INSTALL_DIR" = local.qt_path
   }
 }
 
@@ -46,7 +48,7 @@ data "amazon-parameterstore" "winrm_username" {
 
 variable "skip_create_ami" {
   type    = bool
-  default = true
+  default = false
 }
 
 source "amazon-ebs" "windows" {
@@ -111,6 +113,12 @@ build {
     env    = local.environment
   }
 
+  # qt
+  provisioner "windows-shell" {
+    script = "./common/windows/qt.bat"
+    env    = local.environment
+  }
+
   provisioner "powershell" {
     script = "./common/windows/install-builder.ps1"
     env    = local.environment
@@ -156,13 +164,13 @@ build {
     env    = local.environment
   }
 
-  # # mmg
+  # mmg
   provisioner "windows-shell" {
     script = "./common/windows/mmg.bat"
     env    = local.environment
   }
 
-  # # tetgen
+  # tetgen
   provisioner "windows-shell" {
     script = "./common/windows/tetgen.bat"
     env    = local.environment

diff --git a/infrastructure/common/linux/packages.txt b/infrastructure/common/linux/packages.txt
@@ -29,4 +29,5 @@ libxorg-gtest-dev
 jq
 yasm
 patchelf
-zip
+zip
+python3-pip
diff --git a/infrastructure/common/linux/qt.sh b/infrastructure/common/linux/qt.sh
@@ -6,7 +6,6 @@ if command -v sudo &> /dev/null
 then
 	SUDO=$(which sudo)
 fi
-$SUDO apt-get update
-$SUDO apt-get install -y \
-	qt6-base-dev \
-	libqt6widgets6
+
+$SUDO pip install aqtinstall -v
+$SUDO aqt install-qt --outputdir /opt/Qt linux desktop 6.7.3 -m all
diff --git a/infrastructure/common/windows/qt.bat b/infrastructure/common/windows/qt.bat
@@ -1,4 +1,4 @@
 call "%ONEAPI_ROOT%setvars.bat" --force
 call pip install aqtinstall -v
 call aqt list-qt windows desktop
-call aqt install-qt --outputdir "%QT_INSTALL_DIR%" windowsdesktop 6.7.2 win64_msvc2019_64 -m all
+call aqt install-qt --outputdir "%QT_INSTALL_DIR%" windows desktop 6.7.3 win64_msvc2019_64 -m all
diff --git a/infrastructure/common/windows/vcpkg.json b/infrastructure/common/windows/vcpkg.json
@@ -7,7 +7,8 @@
     "opengl",
     "openssl",
     "pthread",
-    "qtbase",
-    "zlib"
+    "zstd",
+    "zlib",
+    "sqlite3"
   ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,4 +29,5 @@ libxorg-gtest-dev @@
     jq
     yasm
     patchelf
-    zip
+    zip
+    python3-pip