Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5855e4931400
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 41c1fbad9192
Choose a head ref
6 contributors

Commits on May 21, 2021

  1. Windows portable zip/MSI package builds

    someone--else committed May 21, 2021
    Copy the full SHA
    db02e37 View commit details

  2. Windows portable zip/MSI package builds (1)

    someone--else committed May 21, 2021
    Copy the full SHA
    8826a2f View commit details

  3. Windows portable zip/MSI package builds (2)

    someone--else committed May 21, 2021
    Copy the full SHA
    e59d9bd View commit details

  4. Windows portable zip/MSI package builds (3)

    someone--else committed May 21, 2021
    Copy the full SHA
    e0261e2 View commit details

  5. Merge branch 'azonenberg:master' into master

    @someone--else
    someone--else committed May 21, 2021
    Copy the full SHA
    208f26d View commit details

Commits on May 22, 2021

  1. #358: append dependent lib licenses into LICENSE.rtf

    someone--else committed May 22, 2021
    Copy the full SHA
    f5d5017 View commit details

  2. updated scopehal to latest

    someone--else committed May 22, 2021
    Copy the full SHA
    6b66f09 View commit details

Commits on May 25, 2021

  1. Merge branch 'azonenberg:master' into master

    @someone--else
    someone--else committed May 25, 2021
    Copy the full SHA
    e0dbdb5 View commit details

Commits on Jun 4, 2021

  1. merge upstream

    someone--else committed Jun 4, 2021
    Copy the full SHA
    5d81755 View commit details

  2. Windows portable zip/MSI package builds (2)

    someone--else committed Jun 4, 2021
    Copy the full SHA
    46d062c View commit details

  3. Windows portable zip/MSI package builds (3)

    someone--else committed Jun 4, 2021
    Copy the full SHA
    26c63e0 View commit details

  4. #358: append dependent lib licenses into LICENSE.rtf

    someone--else committed Jun 4, 2021
    Copy the full SHA
    6d5e43c View commit details

  5. updated scopehal to latest

    someone--else committed Jun 4, 2021
    Copy the full SHA
    7f845e5 View commit details

  6. updated doc to latest

    someone--else committed Jun 4, 2021
    Copy the full SHA
    4c6da76 View commit details

  7. merge upstream

    someone--else committed Jun 4, 2021
    Copy the full SHA
    9032c41 View commit details

Commits on Jun 21, 2021

  1. remove potential glew duplication

    @someone--else
    Anatol Ulrich authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    ce4e6f1 View commit details

  2. Added toolbar button for "force trigger" event. Currently uses same i… 

    …con as "start single trigger" (see #133)
    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    c93c28a View commit details

  3. Updated CMake minimum version to 3.14 since build fails on 3.13

    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    5e253b3 View commit details

  4. Timebase properties dialog is now modeless

    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    29164ed View commit details

  5. Timebase properties dialog now includes controls for real vs equivale… 

    …nt time sampling
    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    ac7cd6e View commit details

  6. TimebasePropertiesDialog: refreshed some stale fields when changing s… 

    …ampling mode
    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    77f29ea View commit details

  7. Added waveform generation filter category

    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    f5e1957 View commit details

  8. FilterGraphEditorWidget: filters with no inputs are now drawn in colu… 

    …mn 0, with scope channels
    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    767510e View commit details

  9. WaveformArea: filters with no inputs are considered scope channels an… 

    …d display sample rate and memory depth
    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    0a63133 View commit details

  10. WaveformArea: Filters with no inputs are always legal to create

    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    9b32614 View commit details

  11. Removed UsesCLFFT()

    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    625312a View commit details

  12. Allow leaving driver arguments blank for demo scope

    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    bd764e1 View commit details

  13. Allow waveform generation filters to be added to an empty session via… 

    … the "add" menu. See #379.
    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    fbfea2c View commit details

  14. OscilloscopeWindow: proper handling of sessions with no instruments a… 

    …t all. Fixes #379.
    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    9833be2 View commit details

  15. Fixed "continue" instead of "return" causing Windows build failures

    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    179e05f View commit details

  16. glscopeclient: Find shared yaml-cpp on mingw 

    This was updated for MacOS a while ago but that broke mingw/windows
    @MegabytePhreak @someone--else
    MegabytePhreak authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    7e08472 View commit details

  17. Fix some windows compile errors 

    These were missed due to already failing CI
    @MegabytePhreak @someone--else
    MegabytePhreak authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    dad98ca View commit details

  18. Fixed capitalization issue

    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    e57ecd4 View commit details

  19. OscilloscopeWindow: fixed crash when adding a channel to a closed ses… 

    …sion that has no splitters
    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    c345a61 View commit details

  20. OscilloscopeWindow: fixed one-shot trigger being treated as normal tr… 

    …igger in offline filter synthesis mode
    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    16258d1 View commit details

  21. Fixed typo in comment

    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    0989d84 View commit details

  22. WaveformArea: fixed bug causing second cursor location to not snap co… 

    …rrectly when mouse button was released
    @azonenberg @someone--else
    azonenberg authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    ce75104 View commit details

  23. Windows portable zip/MSI package builds

    @someone--else
    someone--else authored and someone--else committed Jun 21, 2021
    Copy the full SHA
    0f5dee7 View commit details

  24. Copy Adwaita icons to Windows dist folder

    @someone--else
    someone--else committed Jun 21, 2021
    Copy the full SHA
    cb81c2a View commit details

  25. Don't copy /mingw64/lib/libffts.dll to Windows dist folder explicitly… 

    … since FFTS now lives in /mingw64/bin
    @someone--else
    someone--else committed Jun 21, 2021
    Copy the full SHA
    1482c42 View commit details

  26. .github/workflows/build.yml: rename MSI build folder to avoid conflict

    @someone--else
    someone--else committed Jun 21, 2021
    Copy the full SHA
    f97bcd2 View commit details

  27. .github/workflows/build.yml: fix missing \

    @someone--else
    someone--else committed Jun 21, 2021
    Copy the full SHA
    0d57b61 View commit details

Commits on Jun 22, 2021

  1. Merge branch 'master' of https://github.com/someone--else/scopehal-apps

    @azonenberg
    azonenberg committed Jun 22, 2021
    Copy the full SHA
    0308578 View commit details

  2. Update to latest scopehal-docs

    @azonenberg
    azonenberg committed Jun 22, 2021
    Copy the full SHA
    41c1fba View commit details
Showing with 544 additions and 1 deletion.
  1. +23 −0 .github/workflows/build.yml
  2. +1 −1 doc
  3. +60 −0 src/glscopeclient/CMakeLists.txt
  4. +263 −0 src/glscopeclient/wix/LICENSE.rtf
  5. +105 −0 src/glscopeclient/wix/glscopeclient.wxs.in
  6. +92 −0 src/glscopeclient/wix/license-paths
23 changes: 23 additions & 0 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -157,3 +157,26 @@ jobs:
with:
name: glscopeclient-windows
path: msys2/*.zst

- name: Build MSI / portable zip
run: |
mkdir build_msi
cd build_msi
cmake \
-G"MSYS Makefiles" \
-DBUILD_TESTING=OFF \
-DWIXPATH="/c/Program Files (x86)/WiX Toolset v3.11/bin" \
..
make -j4
- name: Upload Artifacts (portable zip)
uses: actions/upload-artifact@v2
with:
name: glscopeclient-windows-portable
path: build_msi/dist/windows_x64

- name: Upload Artifacts (MSI)
uses: actions/upload-artifact@v2
with:
name: glscopeclient-windows.msi
path: build_msi/dist/*.msi
2 changes: 1 addition & 1 deletion doc
Submodule doc updated 10 files
+ − images/channel-properties.png
+ − images/horizontal-cursor.png
+ − images/overlays.png
+ − images/proto-filter.png
+ − images/stats.png
+ − images/vertical-cursor.png
+7 −0 section-decodes.tex
+1 −2 section-drivers.tex
+67 −13 section-protoanalyzer.tex
+76 −6 section-waveformviews.tex
60 changes: 60 additions & 0 deletions src/glscopeclient/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -128,6 +128,66 @@ add_dependencies(glscopeclient
icons
)

# Windows portable zip/MSI installer build
if(WIN32)
add_custom_target(
dist_windows_x64
COMMENT "Creating dist/windows_x64..."
DEPENDS glscopeclient
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/dist/windows_x64
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/src/glscopeclient/gradients ${CMAKE_BINARY_DIR}/dist/windows_x64/gradients
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/lib/scopeprotocols/kernels ${CMAKE_BINARY_DIR}/dist/windows_x64/kernels
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/src/glscopeclient/shaders ${CMAKE_BINARY_DIR}/dist/windows_x64/shaders
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/src/glscopeclient/styles ${CMAKE_BINARY_DIR}/dist/windows_x64/styles
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/src/glscopeclient/icons ${CMAKE_BINARY_DIR}/dist/windows_x64/icons
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/src/LICENSE
${CMAKE_BINARY_DIR}/lib/graphwidget/libgraphwidget.dll
${CMAKE_BINARY_DIR}/lib/log/liblog.dll
${CMAKE_BINARY_DIR}/lib/scopehal/libscopehal.dll
${CMAKE_BINARY_DIR}/lib/scopeprotocols/libscopeprotocols.dll
${CMAKE_BINARY_DIR}/src/glscopeclient/glscopeclient.exe
${CMAKE_BINARY_DIR}/dist/windows_x64
COMMAND bash -c \"cp -R /mingw64/share/licenses ${CMAKE_BINARY_DIR}/dist/windows_x64\"
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/dist/windows_x64/lib
COMMAND bash -c \"cp -R /mingw64/lib/gdk-pixbuf-2.0 ${CMAKE_BINARY_DIR}/dist/windows_x64/lib\"
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/dist/windows_x64/share/icons
COMMAND bash -c \"cp -R /mingw64/share/icons/hicolor ${CMAKE_BINARY_DIR}/dist/windows_x64/share/icons\"
COMMAND bash -c \"cp -R /mingw64/share/icons/Adwaita ${CMAKE_BINARY_DIR}/dist/windows_x64/share/icons\"
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/dist/windows_x64/share/glib-2.0
COMMAND bash -c \"cp -R /mingw64/share/glib-2.0/schemas ${CMAKE_BINARY_DIR}/dist/windows_x64/share/glib-2.0\"
COMMAND bash -c \"cd ${CMAKE_BINARY_DIR}/dist/windows_x64 && glib-compile-schemas ./share/glib-2.0/schemas\"
COMMAND bash -c \"ldd ${CMAKE_BINARY_DIR}/dist/windows_x64/glscopeclient.exe | grep '\/mingw64\/bin\/.*dll' -o | xargs -I{} cp /mingw64/bin/gdbus.exe \\\"{}\\\" ${CMAKE_BINARY_DIR}/dist/windows_x64\")

add_custom_target(
portable_zip_windows_x64 ALL
COMMENT "Creating portable zip from dist/windows_x64..."
DEPENDS dist_windows_x64
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dist/windows_x64
COMMAND ${CMAKE_COMMAND} -E tar "cf" "${CMAKE_BINARY_DIR}/dist/glscopeclient-${GLSCOPECLIENT_VERSION}-windows-x64-portable.zip" --format=zip -- .)

if(WIXPATH)
configure_file(wix/glscopeclient.wxs.in ${CMAKE_BINARY_DIR}/glscopeclient.wxs)
add_custom_target(
msi_windows_x64 ALL
COMMENT "Creating Windows x64 MSI..."
DEPENDS dist_windows_x64
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/src/glscopeclient/wix/LICENSE.rtf ${CMAKE_BINARY_DIR}
COMMAND ${WIXPATH}/heat dir dist/windows_x64 -gg -ke -scom -sreg -srd -cg AllFiles -dr APPLICATIONFOLDER -sfrag -template fragment -out glscopeclient-files.wxs
COMMAND ${WIXPATH}/candle -nologo glscopeclient-files.wxs -arch x64 -out glscopeclient-files.wixobj
COMMAND ${WIXPATH}/candle -nologo glscopeclient.wxs -arch x64 -out glscopeclient.wixobj -ext WixUIExtension -ext WixUtilExtension
COMMAND ${WIXPATH}/light -nologo glscopeclient-files.wixobj glscopeclient.wixobj -b dist/windows_x64 -out dist/glscopeclient-${GLSCOPECLIENT_VERSION}-windows-x64.msi -ext WixUIExtension -ext WixUtilExtension)
else()
message("Skipping MSI package build; define WIXPATH to enable")
endif()
endif()

###############################################################################
# Installation

Loading