diff --git a/app/builder-config-appx.yaml b/app/builder-config-appx.yaml index addc17f3..7f7a56dd 100644 --- a/app/builder-config-appx.yaml +++ b/app/builder-config-appx.yaml @@ -1,7 +1,6 @@ extends: app/builder-config-base.yaml win: target: - - NSIS - appx icon: app/icons/win/icon.ico appx: diff --git a/app/make-nupkg.ps1 b/app/make-nupkg.ps1 deleted file mode 100644 index 77053b7d..00000000 --- a/app/make-nupkg.ps1 +++ /dev/null @@ -1,66 +0,0 @@ -$silentArgs = '/S' -$packageName = 'openflexure-ev' -$fileType = 'exe' - -$packagepath = Join-Path -Path $PSScriptRoot -ChildPath '..\' -$packageJson = Join-Path -Path $packagepath -ChildPath '\package.json' -$outpath = Join-Path -Path $packagepath -ChildPath 'release-builds\choco' - -echo $packagepath -echo $outpath - -If(!(test-path $outpath)) -{ - New-Item -ItemType Directory -Force -Path $outpath -} - -# Get version from package.json -$FullVersion = (Get-Content $packageJson) -join "`n" | ConvertFrom-Json | Select -ExpandProperty "version" -$MajVer, $MinVer = $FullVersion.Split("-") # Split version number from beta string -$MinVer = $MinVer.Replace(".", "") # Convert symver into nuspec ver -$version = $MajVer + "-" + $MinVer - -$InstURL = "$Env:CI_JOB_URL/artifacts/browse/release-builds/openflexure-ev-win.exe" -echo $InstURL - -$NuSpec = @" - - - - $packageName - OpenFlexure eV - $Version - OpenFlexure - Bath Open Instrumentation Group - OpenFlexure Microscope client - An electron-based user client for the OpenFlexure Microscope Server - https://www.openflexure.org/ - https://www.openflexure.org/projects/microscope/ - https://gitlab.com/openflexure/openflexure-microscope-jsclient/issues - https://gitlab.com/openflexure/openflexure-microscope-jsclient/ - - https://gitlab.com/openflexure/openflexure-microscope-jsclient/ - - openflexure microscope ev - https://gitlab.com/openflexure/openflexure-microscope-jsclient/raw/master/LICENSE - false - https://gitlab.com/openflexure/openflexure-microscope-jsclient/raw/master/app/icons/png/512x512.png - - - - - -"@ - -echo $NuSpec | Out-File -force -FilePath "$outpath\openflexure-ev.nuspec" - -$InstPS1 = "Install-ChocolateyPackage '$packageName' '$fileType' '$silentArgs' '$InstURL'" - -$toolspath = "$outpath\tools" -If(!(test-path $toolspath)) -{ - New-Item -ItemType Directory -Force -Path $toolspath -} -echo $InstPS1 | Out-File -force -FilePath "$toolspath\chocolateyInstall.ps1" - -choco pack --outputdirectory $outpath "$outpath\openflexure-ev.nuspec" \ No newline at end of file diff --git a/app/make-nupkg.sh b/app/make-nupkg.sh index bbd9be4f..5c01e136 100644 --- a/app/make-nupkg.sh +++ b/app/make-nupkg.sh @@ -1,27 +1,30 @@ -silentArgs='/S' -packageName='openflexure-ev' -fileType='exe' +#!/bin/bash -scriptPath=`dirname $0` +packageName='openflexure-ev' + +scriptPath=$(dirname "$0") packagePath="$(dirname "$scriptPath")" packageJson="$packagePath/package.json" + +installerPath="$packagePath/openflexure-ev-win.exe" +installerHash=`sha256sum ${installerPath} | awk '{ print $1 }'` +echo "$installerHash" + outpath="$packagePath/release-builds/choco" toolspath="$outpath/tools" -mkdir -p $toolspath +mkdir -p "$toolspath" -echo $scriptPath -echo $packageJson -echo $outpath +echo "$scriptPath" +echo "$packageJson" +echo "$outpath" # Get package version from package.json -packageVersion=$(cat $packageJson \ - | grep version \ - | head -1 \ +packageVersion=$(grep version < "$packageJson" | head -1 \ | awk -F: '{ print $2 }' \ | sed 's/[",]//g' \ - | tr -d '[[:space:]]') + | tr -d ':space:') -echo "$packageVersion" +echo "Package version: $packageVersion" # Convert into a nupkg-safe version string majVer="$(echo "$packageVersion" | cut -d'-' -f1)" @@ -34,12 +37,14 @@ else version="$majVer-$minVer" fi - -echo "$version" +echo "Nupkg version: $version" # Build installer URL -instURL="$CI_JOB_URL/artifacts/raw/release-builds/openflexure-ev-win.exe" -echo $instURL +pipelineURL="$CI_PROJECT_URL/-/jobs/artifacts/$CI_COMMIT_REF_NAME/raw" +instURL="$pipelineURL/openflexure-ev-win.exe?job=package:win32" +nuspecURL="$CI_JOB_URL/artifacts/browse" + +echo "$instURL" # Build nuspec cat > "$outpath/openflexure-ev.nuspec" <<- EOL @@ -50,20 +55,21 @@ cat > "$outpath/openflexure-ev.nuspec" <<- EOL OpenFlexure eV $version OpenFlexure - Bath Open Instrumentation Group + Joel Collins OpenFlexure Microscope client An electron-based user client for the OpenFlexure Microscope Server + https://www.openflexure.org/ https://www.openflexure.org/projects/microscope/ https://gitlab.com/openflexure/openflexure-microscope-jsclient/issues + https://gitlab.com/openflexure/openflexure-microscope-jsclient/ - - https://gitlab.com/openflexure/openflexure-microscope-jsclient/ + $nuspecURL openflexure microscope ev https://gitlab.com/openflexure/openflexure-microscope-jsclient/raw/master/LICENSE false - https://gitlab.com/openflexure/openflexure-microscope-jsclient/raw/master/app/icons/png/512x512.png + https://build.openflexure.org/openflexure_ev/512x512.png @@ -72,8 +78,26 @@ cat > "$outpath/openflexure-ev.nuspec" <<- EOL EOL # Build installer PS1 content -instPS1="Install-ChocolateyPackage $packageName $fileType $silentArgs $instURL" -echo $instPS1 > "$toolspath/chocolateyInstall.ps1" +cat > "$toolspath/chocolateyInstall.ps1" <<- EOL +\$ErrorActionPreference = "Stop"; +\$toolsDir = "\$(Split-Path -parent $MyInvocation.MyCommand.Definition)" +\$url = "$instURL" -# Build nupkg -# choco pack --allow-unofficial --outputdirectory $outpath "$outpath/openflexure-ev.nuspec" \ No newline at end of file +\$packageArgs = @{ + packageName = "openflexure-ev" + unzipLocation = \$toolsDir + fileType = "exe" + url = \$url + url64bit = \$url + + softwareName = "OpenFlexure eV" + + checksum = "${installerHash}" + checksumType = "sha256" + + silentArgs = "/S" +} + +Install-ChocolateyPackage @packageArgs + +EOL \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index c3069e61..c3ae37b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "openflexure-ev", - "version": "0.2.3", + "version": "0.2.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -9332,11 +9332,6 @@ "unicode-match-property-value-ecmascript": "^1.1.0" } }, - "register-service-worker": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/register-service-worker/-/register-service-worker-1.6.2.tgz", - "integrity": "sha512-I8L87fX2TK29LDx+wgyOUh2BJ3rDIRC1FtRZEHeP3rivzDv6p1DDZLGGtPucqjEkm45+2crtFIFssEWv56+9Wg==" - }, "registry-auth-token": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz", @@ -10993,9 +10988,9 @@ } }, "uikit": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.1.4.tgz", - "integrity": "sha512-XGtlKlQXeNoQJi9wyff6DCkeX0P5/wdZw7LOenH7a5AOTRfUZDhTGX9uSCvRBroYBIKj6Eq2fe2efw2d1/rdHg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.1.1.tgz", + "integrity": "sha512-swmRPHiu1ehqtH8l1SSmbTk5LRx0JiaIwJlhjZfH2stQDZ6WUzC8zN6Jo9muEkptM1N+Vm5Qxa1DTeg+nkMCTQ==", "dev": true }, "unicode-canonical-property-names-ecmascript": { diff --git a/src/components/paneNavigate.vue b/src/components/paneNavigate.vue index 5444f1de..90c61252 100644 --- a/src/components/paneNavigate.vue +++ b/src/components/paneNavigate.vue @@ -147,7 +147,7 @@ export default { var keyCodeList = Object.keys(keyCodes).map(function(key){return keyCodes[key];}); if (!(event.target instanceof HTMLInputElement) && !(event.target.classList.contains('lightbox-link')) && keyCodeList.includes(event.keyCode)) { - console.log(this.keysDown) + //console.log(this.keysDown) // Calculate movement array var x_rel = 0; var y_rel = 0; @@ -190,6 +190,7 @@ export default { }, moveRequest: function(x, y, z, absolute) { + console.log(`Sending move request of ${x}, ${y}, ${z}`) // If not movement-locked if (!this.moveLock) { // Lock move requests