ardour/livetrax
13
0
Fork 0
Code

suffix “x86” to start-menu entry for ardour 32bit

Browse Source 
This allows to cleanly install 32 and 64bit windows versions in parallel.

Ideally we’d only do that for 32bit builds on win64.
We need an NSIS guru to write code to detect this during installation
and write the correct uninstaller for that case.
This commit is contained in:
Robin Gareus 2015-04-24 00:00:47 +02:00
parent e1e5f54e8e
commit df498c8372
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/x-win/package.sh
View File

@ -254,8 +254,11 @@ NSISFILE=$DESTDIR/a3.nsis
if test "$WARCH" = "w64"; then if test "$WARCH" = "w64"; then
PGF=PROGRAMFILES64 PGF=PROGRAMFILES64
SFX=
else else
PGF=PROGRAMFILES PGF=PROGRAMFILES
# TODO we should only add this for 32bit on 64bit windows!
SFX=" (x86)"
fi fi
if test -n "$QUICKZIP" ; then if test -n "$QUICKZIP" ; then
@ -391,25 +394,25 @@ fi
cat >> $NSISFILE << EOF cat >> $NSISFILE << EOF
Section "Start Menu Shortcuts" SecMenu Section "Start Menu Shortcuts" SecMenu
SetShellVarContext all SetShellVarContext all
CreateDirectory "\$SMPROGRAMS\\${PRODUCT_ID}" CreateDirectory "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}"
CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}\\${PROGRAM_NAME}${PROGRAM_VERSION}.lnk" "\$INSTDIR\\bin\\${PRODUCT_EXE}" "" "\$INSTDIR\\bin\\${PRODUCT_EXE}" 0 CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\${PROGRAM_NAME}${PROGRAM_VERSION}.lnk" "\$INSTDIR\\bin\\${PRODUCT_EXE}" "" "\$INSTDIR\\bin\\${PRODUCT_EXE}" 0
EOF EOF
if test -f "$DESTDIR/debug.bat"; then if test -f "$DESTDIR/debug.bat"; then
cat >> $NSISFILE << EOF cat >> $NSISFILE << EOF
CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}\\${PROGRAM_NAME}${PROGRAM_VERSION} GDB.lnk" "\$INSTDIR\\debug.bat" "" "\$INSTDIR\\share\\ardour_bug.ico" 0 CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\${PROGRAM_NAME}${PROGRAM_VERSION} GDB.lnk" "\$INSTDIR\\debug.bat" "" "\$INSTDIR\\share\\ardour_bug.ico" 0
EOF EOF
fi fi
if test -z "$NOVIDEOTOOLS"; then if test -z "$NOVIDEOTOOLS"; then
cat >> $NSISFILE << EOF cat >> $NSISFILE << EOF
IfFileExists "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" 0 +2 IfFileExists "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" 0 +2
CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}\\Video Monitor.lnk" "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" "" "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" 0 CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\Video Monitor.lnk" "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" "" "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" 0
EOF EOF
fi fi
cat >> $NSISFILE << EOF cat >> $NSISFILE << EOF
CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
SectionEnd SectionEnd
LangString DESC_SecMainProg \${LANG_ENGLISH} "${PROGRAM_NAME} ${ARDOURVERSION}\$\\r\$\\n${VERSIONINFO}\$\\r\$\\n${ARDOURDATE}" LangString DESC_SecMainProg \${LANG_ENGLISH} "${PROGRAM_NAME} ${ARDOURVERSION}\$\\r\$\\n${VERSIONINFO}\$\\r\$\\n${ARDOURDATE}"
EOF EOF
@ -449,8 +452,8 @@ Section "Uninstall"
Delete "\$INSTDIR\\uninstall.exe" Delete "\$INSTDIR\\uninstall.exe"
Delete "\$INSTDIR\\${PROGRAM_NAME}${PROGRAM_VERSION}.lnk" Delete "\$INSTDIR\\${PROGRAM_NAME}${PROGRAM_VERSION}.lnk"
RMDir "\$INSTDIR" RMDir "\$INSTDIR"
Delete "\$SMPROGRAMS\\${PRODUCT_ID}\\*.*" Delete "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\*.*"
RMDir "\$SMPROGRAMS\\${PRODUCT_ID}" RMDir "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}"
\${unregisterExtension} ".${STATEFILE_SUFFIX}" "${PROGRAM_NAME} Session" \${unregisterExtension} ".${STATEFILE_SUFFIX}" "${PROGRAM_NAME} Session"
SectionEnd SectionEnd
EOF EOF