X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=contrib%2Fsigrok-cli_cross.nsi.in;h=6e8df6c2e33cf2783b5dd1c267aaaaaadfd490b9;hp=0a78f4366a594dc913cbae6cb988309c68184533;hb=f4c490a7a2e53564ef90956aea8c09d09685f51e;hpb=9d6422708d553d1e892f0ad18053901578d9559f

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index 0a78f43..6e8df6c 100644
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
 #
@@ -129,16 +128,16 @@ Section "@PACKAGE_NAME@ (required)" Section1
 	File "${CROSS}/zadig_xp.exe"
 
 	# Python
-	File "${CROSS}/python32.dll"
-	File "${CROSS}/python32.zip"
+	File "${CROSS}/python34.dll"
+	File "${CROSS}/python34.zip"
+
+	SetOutPath "$INSTDIR\share"
 
 	# Protocol decoders.
-	SetOutPath "$INSTDIR\decoders"
-	File /r /x "__pycache__" "${CROSS}/share/libsigrokdecode/decoders/*"
+	File /r /x "__pycache__" /x "*.pyc" "${CROSS}/share/libsigrokdecode"
 
 	# Firmware files.
-	SetOutPath "$INSTDIR\firmware"
-	File /r "${CROSS}/share/sigrok-firmware/*"
+	File /r "${CROSS}/share/sigrok-firmware"
 
 	# Example *.sr files.
 	SetOutPath "$INSTDIR\examples"
@@ -216,22 +215,21 @@ Section "Uninstall"
 	Delete "$INSTDIR\@PACKAGE_NAME@.exe"
 	Delete "$INSTDIR\zadig.exe"
 	Delete "$INSTDIR\zadig_xp.exe"
-	Delete "$INSTDIR\python32.dll"
-	Delete "$INSTDIR\python32.zip"
+	Delete "$INSTDIR\python34.dll"
+	Delete "$INSTDIR\python34.zip"
 
-	# Delete all decoders and everything else in decoders/.
+	# Delete all decoders and everything else in libsigrokdecode/.
 	# There could be *.pyc files or __pycache__ subdirs and so on.
-	RMDir /r "$INSTDIR\decoders\*"
+	RMDir /r "$INSTDIR\share\libsigrokdecode"
 
 	# Delete the firmware files.
-	RMDir /r "$INSTDIR\firmware\*"
+	RMDir /r "$INSTDIR\share\sigrok-firmware"
 
 	# Delete the example *.sr files.
 	RMDir /r "$INSTDIR\examples\*"
 
 	# Delete the install directory and its sub-directories.
-	RMDir "$INSTDIR\decoders"
-	RMDir "$INSTDIR\firmware"
+	RMDir "$INSTDIR\share"
 	RMDir "$INSTDIR\examples"
 	RMDir "$INSTDIR"