sigrok-cli_cross.nsi.in: Bump Python version to 3.6.

[sigrok-cli.git] / contrib / sigrok-cli_cross.nsi.in

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index 0a78f4366a594dc913cbae6cb988309c68184533..2e3ac337054167f48746507acefc0064cb083d5a 100644 (file)
--- 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}/python36.dll"
+       File "${CROSS}/python36.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\python36.dll"
+       Delete "$INSTDIR\python36.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"