Fixed the missing shaders/waveform-compute.* for glscopeclient & ngsc…

…opeclient Windows portable zip/MSI installer build
ngscopeclient · Jun 9, 2023 · 335945e · 335945e
1 parent 798f163
commit 335945e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/glscopeclient/CMakeLists.txt b/src/glscopeclient/CMakeLists.txt
@@ -188,14 +188,18 @@ if(WIXPATH AND WIN32)
 		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64
 		COMMAND ${CMAKE_COMMAND} -E copy_directory
 				${CMAKE_SOURCE_DIR}/src/glscopeclient/gradients ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/gradients
-		COMMAND ${CMAKE_COMMAND} -E copy_directory
-				${CMAKE_SOURCE_DIR}/src/glscopeclient/shaders ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/shaders
 		COMMAND ${CMAKE_COMMAND} -E copy_directory
 				${CMAKE_SOURCE_DIR}/src/glscopeclient/styles ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/styles
 		COMMAND ${CMAKE_COMMAND} -E copy_directory
 				${CMAKE_SOURCE_DIR}/src/glscopeclient/icons ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/icons
 		COMMAND ${CMAKE_COMMAND} -E copy_directory
 				${CMAKE_SOURCE_DIR}/src/glscopeclient/masks ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/masks
+
+		COMMAND ${CMAKE_COMMAND} -E copy_directory
+				${CMAKE_BINARY_DIR}/lib/scopeprotocols/shaders ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/shaders
+		COMMAND ${CMAKE_COMMAND} -E copy_directory
+				${CMAKE_BINARY_DIR}/src/glscopeclient/shaders ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/shaders
+
 		COMMAND ${CMAKE_COMMAND} -E copy
 				${CMAKE_SOURCE_DIR}/src/LICENSE
 				${CMAKE_BINARY_DIR}/lib/graphwidget/libgraphwidget.dll
@@ -204,7 +208,6 @@ if(WIXPATH AND WIN32)
 				${CMAKE_BINARY_DIR}/lib/scopeprotocols/libscopeprotocols.dll
 				${CMAKE_BINARY_DIR}/src/glscopeclient/glscopeclient.exe
 				${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64
-		COMMAND bash -c \"cp -R ${CMAKE_BINARY_DIR}/lib/scopeprotocols/shaders ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64\"
 		COMMAND bash -c \"cp -R /mingw64/share/licenses ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64\"
 		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/lib
 		COMMAND bash -c \"cp -R /mingw64/lib/gdk-pixbuf-2.0 ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/lib\"
@@ -216,10 +219,7 @@ if(WIXPATH AND WIN32)
 		COMMAND bash -c \"cd ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64 && glib-compile-schemas ./share/glib-2.0/schemas\"
 		COMMAND bash -c \"cp /mingw64/bin/gdbus.exe ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64\"
 		COMMAND bash -c \"wget https://github.com/bvernoux/mingw-bundledlls/releases/download/v0.2.4/mingw-bundledlls-0.2.4-1-x86_64.pkg.tar.zst && pacman -U --noconfirm mingw-bundledlls-*.pkg.tar.zst && rm -f mingw-bundledlls-*.pkg.tar.zst\"
-		COMMAND bash -c \"export MINGW_BUNDLEDLLS_SEARCH_PATH='${MINGW64_BIN_PATH}\;../../lib/graphwidget\;../../lib/log\;../../lib/scopeexports\;../../lib/scopehal\;../../lib/scopeprotocols\;../../lib/xptools' && mingw-bundledlls ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/glscopeclient.exe --copy\"
-
-		COMMAND bash -c \"cp -r ${CMAKE_BINARY_DIR}/src/glscopeclient/shaders/*.{spv,glsl} ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/shaders/\"
-		COMMAND bash -c \"cp -r ${CMAKE_BINARY_DIR}/lib/scopeprotocols/shaders/*.{spv,glsl} ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/shaders/\")
+		COMMAND bash -c \"export MINGW_BUNDLEDLLS_SEARCH_PATH='${MINGW64_BIN_PATH}\;../../lib/graphwidget\;../../lib/log\;../../lib/scopeexports\;../../lib/scopehal\;../../lib/scopeprotocols\;../../lib/xptools' && mingw-bundledlls ${CMAKE_BINARY_DIR}/dist/glscopeclient_windows_x64/glscopeclient.exe --copy\")
 
 	add_custom_target(
 		glscopeclient_portable_zip_windows_x64 ALL

diff --git a/src/ngscopeclient/CMakeLists.txt b/src/ngscopeclient/CMakeLists.txt
@@ -217,8 +217,11 @@ if(WIXPATH AND WIN32)
 				${CMAKE_SOURCE_DIR}/src/ngscopeclient/icons ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64/icons
 		COMMAND ${CMAKE_COMMAND} -E copy_directory
 				${CMAKE_SOURCE_DIR}/src/ngscopeclient/masks ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64/masks
+
+		COMMAND ${CMAKE_COMMAND} -E copy_directory
+				${CMAKE_BINARY_DIR}/lib/scopeprotocols/shaders ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64/shaders
 		COMMAND ${CMAKE_COMMAND} -E copy_directory
-				${CMAKE_SOURCE_DIR}/src/ngscopeclient/shaders ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64/shaders
+				${CMAKE_BINARY_DIR}/src/ngscopeclient/shaders ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64/shaders
 
 		COMMAND ${CMAKE_COMMAND} -E copy
 				${CMAKE_SOURCE_DIR}/src/LICENSE
@@ -229,13 +232,9 @@ if(WIXPATH AND WIN32)
 				${CMAKE_BINARY_DIR}/lib/scopeprotocols/libscopeprotocols.dll
 				${CMAKE_BINARY_DIR}/src/ngscopeclient/ngscopeclient.exe
 				${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64
-		COMMAND bash -c \"cp -R ${CMAKE_BINARY_DIR}/lib/scopeprotocols/shaders ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64\"
 		COMMAND bash -c \"cp -R /mingw64/share/licenses ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64\"
 		COMMAND bash -c \"wget https://github.com/bvernoux/mingw-bundledlls/releases/download/v0.2.4/mingw-bundledlls-0.2.4-1-x86_64.pkg.tar.zst && pacman -U --noconfirm mingw-bundledlls-*.pkg.tar.zst && rm -f mingw-bundledlls-*.pkg.tar.zst\"
-		COMMAND bash -c \"export MINGW_BUNDLEDLLS_SEARCH_PATH='${MINGW64_BIN_PATH}\;../../lib/graphwidget\;../../lib/log\;../../lib/scopeexports\;../../lib/scopehal\;../../lib/scopeprotocols\;../../lib/xptools' && mingw-bundledlls ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64/ngscopeclient.exe --copy\"
-
-		COMMAND bash -c \"cp -r ${CMAKE_BINARY_DIR}/src/ngscopeclient/shaders/*.{spv,glsl} ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64/shaders/\"
-		COMMAND bash -c \"cp -r ${CMAKE_BINARY_DIR}/lib/scopeprotocols/shaders/*.{spv,glsl} ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64/shaders/\")
+		COMMAND bash -c \"export MINGW_BUNDLEDLLS_SEARCH_PATH='${MINGW64_BIN_PATH}\;../../lib/graphwidget\;../../lib/log\;../../lib/scopeexports\;../../lib/scopehal\;../../lib/scopeprotocols\;../../lib/xptools' && mingw-bundledlls ${CMAKE_BINARY_DIR}/dist/ngscopeclient_windows_x64/ngscopeclient.exe --copy\")
 
 	add_custom_target(
 		ngscopeclient_portable_zip_windows_x64 ALL