Skip to content

Commit

Permalink
Merge pull request #36495 from mantidproject/0_fix_makensis_syntax
Browse files Browse the repository at this point in the history
Fix makensis syntax in windows packaging script
  • Loading branch information
thomashampson authored Nov 30, 2023
2 parents a35511e + 3131fbd commit 1614247
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion installers/conda/win/create_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ OUTFILE_NAME="$SCRIPT_DRIVE_LETTER:${OUTFILE_NAME:2}"

# Run the makensis command from our nsis Conda environment
echo makensis /V4 /O\"$NSIS_OUTPUT_LOG\" /DVERSION=$VERSION /DPACKAGE_DIR=\"$COPY_DIR\" /DPACKAGE_SUFFIX=$SUFFIX /DOUTFILE_NAME=$OUTFILE_NAME /DMANTID_ICON=$MANTID_ICON /DMUI_PAGE_LICENSE_PATH=$LICENSE_PATH \"$NSIS_SCRIPT\"
cmd.exe //C "START /wait "" $MAKENSIS_COMMAND /V4 /DVERSION=$VERSION /O\"$NSIS_OUTPUT_LOG\" /DPACKAGE_DIR=\"$COPY_DIR\" /DPACKAGE_SUFFIX=$SUFFIX /DOUTFILE_NAME=$OUTFILE_NAME /DMANTID_ICON=$MANTID_ICON /DMUI_PAGE_LICENSE_PATH=$LICENSE_PATH \"$NSIS_SCRIPT\""
cmd.exe //C "START /wait "" $MAKENSIS_COMMAND /V4 /DVERSION=$VERSION /O"$NSIS_OUTPUT_LOG" /DPACKAGE_DIR="$COPY_DIR" /DPACKAGE_SUFFIX=$SUFFIX /DOUTFILE_NAME=$OUTFILE_NAME /DMANTID_ICON=$MANTID_ICON /DMUI_PAGE_LICENSE_PATH=$LICENSE_PATH "$NSIS_SCRIPT""
echo "Package packaged, find it here: $OUTFILE_NAME"

echo "Done"

0 comments on commit 1614247

Please sign in to comment.