switch back to nonextract veriosn

This commit is contained in:
Mario Fetka
2013-05-01 16:39:20 +02:00
parent 68188793c8
commit fb707c3eab
2 changed files with 5 additions and 25 deletions

View File

@@ -71,8 +71,6 @@ else
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%"
Winbatch_extract_32
Sub_check_exitcode
Winbatch_install_32
Sub_check_exitcode
comment "Copy files"
@@ -87,8 +85,6 @@ else
Message "Installing " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%"
Winbatch_extract_64
Sub_check_exitcode
Winbatch_install_64
Sub_check_exitcode
comment "Copy files"
@@ -101,11 +97,9 @@ else
endif
[Winbatch_extract_32]
"$Install32Exe$" /extract:"$LogDir$"
[Winbatch_install_32]
msiexec /i "$LogDir$\$Extract32Dir\tccle.msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
; 2 spaces between /qb and /l otherwise the extractor failes
"$Install32Exe$" /qb /l* "$LogDir$\$ProductId$.install_log.txt" ALLUSERS=1 REBOOT=ReallySuppress
[Files_install_32]
; copy the ini file to the InstallDir
@@ -115,11 +109,9 @@ copy "$IniCfgFile$" "$InstallDir32$"
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
[Winbatch_extract_64]
"$Install64Exe$" /extract:"$LogDir$"
[Winbatch_install_64]
msiexec /i "$LogDir$\$Extract64Dir\tcclex64.msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
; 2 spaces between /qb and /l otherwise the extractor failes
"$Install64Exe$" /qb /l* "$LogDir$\$ProductId$.install_log.txt" ALLUSERS=1 REBOOT=ReallySuppress
[Files_install_64]
; copy the ini file to the InstallDir