From 582a319ab138453bbec782c42d570edbd81b6124 Mon Sep 17 00:00:00 2001
From: "berkeviktor@aol.com" <berkeviktor@aol.com>
Date: Sat, 13 Nov 2010 07:26:00 +0100
Subject: [PATCH] get rid of ALL absolute paths regarding build folder

---
 build/build-small.bat                       |  7 ++++---
 build/build-x64.bat                         |  7 ++++---
 build/build-x86.bat                         | 12 +++++++++---
 build/{xchat-wdk.iss => xchat-wdk.skel.iss} |  4 ----
 src/{makeinc.skel => makeinc.skel.mak}      |  0
 5 files changed, 17 insertions(+), 13 deletions(-)
 rename build/{xchat-wdk.iss => xchat-wdk.skel.iss} (96%)
 rename src/{makeinc.skel => makeinc.skel.mak} (100%)

diff --git a/build/build-small.bat b/build/build-small.bat
index fc97708e..6e50266f 100644
--- a/build/build-small.bat
+++ b/build/build-small.bat
@@ -1,9 +1,10 @@
 @echo off
 set WDK_ROOT=c:\WinDDK\7600.16385.1
-set DEV_32=c:\mozilla-build\build\xchat-wdk\dep-x86
-cd ..\src
+cd ..
+set DEV_32=%cd%\dep-x86
+cd src
 echo DEV32 = %DEV_32% > makeinc.mak
-type makeinc.skel >> makeinc.mak
+type makeinc.skel.mak >> makeinc.mak
 set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70
 set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386
 set OPATH=%PATH%
diff --git a/build/build-x64.bat b/build/build-x64.bat
index 803758f3..4bf6f7b1 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -1,11 +1,12 @@
 @echo off
 set PERL_510=c:\mozilla-build\perl-5.10-x64
 set PERL_512=c:\mozilla-build\perl-5.12-x64
-set DEV_64=c:\mozilla-build\build\xchat-wdk\dep-x64
-cd ..\src
+cd ..
+set DEV_64=%cd%\dep-x64
+cd src
 echo X64 = YES > makeinc.mak
 echo DEV64 = %DEV_64% >> makeinc.mak
-type makeinc.skel >> makeinc.mak
+type makeinc.skel.mak >> makeinc.mak
 set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70
 set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64
 set OPATH=%PATH%
diff --git a/build/build-x86.bat b/build/build-x86.bat
index 6a756e3d..eaeadde5 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -1,10 +1,16 @@
 @echo off
 set PERL_510=c:\mozilla-build\perl-5.10-x86
 set PERL_512=c:\mozilla-build\perl-5.12-x86
-set DEV_32=c:\mozilla-build\build\xchat-wdk\dep-x86
-cd ..\src
+echo [Setup] > xchat-wdk.iss
+echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk.iss
+echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk.iss
+cd ..
+echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk.iss
+type build\xchat-wdk.skel.iss >> xchat-wdk.iss
+set DEV_32=%cd%\dep-x86
+cd src
 echo DEV32 = %DEV_32% > makeinc.mak
-type makeinc.skel >> makeinc.mak
+type makeinc.skel.mak >> makeinc.mak
 set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70
 set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386
 set OPATH=%PATH%
diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.skel.iss
similarity index 96%
rename from build/xchat-wdk.iss
rename to build/xchat-wdk.skel.iss
index a2550b09..b4897185 100644
--- a/build/xchat-wdk.iss
+++ b/build/xchat-wdk.skel.iss
@@ -1,4 +1,3 @@
-[Setup]
 AppName=XChat-WDK
 AppVerName=XChat-WDK 1469-3
 AppVersion=14.69.3
@@ -9,9 +8,6 @@ AppPublisherURL=http://code.google.com/p/xchat-wdk/
 AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
 AppSupportURL=http://code.google.com/p/xchat-wdk/issues/list
 AppUpdatesURL=http://code.google.com/p/xchat-wdk/wiki/InfoXChat
-WizardImageFile=c:\mozilla-build\build\xchat-wdk\build\bitmaps\wizardimage.bmp
-WizardSmallImageFile=c:\mozilla-build\build\xchat-wdk\build\bitmaps\wizardsmallimage.bmp
-SetupIconFile=c:\mozilla-build\build\xchat-wdk\xchat.ico
 LicenseFile=COPYING
 UninstallDisplayIcon={app}\xchat.exe
 UninstallDisplayName=XChat-WDK
diff --git a/src/makeinc.skel b/src/makeinc.skel.mak
similarity index 100%
rename from src/makeinc.skel
rename to src/makeinc.skel.mak