From 22c16d32ef4e707ce41ff0c8bfca40100e181e37 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 6 May 2013 19:50:54 +0200
Subject: [PATCH] add the tcc.exe dir to the system path

---
 CLIENT_DATA/setup3264.ins |  4 ++++
 OPSI/control              |  6 ++++++
 builder-product.cfg       | 15 +++++++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 56c908a..6568c02 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -57,6 +57,8 @@ Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 Set $RealInstall32Msi$ = $LogDir$ + "\" + $Extract32Dir$ + "\" + $Install32Msi$
 Set $RealInstall64Msi$ = $LogDir$ + "\" + $Extract64Dir$ + "\" + $Install64Msi$
 
+Set $RealPath32Dir$ = $InstallDir32$ + "\" + $Path32Dir$
+Set $RealPath64Dir$ = $InstallDir64$ + "\" + $Path64Dir$
 
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
@@ -112,6 +114,7 @@ endif
 
 [Winbatch_install_32]
 msiexec /i "$RealInstall32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb ALLUSERS=1 REBOOT=ReallySuppress
+addpath pre "$RealPath32Dir$"
 
 [Files_install_32]
 ; copy the ini file to the InstallDir
@@ -126,6 +129,7 @@ copy "$IniCfgFile$" "$InstallDir32$"
 
 [Winbatch_install_64]
 msiexec /i "$RealInstall64Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb ALLUSERS=1 REBOOT=ReallySuppress
+addpath pre "$RealPath64Dir$"
 
 [Files_install_64]
 ; copy the ini file to the InstallDir
diff --git a/OPSI/control b/OPSI/control
index d3f60e3..bdcb5d7 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -36,4 +36,10 @@ requiredProduct: sereby.aio
 requiredStatus: installed
 requirementType: before
 
+[ProductDependency]
+action: setup
+requiredProduct: kliu.addpath
+requiredStatus: installed
+requirementType: before
+
 
diff --git a/builder-product.cfg b/builder-product.cfg
index 731dae8..af2dfb5 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -37,11 +37,18 @@ WINST_VALUE[0]="tccle.msi"
 WINST_NAME[1]="Extract32Dir"
 WINST_VALUE[1]="3C97621"
 
-WINST_NAME[2]="Install64Msi"
-WINST_VALUE[2]="tcclex64.msi"
+WINST_NAME[2]="Path32Dir"
+WINST_VALUE[2]="TCCLE13"
+
+WINST_NAME[3]="Install64Msi"
+WINST_VALUE[3]="tcclex64.msi"
+
+WINST_NAME[4]="Extract64Dir"
+WINST_VALUE[4]="6BA2265"
+
+WINST_NAME[5]="Path64Dir"
+WINST_VALUE[5]="TCCLE13x64"
 
-WINST_NAME[3]="Extract64Dir"
-WINST_VALUE[3]="6BA2265"
 
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="MsiId32"