Mercurial > hg > easyhg-kdiff3

changeset 45:42106f54567f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Addition of the source code in the windows distribution Addition of an optional debug distribution
author friseb123
date Thu, 16 Oct 2003 11:41:04 +0000
parents bf8fa177e5a1
children 97f15262ad06
files kdiff3/src/kdiff3.bat kdiff3/src/kdiff3.nsi
diffstat 2 files changed, 40 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/kdiff3/src/kdiff3.bat	Wed Oct 15 20:14:03 2003 +0000
+++ b/kdiff3/src/kdiff3.bat	Thu Oct 16 11:41:04 2003 +0000
@@ -1,18 +1,37 @@
-rem set QTDIR=f:\qt\3.2.1\
+set DEBUG=1
 echo QTDIR=%QTDIR%
+del Makefile
 del kdiff3setup*.exe
+del kdiff3.pdb
 del kdiff3.exe
-qmake kdiff3.pro "CONFIG+=release" "DEFINES+=NO_DEBUG" 
-nmake distclean
-nmake clean
+if %DEBUG%==1 (
+  echo debug mode
+  qmake kdiff3.pro "CONFIG-=release" "CONFIG+=debug" 
+) else (
+  qmake kdiff3.pro "CONFIG+=release" "DEFINES+=NO_DEBUG" 
+)
+
+ nmake distclean
+ nmake clean
 nmake
+del kdiff3.zip
+nmake dist
 lupdate kdiff3.pro
 lrelease kdiff3.pro
 cl version.c -o version.exe
 version nsis > version.nsi
+ del /S /Q tmp
 md tmp
 cd tmp
-wget --mirror http://kdiff3.sourceforge.net/doc/index.html
+ wget --mirror http://kdiff3.sourceforge.net/doc/index.html
+md source
+cd source
+unzip -x ..\..\kdiff3.zip
 cd ..
-makensis.exe  /DQTDIR=%QTDIR% /DWINDOWS_DIR=%WINDIR%  kdiff3
+cd ..
+if %DEBUG%==1 (
+  makensis.exe  /DQTDIR=%QTDIR% /DWINDOWS_DIR=%WINDIR%  /DDEBUG=%DEBUG% kdiff3
+) else (
+  makensis.exe  /DQTDIR=%QTDIR% /DWINDOWS_DIR=%WINDIR%  kdiff3
+)
 pscp  kdiff3setup*.exe friseb123@kdiff3.sourceforge.net:/home/groups/k/kd/kdiff3/htdocs
--- a/kdiff3/src/kdiff3.nsi	Wed Oct 15 20:14:03 2003 +0000
+++ b/kdiff3/src/kdiff3.nsi	Thu Oct 16 11:41:04 2003 +0000
@@ -7,7 +7,7 @@
 !define MUI_VERSION "" ;Define your own software version here
 !endif
 !ifndef QTDIR
-!define QTDIR "f:\qt\3.1.2"
+!define QTDIR "f:\qt\3.2.2"
 !endif
 !ifndef WINDOWS_DIR
 !define WINDOWS_DIR "c:\windows"
@@ -214,6 +214,20 @@
 SectionEnd 
 SubSectionEnd
  
+Section "Source"
+
+    DetailPrint "Writing the Source Code"
+    SetOutPath "$INSTDIR\source\"
+    File /r tmp\source
+SectionEnd
+!ifdef DEBUG   
+Section "Debug Information"
+  DetailPrint "Writing debug information"
+  SetOutPath "$INSTDIR"
+  File /oname=kdiff3.pdb kdiff3.pdb
+SectionEnd 
+!endif
+
 ;Display the Finish header
 ;Insert this macro after the sections if you are not using a finish page
 !insertmacro MUI_SECTIONS_FINISHHEADER