projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove Header::BaselineOffset and move arrows as needed instead
[pulseview.git]
/
contrib
/
pulseview_cross.nsi.in
diff --git
a/contrib/pulseview_cross.nsi.in
b/contrib/pulseview_cross.nsi.in
index 576cfca63a527bebcc15d3e60f576dffae8217ee..0e6921970005e67cedd9d73036c0a4e243ee7da4 100644
(file)
--- a/
contrib/pulseview_cross.nsi.in
+++ b/
contrib/pulseview_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
## 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 "PulseView (required)" Section1
File "${CROSS}/zadig_xp.exe"
# Python
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.
# Protocol decoders.
- SetOutPath "$INSTDIR\decoders"
- File /r /x "__pycache__" "${CROSS}/share/libsigrokdecode/decoders/*"
+ File /r /x "__pycache__" /x "*.pyc" "${CROSS}/share/libsigrokdecode"
# Firmware files.
# Firmware files.
- SetOutPath "$INSTDIR\firmware"
- File /r "${CROSS}/share/sigrok-firmware/*"
+ File /r "${CROSS}/share/sigrok-firmware"
# Example *.sr files.
SetOutPath "$INSTDIR\examples"
# Example *.sr files.
SetOutPath "$INSTDIR\examples"
@@
-211,22
+210,21
@@
Section "Uninstall"
Delete "$INSTDIR\pulseview.exe"
Delete "$INSTDIR\zadig.exe"
Delete "$INSTDIR\zadig_xp.exe"
Delete "$INSTDIR\pulseview.exe"
Delete "$INSTDIR\zadig.exe"
Delete "$INSTDIR\zadig_xp.exe"
- Delete "$INSTDIR\python3
2
.dll"
- Delete "$INSTDIR\python3
2
.zip"
+ Delete "$INSTDIR\python3
4
.dll"
+ Delete "$INSTDIR\python3
4
.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.
# There could be *.pyc files or __pycache__ subdirs and so on.
- RMDir /r "$INSTDIR\
decoders\*
"
+ RMDir /r "$INSTDIR\
share\libsigrokdecode
"
# Delete the firmware files.
# 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.
# 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"
RMDir "$INSTDIR\examples"
RMDir "$INSTDIR"