summary refs log tree commit diff stats
path: root/build
diff options
context:
space:
mode:
authorberkeviktor@aol.com <berkeviktor@aol.com>2010-11-13 07:26:00 +0100
committerberkeviktor@aol.com <berkeviktor@aol.com>2010-11-13 07:26:00 +0100
commit582a319ab138453bbec782c42d570edbd81b6124 (patch)
tree40827c95b7490d0dc4dcbe8b17fe4b17cb457e0b /build
parented0cd0fa4778327d3f33a55c1275a68744592392 (diff)
get rid of ALL absolute paths regarding build folder
Diffstat (limited to 'build')
-rw-r--r--build/build-small.bat7
-rw-r--r--build/build-x64.bat7
-rw-r--r--build/build-x86.bat12
-rw-r--r--build/xchat-wdk.skel.iss (renamed from build/xchat-wdk.iss)4
4 files changed, 17 insertions, 13 deletions
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
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

; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
<?xml version="1.0" encoding="utf-8"?> 
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ImportGroup Label="PropertySheets" />
  <PropertyGroup Label="UserMacros">
    <ZlibDoInstall32>
      mkdir $(SolutionDir)x86\dist
      mkdir $(SolutionDir)x86\dist\bin
      copy $(SolutionDir)x86\MiniUnzipRelease\miniunz.exe $(SolutionDir)x86\dist\bin
      copy $(SolutionDir)x86\MiniZipRelease\minizip.exe $(SolutionDir)x86\dist\bin
      copy $(SolutionDir)x86\TestZlibDllRelease\testzlibdll.exe $(SolutionDir)x86\dist\bin
      copy $(SolutionDir)x86\TestZlibRelease\testzlib.exe $(SolutionDir)x86\dist\bin
      copy $(SolutionDir)x86\ZlibDllRelease\zlibwapi.dll $(SolutionDir)x86\dist\bin
      mkdir $(SolutionDir)x86\dist\include
      copy ..\..\..\zconf.h $(SolutionDir)x86\dist\include
      copy ..\..\..\zlib.h $(SolutionDir)x86\dist\include
      mkdir $(SolutionDir)x86\dist\lib
      copy $(SolutionDir)x86\ZlibDllRelease\zlibwapi.exp $(SolutionDir)x86\dist\lib
      copy $(SolutionDir)x86\ZlibDllRelease\zlibwapi.lib $(SolutionDir)x86\dist\lib
      copy $(SolutionDir)x86\ZlibStatRelease\zlibstat.lib $(SolutionDir)x86\dist\lib
      copy $(SolutionDir)zlibvc.def $(SolutionDir)x86\dist\lib
      copy $(SolutionDir)LICENSE.ZLIB $(SolutionDir)x86\dist
    </ZlibDoInstall32>
    <ZlibDoInstall64>
      mkdir $(SolutionDir)x64\dist
      mkdir $(SolutionDir)x64\dist\bin
      copy $(SolutionDir)x64\MiniUnzipRelease\miniunz.exe $(SolutionDir)x64\dist\bin
      copy $(SolutionDir)x64\MiniZipRelease\minizip.exe $(SolutionDir)x64\dist\bin
      copy $(SolutionDir)x64\TestZlibDllRelease\testzlibdll.exe $(SolutionDir)x64\dist\bin
      copy $(SolutionDir)x64\TestZlibRelease\testzlib.exe $(SolutionDir)x64\dist\bin
      copy $(SolutionDir)x64\ZlibDllRelease\zlibwapi.dll $(SolutionDir)x64\dist\bin
      mkdir $(SolutionDir)x64\dist\include
      copy ..\..\..\zconf.h $(SolutionDir)x64\dist\include
      copy ..\..\..\zlib.h $(SolutionDir)x64\dist\include
      mkdir $(SolutionDir)x64\dist\lib
      copy $(SolutionDir)x64\ZlibDllRelease\zlibwapi.exp $(SolutionDir)x64\dist\lib
      copy $(SolutionDir)x64\ZlibDllRelease\zlibwapi.lib $(SolutionDir)x64\dist\lib
      copy $(SolutionDir)x64\ZlibStatRelease\zlibstat.lib $(SolutionDir)x64\dist\lib
      copy $(SolutionDir)zlibvc.def $(SolutionDir)x64\dist\lib
      copy $(SolutionDir)LICENSE.ZLIB $(SolutionDir)x64\dist
    </ZlibDoInstall64>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalIncludeDirectories>c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <WDK32Dependencies>msvcrt_winxp.obj</WDK32Dependencies>
      <WDK64Dependencies>msvcrt_win2003.obj</WDK64Dependencies>
      <WDK32LibraryDirectories>c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\WinDDK\7600.16385.1\lib\wxp\i386</WDK32LibraryDirectories>
      <WDK64LibraryDirectories>c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\WinDDK\7600.16385.1\lib\wnet\amd64</WDK64LibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
  </ItemGroup>
</Project>