X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=contrib%2Fsigrok-cli_cross.nsi.in;h=c8c2f7998d667f66af7603c45da9b941c0f61d6d;hb=cc76d4230af8ce99ff03a13026f92609971f15ec;hp=c68572800e2a43e989ed7f57dfaf6259630e26e4;hpb=58b036281136570a7aaa187fffeeda2e4cd466ce;p=sigrok-cli.git

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index c685728..c8c2f79 100644
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the sigrok-cli project.
 ##
-## Copyright (C) 2011-2013 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2011-2014 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -78,13 +78,11 @@ RequestExecutionLevel admin
 
 # Path where the cross-compiled sigrok tools and libraries are located.
 # Change this to where-ever you installed libsigrok.a and so on.
-# TODO: Figure out how to use $HOME (of the host that runs "makensis").
-!define CROSS "/home/uwe/sr_mingw"
+!define CROSS "$%HOME%/sr_mingw"
 
 # Path where the cross-compiled MXE tools and libraries are located.
 # Change this to where-ever you installed MXE (and the files it built).
-# TODO: Figure out how to use $HOME (of the host that runs "makensis").
-!define MXE "/home/uwe/mxe-git/usr/i686-pc-mingw32"
+!define MXE "$%HOME%/mxe-git/usr/i686-pc-mingw32"
 
 
 # --- MUI pages ---------------------------------------------------------------
@@ -130,18 +128,27 @@ Section "@PACKAGE_NAME@ (required)" Section1
 	# Install the file(s) specified below into the specified directory.
 	SetOutPath "$INSTDIR"
 
-	# License file
+	# License file.
 	File "../COPYING"
 
-	# sigrok-cli
+	# sigrok-cli.
 	File "${CROSS}/bin/@PACKAGE_NAME@.exe"
 
+	# libusb0.dll (needed for libusb-0.1).
+	File "${CROSS}/libusb0.dll"
+
 	# Install the file(s) specified below into the specified directory.
 	SetOutPath "$INSTDIR\decoders"
 
-	# Protocol decoders
+	# Protocol decoders.
 	File /r /x "__pycache__" "${CROSS}/share/libsigrokdecode/decoders/*"
 
+	# Install the file(s) specified below into the specified directory.
+	SetOutPath "$INSTDIR\firmware"
+
+	# Firmware files.
+	File /r "${CROSS}/share/sigrok-firmware/*"
+
 	# Generate the uninstaller executable.
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 
@@ -219,13 +226,18 @@ Section "Uninstall"
 	# Delete the application, the application data, and related libs.
 	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\@PACKAGE_NAME@.exe"
+	Delete "$INSTDIR\libusb0.dll"
 
 	# Delete all decoders and everything else in decoders/.
 	# There could be *.pyc files or __pycache__ subdirs and so on.
 	RMDir /r "$INSTDIR\decoders\*"
 
+	# Delete the firmware files.
+	RMDir /r "$INSTDIR\firmware\*"
+
 	# Delete the install directory and its sub-directories.
 	RMDir "$INSTDIR\decoders"
+	RMDir "$INSTDIR\firmware"
 	RMDir "$INSTDIR"
 
 	# Delete the links from the start menu.
@@ -244,7 +256,7 @@ SectionEnd
 
 # --- Component selection section descriptions --------------------------------
 
-LangString DESC_Section1 ${LANG_ENGLISH} "This installs the sigrok command-line tool, the protocol decoders, and all required libraries."
+LangString DESC_Section1 ${LANG_ENGLISH} "This installs the sigrok command-line tool, some firmware files, the protocol decoders, and all required libraries."
 LangString DESC_Section2 ${LANG_ENGLISH} "This installs Python 3.2 in its default location of c:\Python32. If you already have Python 3.2 installed, you don't need to re-install it."
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN