@@ -48,7 +48,7 @@ if [ "${WIN32}" -eq 1 ]; then | |||||
# setup innosetup | # setup innosetup | ||||
dlfile="${PAWPAW_DOWNLOADDIR}/innosetup-6.0.5.exe" | dlfile="${PAWPAW_DOWNLOADDIR}/innosetup-6.0.5.exe" | ||||
innodir="${PAWPAW_BUILDDIR}/innosetup-6.0.5" | innodir="${PAWPAW_BUILDDIR}/innosetup-6.0.5" | ||||
iscc="${innodir}/drive_c/InnoSeup/ISCC.exe" | |||||
iscc="${innodir}/drive_c/InnoSetup/ISCC.exe" | |||||
# download it | # download it | ||||
if [ ! -f "${dlfile}" ]; then | if [ ! -f "${dlfile}" ]; then | ||||
@@ -62,8 +62,8 @@ if [ "${WIN32}" -eq 1 ]; then | |||||
fi | fi | ||||
# install innosetup in custom wineprefix | # install innosetup in custom wineprefix | ||||
if [ ! -f "${innodir}"/drive_c/InnoSeup/ISCC.exe ]; then | |||||
env WINEPREFIX="${innodir}" wine "${dlfile}" /allusers /dir=C:\\InnoSeup /nocancel /norestart /verysilent | |||||
if [ ! -f "${innodir}"/drive_c/InnoSetup/ISCC.exe ]; then | |||||
env WINEPREFIX="${innodir}" wine "${dlfile}" /allusers /dir=C:\\InnoSetup /nocancel /norestart /verysilent | |||||
fi | fi | ||||
# copy jackrouter binaries | # copy jackrouter binaries | ||||
@@ -38,14 +38,14 @@ function download_and_install_innosetup { | |||||
env WINEPREFIX="${pkgdir}" wineboot -u | env WINEPREFIX="${pkgdir}" wineboot -u | ||||
fi | fi | ||||
if [ ! -f "${pkgdir}"/drive_c/InnoSeup/ISCC.exe ]; then | |||||
env WINEPREFIX="${pkgdir}" wine "${dlfile}" /allusers /dir=C:\\InnoSeup /nocancel /norestart /verysilent | |||||
if [ ! -f "${pkgdir}"/drive_c/InnoSetup/ISCC.exe ]; then | |||||
env WINEPREFIX="${pkgdir}" wine "${dlfile}" /allusers /dir=C:\\InnoSetup /nocancel /norestart /verysilent | |||||
fi | fi | ||||
} | } | ||||
function create_innosetup_exe { | function create_innosetup_exe { | ||||
local pkgdir="${PAWPAW_BUILDDIR}/innosetup-6.0.5" | local pkgdir="${PAWPAW_BUILDDIR}/innosetup-6.0.5" | ||||
local iscc="${pkgdir}/drive_c/InnoSeup/ISCC.exe" | |||||
local iscc="${pkgdir}/drive_c/InnoSetup/ISCC.exe" | |||||
echo "#define VERSION \"${VERSION}\"" > /tmp/pawpaw/version.iss | echo "#define VERSION \"${VERSION}\"" > /tmp/pawpaw/version.iss | ||||
env WINEPREFIX="${pkgdir}" wine "${iscc}" "setup/inno/${PAWPAW_TARGET}.iss" | env WINEPREFIX="${pkgdir}" wine "${iscc}" "setup/inno/${PAWPAW_TARGET}.iss" | ||||