restructuring

win32/build-spell.bat

@@ -1,6 +1,6 @@
 @echo off
-set DEPS_ROOT=..\dep-x86
-set XCHAT_DEST=..\tmp-spell
+set DEPS_ROOT=deps-x86
+set XCHAT_DEST=tmp-spell
 rmdir /q /s %XCHAT_DEST%
 mkdir %XCHAT_DEST%
 xcopy /q /s /i %DEPS_ROOT%\myspell %XCHAT_DEST%\share\myspell

win32/build-x64.bat

@@ -3,7 +3,7 @@ set WDK_ROOT=c:\WinDDK\7600.16385.1
 set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%WDK_ROOT%\inc\mfc42;%WDK_ROOT%\inc\ddk;%WDK_ROOT%\inc\api\dao360
 set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64;%WDK_ROOT%\lib\Mfc\amd64;%WDK_ROOT%\lib\ATL\amd64
 set OPATH=%PATH%
-set DEV_64=%cd%\..\dep-x64
+set DEV_64=%cd%\deps-x64
 set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin;c:\mozilla-build\gendef
 set PERL_512=c:\mozilla-build\perl-5.12-x64\perl
 set PERL_514=c:\mozilla-build\perl-5.14-x64\perl
@@ -17,9 +17,9 @@ version -v >> xchat-wdk-x64.iss
 version -i >> xchat-wdk-x64.iss
 version -o64 >> xchat-wdk-x64.iss
 cd ..
-build\version -r > resource.h
-echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk-x64.iss
-type build\xchat-wdk-x64.skel.iss >> build\xchat-wdk-x64.iss
+win32\version -r > resource.h
+echo SetupIconFile=%cd%\xchat.ico >> win32\xchat-wdk-x64.iss
+type win32\xchat-wdk-x64.skel.iss >> win32\xchat-wdk-x64.iss
 cd src
 echo DEV = %DEV_64% > makeinc.mak
 echo X64 = YES >> makeinc.mak
@@ -37,7 +37,7 @@ nmake /nologo /s /f makefile-512.mak
 set PATH=%OOPATH%;%PERL_514%\bin
 nmake /nologo /s /f makefile-514.mak clean
 nmake /nologo /s /f makefile-514.mak
-cd ..\..\build
+cd ..\..\win32
 call compile-po-files.bat
 set PATH=%OPATH%
 call release-x64.bat

win32/build-x86.bat

@@ -3,7 +3,7 @@ set WDK_ROOT=c:\WinDDK\7600.16385.1
 set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70;%WDK_ROOT%\inc\mfc42;%WDK_ROOT%\inc\ddk;%WDK_ROOT%\inc\api\dao360
 set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386;%WDK_ROOT%\lib\Mfc\i386;%WDK_ROOT%\lib\ATL\i386
 set OPATH=%PATH%
-set DEV_32=%cd%\..\dep-x86
+set DEV_32=%cd%\deps-x86
 set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%DEV_32%\bin;c:\mozilla-build\gendef
 set PERL_512=c:\mozilla-build\perl-5.12-x86\perl
 set PERL_514=c:\mozilla-build\perl-5.14-x86\perl
@@ -17,9 +17,9 @@ version -v >> xchat-wdk-x86.iss
 version -i >> xchat-wdk-x86.iss
 version -o32 >> xchat-wdk-x86.iss
 cd ..
-build\version -r > resource.h
-echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk-x86.iss
-type build\xchat-wdk-x86.skel.iss >> build\xchat-wdk-x86.iss
+win32\version -r > resource.h
+echo SetupIconFile=%cd%\xchat.ico >> win32\xchat-wdk-x86.iss
+type win32\xchat-wdk-x86.skel.iss >> win32\xchat-wdk-x86.iss
 cd src
 echo DEV = %DEV_32% > makeinc.mak
 type makeinc.skel.mak >> makeinc.mak
@@ -36,7 +36,7 @@ nmake /nologo /s /f makefile-512.mak
 set PATH=%OOPATH%;%PERL_514%\bin
 nmake /nologo /s /f makefile-514.mak clean
 nmake /nologo /s /f makefile-514.mak
-cd ..\..\build
+cd ..\..\win32
 call compile-po-files.bat
 set PATH=%OPATH%
 call release-x86.bat

win32/compile-po-files.bat

@@ -7,4 +7,4 @@ for %%A in (*.po) do (
 	mkdir locale\%%~nA\LC_MESSAGES
 	msgfmt -co locale\%%~nA\LC_MESSAGES\xchat.mo %%A
 )
-cd ..\build
+cd ..\win32

win32/dep-extract-x64.bat

@@ -1,7 +1,7 @@
 @echo off
 set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef
 
-cd ..\dep-x64
+cd deps-x64
 ::obs 7z x -y *.rpm
 ::obs 7z x *.cpio
 ::obs del *.cpio

win32/dep-extract-x86.bat

@@ -1,7 +1,7 @@
 @echo off
 set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef
 
-cd ..\dep-x86
+cd deps-x86
 ::obs 7z x -y *.rpm
 ::obs 7z x *.cpio
 ::obs del *.cpio

win32/release-x64.bat

@@ -1,6 +1,6 @@
 @echo off
-set DEPS_ROOT=..\dep-x64
-set XCHAT_DEST=..\dist-x64
+set DEPS_ROOT=deps-x64
+set XCHAT_DEST=dist-x64
 rmdir /q /s %XCHAT_DEST%
 mkdir %XCHAT_DEST%
 echo 2> portable-mode

win32/release-x86.bat

@@ -1,6 +1,6 @@
 @echo off
-set DEPS_ROOT=..\dep-x86
-set XCHAT_DEST=..\dist-x86
+set DEPS_ROOT=deps-x86
+set XCHAT_DEST=dist-x86
 rmdir /q /s %XCHAT_DEST%
 mkdir %XCHAT_DEST%
 echo 2> portable-mode

win32/xchat-wdk-x64.skel.iss

@@ -11,8 +11,8 @@ DefaultDirName={pf}\XChat-WDK
 DefaultGroupName=XChat-WDK
 DisableProgramGroupPage=yes
 SolidCompression=yes
-SourceDir=..\dist-x64
-OutputDir=..\build
+SourceDir=dist-x64
+OutputDir=..\
 FlatComponentsList=no
 PrivilegesRequired=none
 ShowComponentSizes=no

win32/xchat-wdk-x86.skel.iss

@@ -11,8 +11,8 @@ DefaultDirName={pf}\XChat-WDK
 DefaultGroupName=XChat-WDK
 DisableProgramGroupPage=yes
 SolidCompression=yes
-SourceDir=..\dist-x86
-OutputDir=..\build
+SourceDir=dist-x86
+OutputDir=..\
 FlatComponentsList=no
 PrivilegesRequired=none
 ShowComponentSizes=no