restructuring

This commit is contained in:
Berke Viktor 2011-12-11 14:29:37 +01:00
parent 1b84f0467a
commit 2012320d0e
78 changed files with 23 additions and 23 deletions

View File

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

View File

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

View File

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

View File

@ -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 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 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 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 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_512=c:\mozilla-build\perl-5.12-x64\perl
set PERL_514=c:\mozilla-build\perl-5.14-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 -i >> xchat-wdk-x64.iss
version -o64 >> xchat-wdk-x64.iss version -o64 >> xchat-wdk-x64.iss
cd .. cd ..
build\version -r > resource.h win32\version -r > resource.h
echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk-x64.iss echo SetupIconFile=%cd%\xchat.ico >> win32\xchat-wdk-x64.iss
type build\xchat-wdk-x64.skel.iss >> build\xchat-wdk-x64.iss type win32\xchat-wdk-x64.skel.iss >> win32\xchat-wdk-x64.iss
cd src cd src
echo DEV = %DEV_64% > makeinc.mak echo DEV = %DEV_64% > makeinc.mak
echo X64 = YES >> makeinc.mak echo X64 = YES >> makeinc.mak
@ -37,7 +37,7 @@ nmake /nologo /s /f makefile-512.mak
set PATH=%OOPATH%;%PERL_514%\bin set PATH=%OOPATH%;%PERL_514%\bin
nmake /nologo /s /f makefile-514.mak clean nmake /nologo /s /f makefile-514.mak clean
nmake /nologo /s /f makefile-514.mak nmake /nologo /s /f makefile-514.mak
cd ..\..\build cd ..\..\win32
call compile-po-files.bat call compile-po-files.bat
set PATH=%OPATH% set PATH=%OPATH%
call release-x64.bat call release-x64.bat

View File

@ -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 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 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 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 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_512=c:\mozilla-build\perl-5.12-x86\perl
set PERL_514=c:\mozilla-build\perl-5.14-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 -i >> xchat-wdk-x86.iss
version -o32 >> xchat-wdk-x86.iss version -o32 >> xchat-wdk-x86.iss
cd .. cd ..
build\version -r > resource.h win32\version -r > resource.h
echo SetupIconFile=%cd%\xchat.ico >> build\xchat-wdk-x86.iss echo SetupIconFile=%cd%\xchat.ico >> win32\xchat-wdk-x86.iss
type build\xchat-wdk-x86.skel.iss >> build\xchat-wdk-x86.iss type win32\xchat-wdk-x86.skel.iss >> win32\xchat-wdk-x86.iss
cd src cd src
echo DEV = %DEV_32% > makeinc.mak echo DEV = %DEV_32% > makeinc.mak
type makeinc.skel.mak >> 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 set PATH=%OOPATH%;%PERL_514%\bin
nmake /nologo /s /f makefile-514.mak clean nmake /nologo /s /f makefile-514.mak clean
nmake /nologo /s /f makefile-514.mak nmake /nologo /s /f makefile-514.mak
cd ..\..\build cd ..\..\win32
call compile-po-files.bat call compile-po-files.bat
set PATH=%OPATH% set PATH=%OPATH%
call release-x86.bat call release-x86.bat

View File

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

View File

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

View File

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

View File

Before

Width:  |  Height:  |  Size: 703 B

After

Width:  |  Height:  |  Size: 703 B

View File

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 323 B

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

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

View File

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

View File

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

View File

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