From 4cd93deec644e4fd3d1e5b81fd01ba6e453f285b Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Tue, 17 Aug 2010 02:13:04 +0200 Subject: [PATCH] separate exe files, unified packages for standard and portable, stage 1 --- build/build-x64.bat | 6 ++++++ build/build-x86.bat | 6 ++++++ build/release-x64.bat | 1 + build/release-x86.bat | 1 + src/fe-gtk/makefile.mak | 4 ++++ 5 files changed, 18 insertions(+) diff --git a/build/build-x64.bat b/build/build-x64.bat index 7f1c3686..97a8ccd7 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -6,6 +6,12 @@ set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\ cd ..\src nmake -f makefile.mak clean nmake -f makefile.mak +echo.Enable portable build and press return +pause +move fe-gtk\xchat.exe fe-gtk\xchat.exe.orig +nmake -f makefile.mak clean +nmake -f makefile.mak +move fe-gtk\xchat.exe.orig fe-gtk\xchat.exe cd ..\plugins\ewc nmake -f makefile.mak clean nmake -f makefile.mak diff --git a/build/build-x86.bat b/build/build-x86.bat index 5d28ce5e..e9a84be2 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -6,6 +6,12 @@ set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Pr cd ..\src nmake -f makefile.mak clean nmake -f makefile.mak +echo.Enable portable build and press return +pause +move fe-gtk\xchat.exe fe-gtk\xchat.exe.orig +nmake -f makefile.mak clean +nmake -f makefile.mak +move fe-gtk\xchat.exe.orig fe-gtk\xchat.exe cd ..\plugins\ewc nmake -f makefile.mak clean nmake -f makefile.mak diff --git a/build/release-x64.bat b/build/release-x64.bat index 65f4c09b..2f8a88d1 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -6,6 +6,7 @@ set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x64 rmdir /Q /S %XCHAT_DEST% mkdir %XCHAT_DEST% xcopy ..\src\fe-gtk\xchat.exe %XCHAT_DEST% +xcopy ..\src\fe-gtk\xchat-portable.exe %XCHAT_DEST% xcopy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST% xcopy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% xcopy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST% diff --git a/build/release-x86.bat b/build/release-x86.bat index 2286894b..1530afe8 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -6,6 +6,7 @@ set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x86 rmdir /Q /S %XCHAT_DEST% mkdir %XCHAT_DEST% xcopy ..\src\fe-gtk\xchat.exe %XCHAT_DEST% +xcopy ..\src\fe-gtk\xchat-portable.exe %XCHAT_DEST% xcopy %GTK_BIN%\libgtk-win32-2.0-0.dll %XCHAT_DEST% xcopy %GTK_BIN%\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST% xcopy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST% diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak index f5198181..74b14631 100644 --- a/src/fe-gtk/makefile.mak +++ b/src/fe-gtk/makefile.mak @@ -7,7 +7,11 @@ MACHINE_FLAG = /MACHINE:X86 !endif COMLIB = ..\common\xchatcommon.lib +!ifdef PORTABLE +PROG = xchat-portable.exe +!else PROG = xchat.exe +!endif all: $(PROG)