From 2012320d0eed36e0461e44ac9be8cc162c135bf5 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Sun, 11 Dec 2011 14:29:37 +0100 Subject: [PATCH] restructuring --- {build => win32}/bitmaps/wizardimage.bmp | Bin {build => win32}/bitmaps/wizardsmallimage.bmp | Bin {build => win32}/build-spell.bat | 4 ++-- {build => win32}/build-x64.bat | 10 +++++----- {build => win32}/build-x86.bat | 10 +++++----- {build => win32}/compile-po-files.bat | 2 +- {build => win32}/compress.bat | 0 {build => win32}/deb-extract.bat | 0 {build => win32}/dep-extract-x64.bat | 2 +- {build => win32}/dep-extract-x86.bat | 2 +- {dep-x64 => win32/deps-x64}/deps-x64.txt | 0 {dep-x86 => win32/deps-x86}/deps-x86.txt | 0 {build => win32}/etc/download.png | Bin {build => win32}/etc/gtk-2.0/gtkrc | 0 {build => win32}/etc/gtkpref.png | Bin {build => win32}/etc/music.png | Bin {build => win32}/etc/system.png | Bin {ext => win32/ext}/enchant-wdk/src/build-x64.bat | 0 {ext => win32/ext}/enchant-wdk/src/build-x86.bat | 0 {ext => win32/ext}/enchant-wdk/src/config.h | 0 {ext => win32/ext}/enchant-wdk/src/libenchant.rc | 0 {ext => win32/ext}/enchant-wdk/src/makefile.mak | 0 {ext => win32/ext}/enchant-wdk/src/release-x64.bat | 0 {ext => win32/ext}/enchant-wdk/src/release-x86.bat | 0 {ext => win32/ext}/libxml-wdk/libxml-wdk.patch | 0 {ext => win32/ext}/libxml-wdk/win32/build-x64.bat | 0 {ext => win32/ext}/libxml-wdk/win32/build-x86.bat | 0 {ext => win32/ext}/lua-wdk/build-x64.bat | 0 {ext => win32/ext}/lua-wdk/build-x86.bat | 0 {ext => win32/ext}/lua-wdk/lua-wdk.patch | 0 {ext => win32/ext}/nss-wdk/build-x64.bat | 0 {ext => win32/ext}/nss-wdk/build-x86.bat | 0 {ext => win32/ext}/nss-wdk/nss-wdk.patch | 0 {ext => win32/ext}/openssl-wdk/build-x64.bat | 0 {ext => win32/ext}/openssl-wdk/build-x86.bat | 0 {ext => win32/ext}/openssl-wdk/certdata.txt | 0 {ext => win32/ext}/openssl-wdk/mk-ca-bundle.pl | 0 {ext => win32/ext}/openssl-wdk/openssl-wdk.patch | 0 {ext => win32/ext}/zlib-wdk/LICENSE.ZLIB | 0 {ext => win32/ext}/zlib-wdk/install.props | 0 {ext => win32/ext}/zlib-wdk/install.vcxproj | 0 {ext => win32/ext}/zlib-wdk/install.vcxproj.filters | 0 {ext => win32/ext}/zlib-wdk/install.vcxproj.user | 0 {ext => win32/ext}/zlib-wdk/miniunz.vcxproj | 0 {ext => win32/ext}/zlib-wdk/miniunz.vcxproj.filters | 0 {ext => win32/ext}/zlib-wdk/miniunz.vcxproj.user | 0 {ext => win32/ext}/zlib-wdk/minizip.vcxproj | 0 {ext => win32/ext}/zlib-wdk/minizip.vcxproj.filters | 0 {ext => win32/ext}/zlib-wdk/minizip.vcxproj.user | 0 {ext => win32/ext}/zlib-wdk/testzlib.vcxproj | 0 .../ext}/zlib-wdk/testzlib.vcxproj.filters | 0 {ext => win32/ext}/zlib-wdk/testzlib.vcxproj.user | 0 {ext => win32/ext}/zlib-wdk/testzlibdll.vcxproj | 0 .../ext}/zlib-wdk/testzlibdll.vcxproj.filters | 0 .../ext}/zlib-wdk/testzlibdll.vcxproj.user | 0 {ext => win32/ext}/zlib-wdk/zlib.rc | 0 {ext => win32/ext}/zlib-wdk/zlibstat.vcxproj | 0 .../ext}/zlib-wdk/zlibstat.vcxproj.filters | 0 {ext => win32/ext}/zlib-wdk/zlibstat.vcxproj.user | 0 {ext => win32/ext}/zlib-wdk/zlibvc.def | 0 {ext => win32/ext}/zlib-wdk/zlibvc.sln | 0 {ext => win32/ext}/zlib-wdk/zlibvc.vcxproj | 0 {ext => win32/ext}/zlib-wdk/zlibvc.vcxproj.filters | 0 {ext => win32/ext}/zlib-wdk/zlibvc.vcxproj.user | 0 {build => win32}/glibconfig-x64.h | 0 {build => win32}/glibconfig-x86.h | 0 .../isskin/watercolorlite-blue.cjstyles | Bin .../isskin/watercolorlite-green.cjstyles | Bin {build => win32}/release-src.bat | 0 {build => win32}/release-x64.bat | 4 ++-- {build => win32}/release-x86.bat | 4 ++-- {build => win32}/share/themes/Murrine/gtk-2.0/gtkrc | 0 {build => win32}/share/xml/iso-codes/iso_3166.xml | 0 {build => win32}/share/xml/iso-codes/iso_639.xml | 0 {build => win32}/version.c | 0 {build => win32}/xchat-wdk-spell.skel.iss | 0 {build => win32}/xchat-wdk-x64.skel.iss | 4 ++-- {build => win32}/xchat-wdk-x86.skel.iss | 4 ++-- 78 files changed, 23 insertions(+), 23 deletions(-) rename {build => win32}/bitmaps/wizardimage.bmp (100%) rename {build => win32}/bitmaps/wizardsmallimage.bmp (100%) rename {build => win32}/build-spell.bat (91%) rename {build => win32}/build-x64.bat (89%) rename {build => win32}/build-x86.bat (89%) rename {build => win32}/compile-po-files.bat (94%) rename {build => win32}/compress.bat (100%) rename {build => win32}/deb-extract.bat (100%) rename {build => win32}/dep-extract-x64.bat (94%) rename {build => win32}/dep-extract-x86.bat (94%) rename {dep-x64 => win32/deps-x64}/deps-x64.txt (100%) rename {dep-x86 => win32/deps-x86}/deps-x86.txt (100%) rename {build => win32}/etc/download.png (100%) rename {build => win32}/etc/gtk-2.0/gtkrc (100%) rename {build => win32}/etc/gtkpref.png (100%) rename {build => win32}/etc/music.png (100%) rename {build => win32}/etc/system.png (100%) rename {ext => win32/ext}/enchant-wdk/src/build-x64.bat (100%) rename {ext => win32/ext}/enchant-wdk/src/build-x86.bat (100%) rename {ext => win32/ext}/enchant-wdk/src/config.h (100%) rename {ext => win32/ext}/enchant-wdk/src/libenchant.rc (100%) rename {ext => win32/ext}/enchant-wdk/src/makefile.mak (100%) rename {ext => win32/ext}/enchant-wdk/src/release-x64.bat (100%) rename {ext => win32/ext}/enchant-wdk/src/release-x86.bat (100%) rename {ext => win32/ext}/libxml-wdk/libxml-wdk.patch (100%) rename {ext => win32/ext}/libxml-wdk/win32/build-x64.bat (100%) rename {ext => win32/ext}/libxml-wdk/win32/build-x86.bat (100%) rename {ext => win32/ext}/lua-wdk/build-x64.bat (100%) rename {ext => win32/ext}/lua-wdk/build-x86.bat (100%) rename {ext => win32/ext}/lua-wdk/lua-wdk.patch (100%) rename {ext => win32/ext}/nss-wdk/build-x64.bat (100%) rename {ext => win32/ext}/nss-wdk/build-x86.bat (100%) rename {ext => win32/ext}/nss-wdk/nss-wdk.patch (100%) rename {ext => win32/ext}/openssl-wdk/build-x64.bat (100%) rename {ext => win32/ext}/openssl-wdk/build-x86.bat (100%) rename {ext => win32/ext}/openssl-wdk/certdata.txt (100%) rename {ext => win32/ext}/openssl-wdk/mk-ca-bundle.pl (100%) rename {ext => win32/ext}/openssl-wdk/openssl-wdk.patch (100%) rename {ext => win32/ext}/zlib-wdk/LICENSE.ZLIB (100%) rename {ext => win32/ext}/zlib-wdk/install.props (100%) rename {ext => win32/ext}/zlib-wdk/install.vcxproj (100%) rename {ext => win32/ext}/zlib-wdk/install.vcxproj.filters (100%) rename {ext => win32/ext}/zlib-wdk/install.vcxproj.user (100%) rename {ext => win32/ext}/zlib-wdk/miniunz.vcxproj (100%) rename {ext => win32/ext}/zlib-wdk/miniunz.vcxproj.filters (100%) rename {ext => win32/ext}/zlib-wdk/miniunz.vcxproj.user (100%) rename {ext => win32/ext}/zlib-wdk/minizip.vcxproj (100%) rename {ext => win32/ext}/zlib-wdk/minizip.vcxproj.filters (100%) rename {ext => win32/ext}/zlib-wdk/minizip.vcxproj.user (100%) rename {ext => win32/ext}/zlib-wdk/testzlib.vcxproj (100%) rename {ext => win32/ext}/zlib-wdk/testzlib.vcxproj.filters (100%) rename {ext => win32/ext}/zlib-wdk/testzlib.vcxproj.user (100%) rename {ext => win32/ext}/zlib-wdk/testzlibdll.vcxproj (100%) rename {ext => win32/ext}/zlib-wdk/testzlibdll.vcxproj.filters (100%) rename {ext => win32/ext}/zlib-wdk/testzlibdll.vcxproj.user (100%) rename {ext => win32/ext}/zlib-wdk/zlib.rc (100%) rename {ext => win32/ext}/zlib-wdk/zlibstat.vcxproj (100%) rename {ext => win32/ext}/zlib-wdk/zlibstat.vcxproj.filters (100%) rename {ext => win32/ext}/zlib-wdk/zlibstat.vcxproj.user (100%) rename {ext => win32/ext}/zlib-wdk/zlibvc.def (100%) rename {ext => win32/ext}/zlib-wdk/zlibvc.sln (100%) rename {ext => win32/ext}/zlib-wdk/zlibvc.vcxproj (100%) rename {ext => win32/ext}/zlib-wdk/zlibvc.vcxproj.filters (100%) rename {ext => win32/ext}/zlib-wdk/zlibvc.vcxproj.user (100%) rename {build => win32}/glibconfig-x64.h (100%) rename {build => win32}/glibconfig-x86.h (100%) rename {build => win32}/isskin/watercolorlite-blue.cjstyles (100%) rename {build => win32}/isskin/watercolorlite-green.cjstyles (100%) rename {build => win32}/release-src.bat (100%) rename {build => win32}/release-x64.bat (98%) rename {build => win32}/release-x86.bat (98%) rename {build => win32}/share/themes/Murrine/gtk-2.0/gtkrc (100%) rename {build => win32}/share/xml/iso-codes/iso_3166.xml (100%) rename {build => win32}/share/xml/iso-codes/iso_639.xml (100%) rename {build => win32}/version.c (100%) rename {build => win32}/xchat-wdk-spell.skel.iss (100%) rename {build => win32}/xchat-wdk-x64.skel.iss (98%) rename {build => win32}/xchat-wdk-x86.skel.iss (98%) diff --git a/build/bitmaps/wizardimage.bmp b/win32/bitmaps/wizardimage.bmp similarity index 100% rename from build/bitmaps/wizardimage.bmp rename to win32/bitmaps/wizardimage.bmp diff --git a/build/bitmaps/wizardsmallimage.bmp b/win32/bitmaps/wizardsmallimage.bmp similarity index 100% rename from build/bitmaps/wizardsmallimage.bmp rename to win32/bitmaps/wizardsmallimage.bmp diff --git a/build/build-spell.bat b/win32/build-spell.bat similarity index 91% rename from build/build-spell.bat rename to win32/build-spell.bat index 7300e41d..7325e426 100644 --- a/build/build-spell.bat +++ b/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 diff --git a/build/build-x64.bat b/win32/build-x64.bat similarity index 89% rename from build/build-x64.bat rename to win32/build-x64.bat index b7a12351..6b5b9d99 100644 --- a/build/build-x64.bat +++ b/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 diff --git a/build/build-x86.bat b/win32/build-x86.bat similarity index 89% rename from build/build-x86.bat rename to win32/build-x86.bat index 2e31a69b..85c7c2d1 100644 --- a/build/build-x86.bat +++ b/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 diff --git a/build/compile-po-files.bat b/win32/compile-po-files.bat similarity index 94% rename from build/compile-po-files.bat rename to win32/compile-po-files.bat index 5d47abc3..6ffde997 100644 --- a/build/compile-po-files.bat +++ b/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 diff --git a/build/compress.bat b/win32/compress.bat similarity index 100% rename from build/compress.bat rename to win32/compress.bat diff --git a/build/deb-extract.bat b/win32/deb-extract.bat similarity index 100% rename from build/deb-extract.bat rename to win32/deb-extract.bat diff --git a/build/dep-extract-x64.bat b/win32/dep-extract-x64.bat similarity index 94% rename from build/dep-extract-x64.bat rename to win32/dep-extract-x64.bat index efc6386d..e346891a 100644 --- a/build/dep-extract-x64.bat +++ b/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 diff --git a/build/dep-extract-x86.bat b/win32/dep-extract-x86.bat similarity index 94% rename from build/dep-extract-x86.bat rename to win32/dep-extract-x86.bat index 9fd3d6e2..702e3bf2 100644 --- a/build/dep-extract-x86.bat +++ b/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 diff --git a/dep-x64/deps-x64.txt b/win32/deps-x64/deps-x64.txt similarity index 100% rename from dep-x64/deps-x64.txt rename to win32/deps-x64/deps-x64.txt diff --git a/dep-x86/deps-x86.txt b/win32/deps-x86/deps-x86.txt similarity index 100% rename from dep-x86/deps-x86.txt rename to win32/deps-x86/deps-x86.txt diff --git a/build/etc/download.png b/win32/etc/download.png similarity index 100% rename from build/etc/download.png rename to win32/etc/download.png diff --git a/build/etc/gtk-2.0/gtkrc b/win32/etc/gtk-2.0/gtkrc similarity index 100% rename from build/etc/gtk-2.0/gtkrc rename to win32/etc/gtk-2.0/gtkrc diff --git a/build/etc/gtkpref.png b/win32/etc/gtkpref.png similarity index 100% rename from build/etc/gtkpref.png rename to win32/etc/gtkpref.png diff --git a/build/etc/music.png b/win32/etc/music.png similarity index 100% rename from build/etc/music.png rename to win32/etc/music.png diff --git a/build/etc/system.png b/win32/etc/system.png similarity index 100% rename from build/etc/system.png rename to win32/etc/system.png diff --git a/ext/enchant-wdk/src/build-x64.bat b/win32/ext/enchant-wdk/src/build-x64.bat similarity index 100% rename from ext/enchant-wdk/src/build-x64.bat rename to win32/ext/enchant-wdk/src/build-x64.bat diff --git a/ext/enchant-wdk/src/build-x86.bat b/win32/ext/enchant-wdk/src/build-x86.bat similarity index 100% rename from ext/enchant-wdk/src/build-x86.bat rename to win32/ext/enchant-wdk/src/build-x86.bat diff --git a/ext/enchant-wdk/src/config.h b/win32/ext/enchant-wdk/src/config.h similarity index 100% rename from ext/enchant-wdk/src/config.h rename to win32/ext/enchant-wdk/src/config.h diff --git a/ext/enchant-wdk/src/libenchant.rc b/win32/ext/enchant-wdk/src/libenchant.rc similarity index 100% rename from ext/enchant-wdk/src/libenchant.rc rename to win32/ext/enchant-wdk/src/libenchant.rc diff --git a/ext/enchant-wdk/src/makefile.mak b/win32/ext/enchant-wdk/src/makefile.mak similarity index 100% rename from ext/enchant-wdk/src/makefile.mak rename to win32/ext/enchant-wdk/src/makefile.mak diff --git a/ext/enchant-wdk/src/release-x64.bat b/win32/ext/enchant-wdk/src/release-x64.bat similarity index 100% rename from ext/enchant-wdk/src/release-x64.bat rename to win32/ext/enchant-wdk/src/release-x64.bat diff --git a/ext/enchant-wdk/src/release-x86.bat b/win32/ext/enchant-wdk/src/release-x86.bat similarity index 100% rename from ext/enchant-wdk/src/release-x86.bat rename to win32/ext/enchant-wdk/src/release-x86.bat diff --git a/ext/libxml-wdk/libxml-wdk.patch b/win32/ext/libxml-wdk/libxml-wdk.patch similarity index 100% rename from ext/libxml-wdk/libxml-wdk.patch rename to win32/ext/libxml-wdk/libxml-wdk.patch diff --git a/ext/libxml-wdk/win32/build-x64.bat b/win32/ext/libxml-wdk/win32/build-x64.bat similarity index 100% rename from ext/libxml-wdk/win32/build-x64.bat rename to win32/ext/libxml-wdk/win32/build-x64.bat diff --git a/ext/libxml-wdk/win32/build-x86.bat b/win32/ext/libxml-wdk/win32/build-x86.bat similarity index 100% rename from ext/libxml-wdk/win32/build-x86.bat rename to win32/ext/libxml-wdk/win32/build-x86.bat diff --git a/ext/lua-wdk/build-x64.bat b/win32/ext/lua-wdk/build-x64.bat similarity index 100% rename from ext/lua-wdk/build-x64.bat rename to win32/ext/lua-wdk/build-x64.bat diff --git a/ext/lua-wdk/build-x86.bat b/win32/ext/lua-wdk/build-x86.bat similarity index 100% rename from ext/lua-wdk/build-x86.bat rename to win32/ext/lua-wdk/build-x86.bat diff --git a/ext/lua-wdk/lua-wdk.patch b/win32/ext/lua-wdk/lua-wdk.patch similarity index 100% rename from ext/lua-wdk/lua-wdk.patch rename to win32/ext/lua-wdk/lua-wdk.patch diff --git a/ext/nss-wdk/build-x64.bat b/win32/ext/nss-wdk/build-x64.bat similarity index 100% rename from ext/nss-wdk/build-x64.bat rename to win32/ext/nss-wdk/build-x64.bat diff --git a/ext/nss-wdk/build-x86.bat b/win32/ext/nss-wdk/build-x86.bat similarity index 100% rename from ext/nss-wdk/build-x86.bat rename to win32/ext/nss-wdk/build-x86.bat diff --git a/ext/nss-wdk/nss-wdk.patch b/win32/ext/nss-wdk/nss-wdk.patch similarity index 100% rename from ext/nss-wdk/nss-wdk.patch rename to win32/ext/nss-wdk/nss-wdk.patch diff --git a/ext/openssl-wdk/build-x64.bat b/win32/ext/openssl-wdk/build-x64.bat similarity index 100% rename from ext/openssl-wdk/build-x64.bat rename to win32/ext/openssl-wdk/build-x64.bat diff --git a/ext/openssl-wdk/build-x86.bat b/win32/ext/openssl-wdk/build-x86.bat similarity index 100% rename from ext/openssl-wdk/build-x86.bat rename to win32/ext/openssl-wdk/build-x86.bat diff --git a/ext/openssl-wdk/certdata.txt b/win32/ext/openssl-wdk/certdata.txt similarity index 100% rename from ext/openssl-wdk/certdata.txt rename to win32/ext/openssl-wdk/certdata.txt diff --git a/ext/openssl-wdk/mk-ca-bundle.pl b/win32/ext/openssl-wdk/mk-ca-bundle.pl similarity index 100% rename from ext/openssl-wdk/mk-ca-bundle.pl rename to win32/ext/openssl-wdk/mk-ca-bundle.pl diff --git a/ext/openssl-wdk/openssl-wdk.patch b/win32/ext/openssl-wdk/openssl-wdk.patch similarity index 100% rename from ext/openssl-wdk/openssl-wdk.patch rename to win32/ext/openssl-wdk/openssl-wdk.patch diff --git a/ext/zlib-wdk/LICENSE.ZLIB b/win32/ext/zlib-wdk/LICENSE.ZLIB similarity index 100% rename from ext/zlib-wdk/LICENSE.ZLIB rename to win32/ext/zlib-wdk/LICENSE.ZLIB diff --git a/ext/zlib-wdk/install.props b/win32/ext/zlib-wdk/install.props similarity index 100% rename from ext/zlib-wdk/install.props rename to win32/ext/zlib-wdk/install.props diff --git a/ext/zlib-wdk/install.vcxproj b/win32/ext/zlib-wdk/install.vcxproj similarity index 100% rename from ext/zlib-wdk/install.vcxproj rename to win32/ext/zlib-wdk/install.vcxproj diff --git a/ext/zlib-wdk/install.vcxproj.filters b/win32/ext/zlib-wdk/install.vcxproj.filters similarity index 100% rename from ext/zlib-wdk/install.vcxproj.filters rename to win32/ext/zlib-wdk/install.vcxproj.filters diff --git a/ext/zlib-wdk/install.vcxproj.user b/win32/ext/zlib-wdk/install.vcxproj.user similarity index 100% rename from ext/zlib-wdk/install.vcxproj.user rename to win32/ext/zlib-wdk/install.vcxproj.user diff --git a/ext/zlib-wdk/miniunz.vcxproj b/win32/ext/zlib-wdk/miniunz.vcxproj similarity index 100% rename from ext/zlib-wdk/miniunz.vcxproj rename to win32/ext/zlib-wdk/miniunz.vcxproj diff --git a/ext/zlib-wdk/miniunz.vcxproj.filters b/win32/ext/zlib-wdk/miniunz.vcxproj.filters similarity index 100% rename from ext/zlib-wdk/miniunz.vcxproj.filters rename to win32/ext/zlib-wdk/miniunz.vcxproj.filters diff --git a/ext/zlib-wdk/miniunz.vcxproj.user b/win32/ext/zlib-wdk/miniunz.vcxproj.user similarity index 100% rename from ext/zlib-wdk/miniunz.vcxproj.user rename to win32/ext/zlib-wdk/miniunz.vcxproj.user diff --git a/ext/zlib-wdk/minizip.vcxproj b/win32/ext/zlib-wdk/minizip.vcxproj similarity index 100% rename from ext/zlib-wdk/minizip.vcxproj rename to win32/ext/zlib-wdk/minizip.vcxproj diff --git a/ext/zlib-wdk/minizip.vcxproj.filters b/win32/ext/zlib-wdk/minizip.vcxproj.filters similarity index 100% rename from ext/zlib-wdk/minizip.vcxproj.filters rename to win32/ext/zlib-wdk/minizip.vcxproj.filters diff --git a/ext/zlib-wdk/minizip.vcxproj.user b/win32/ext/zlib-wdk/minizip.vcxproj.user similarity index 100% rename from ext/zlib-wdk/minizip.vcxproj.user rename to win32/ext/zlib-wdk/minizip.vcxproj.user diff --git a/ext/zlib-wdk/testzlib.vcxproj b/win32/ext/zlib-wdk/testzlib.vcxproj similarity index 100% rename from ext/zlib-wdk/testzlib.vcxproj rename to win32/ext/zlib-wdk/testzlib.vcxproj diff --git a/ext/zlib-wdk/testzlib.vcxproj.filters b/win32/ext/zlib-wdk/testzlib.vcxproj.filters similarity index 100% rename from ext/zlib-wdk/testzlib.vcxproj.filters rename to win32/ext/zlib-wdk/testzlib.vcxproj.filters diff --git a/ext/zlib-wdk/testzlib.vcxproj.user b/win32/ext/zlib-wdk/testzlib.vcxproj.user similarity index 100% rename from ext/zlib-wdk/testzlib.vcxproj.user rename to win32/ext/zlib-wdk/testzlib.vcxproj.user diff --git a/ext/zlib-wdk/testzlibdll.vcxproj b/win32/ext/zlib-wdk/testzlibdll.vcxproj similarity index 100% rename from ext/zlib-wdk/testzlibdll.vcxproj rename to win32/ext/zlib-wdk/testzlibdll.vcxproj diff --git a/ext/zlib-wdk/testzlibdll.vcxproj.filters b/win32/ext/zlib-wdk/testzlibdll.vcxproj.filters similarity index 100% rename from ext/zlib-wdk/testzlibdll.vcxproj.filters rename to win32/ext/zlib-wdk/testzlibdll.vcxproj.filters diff --git a/ext/zlib-wdk/testzlibdll.vcxproj.user b/win32/ext/zlib-wdk/testzlibdll.vcxproj.user similarity index 100% rename from ext/zlib-wdk/testzlibdll.vcxproj.user rename to win32/ext/zlib-wdk/testzlibdll.vcxproj.user diff --git a/ext/zlib-wdk/zlib.rc b/win32/ext/zlib-wdk/zlib.rc similarity index 100% rename from ext/zlib-wdk/zlib.rc rename to win32/ext/zlib-wdk/zlib.rc diff --git a/ext/zlib-wdk/zlibstat.vcxproj b/win32/ext/zlib-wdk/zlibstat.vcxproj similarity index 100% rename from ext/zlib-wdk/zlibstat.vcxproj rename to win32/ext/zlib-wdk/zlibstat.vcxproj diff --git a/ext/zlib-wdk/zlibstat.vcxproj.filters b/win32/ext/zlib-wdk/zlibstat.vcxproj.filters similarity index 100% rename from ext/zlib-wdk/zlibstat.vcxproj.filters rename to win32/ext/zlib-wdk/zlibstat.vcxproj.filters diff --git a/ext/zlib-wdk/zlibstat.vcxproj.user b/win32/ext/zlib-wdk/zlibstat.vcxproj.user similarity index 100% rename from ext/zlib-wdk/zlibstat.vcxproj.user rename to win32/ext/zlib-wdk/zlibstat.vcxproj.user diff --git a/ext/zlib-wdk/zlibvc.def b/win32/ext/zlib-wdk/zlibvc.def similarity index 100% rename from ext/zlib-wdk/zlibvc.def rename to win32/ext/zlib-wdk/zlibvc.def diff --git a/ext/zlib-wdk/zlibvc.sln b/win32/ext/zlib-wdk/zlibvc.sln similarity index 100% rename from ext/zlib-wdk/zlibvc.sln rename to win32/ext/zlib-wdk/zlibvc.sln diff --git a/ext/zlib-wdk/zlibvc.vcxproj b/win32/ext/zlib-wdk/zlibvc.vcxproj similarity index 100% rename from ext/zlib-wdk/zlibvc.vcxproj rename to win32/ext/zlib-wdk/zlibvc.vcxproj diff --git a/ext/zlib-wdk/zlibvc.vcxproj.filters b/win32/ext/zlib-wdk/zlibvc.vcxproj.filters similarity index 100% rename from ext/zlib-wdk/zlibvc.vcxproj.filters rename to win32/ext/zlib-wdk/zlibvc.vcxproj.filters diff --git a/ext/zlib-wdk/zlibvc.vcxproj.user b/win32/ext/zlib-wdk/zlibvc.vcxproj.user similarity index 100% rename from ext/zlib-wdk/zlibvc.vcxproj.user rename to win32/ext/zlib-wdk/zlibvc.vcxproj.user diff --git a/build/glibconfig-x64.h b/win32/glibconfig-x64.h similarity index 100% rename from build/glibconfig-x64.h rename to win32/glibconfig-x64.h diff --git a/build/glibconfig-x86.h b/win32/glibconfig-x86.h similarity index 100% rename from build/glibconfig-x86.h rename to win32/glibconfig-x86.h diff --git a/build/isskin/watercolorlite-blue.cjstyles b/win32/isskin/watercolorlite-blue.cjstyles similarity index 100% rename from build/isskin/watercolorlite-blue.cjstyles rename to win32/isskin/watercolorlite-blue.cjstyles diff --git a/build/isskin/watercolorlite-green.cjstyles b/win32/isskin/watercolorlite-green.cjstyles similarity index 100% rename from build/isskin/watercolorlite-green.cjstyles rename to win32/isskin/watercolorlite-green.cjstyles diff --git a/build/release-src.bat b/win32/release-src.bat similarity index 100% rename from build/release-src.bat rename to win32/release-src.bat diff --git a/build/release-x64.bat b/win32/release-x64.bat similarity index 98% rename from build/release-x64.bat rename to win32/release-x64.bat index 4e658fc6..6483a950 100644 --- a/build/release-x64.bat +++ b/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 diff --git a/build/release-x86.bat b/win32/release-x86.bat similarity index 98% rename from build/release-x86.bat rename to win32/release-x86.bat index a2598399..dc45146a 100644 --- a/build/release-x86.bat +++ b/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 diff --git a/build/share/themes/Murrine/gtk-2.0/gtkrc b/win32/share/themes/Murrine/gtk-2.0/gtkrc similarity index 100% rename from build/share/themes/Murrine/gtk-2.0/gtkrc rename to win32/share/themes/Murrine/gtk-2.0/gtkrc diff --git a/build/share/xml/iso-codes/iso_3166.xml b/win32/share/xml/iso-codes/iso_3166.xml similarity index 100% rename from build/share/xml/iso-codes/iso_3166.xml rename to win32/share/xml/iso-codes/iso_3166.xml diff --git a/build/share/xml/iso-codes/iso_639.xml b/win32/share/xml/iso-codes/iso_639.xml similarity index 100% rename from build/share/xml/iso-codes/iso_639.xml rename to win32/share/xml/iso-codes/iso_639.xml diff --git a/build/version.c b/win32/version.c similarity index 100% rename from build/version.c rename to win32/version.c diff --git a/build/xchat-wdk-spell.skel.iss b/win32/xchat-wdk-spell.skel.iss similarity index 100% rename from build/xchat-wdk-spell.skel.iss rename to win32/xchat-wdk-spell.skel.iss diff --git a/build/xchat-wdk-x64.skel.iss b/win32/xchat-wdk-x64.skel.iss similarity index 98% rename from build/xchat-wdk-x64.skel.iss rename to win32/xchat-wdk-x64.skel.iss index 83e8031c..3b1abd2b 100644 --- a/build/xchat-wdk-x64.skel.iss +++ b/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 diff --git a/build/xchat-wdk-x86.skel.iss b/win32/xchat-wdk-x86.skel.iss similarity index 98% rename from build/xchat-wdk-x86.skel.iss rename to win32/xchat-wdk-x86.skel.iss index f0131dec..3b16fe0d 100644 --- a/build/xchat-wdk-x86.skel.iss +++ b/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