Mercurial > hg > easyhg-kdiff3
changeset 23:6daffd081b7e
Addition of the documentation
| author | friseb123 |
|---|---|
| date | Tue, 07 Oct 2003 20:02:22 +0000 |
| parents | b6a7e96a4f2c |
| children | 7cbcebe2b3e8 |
| files | kdiff3/src/kdiff3.bat kdiff3/src/kdiff3.nsi |
| diffstat | 2 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/kdiff3/src/kdiff3.bat Tue Oct 07 17:37:29 2003 +0000 +++ b/kdiff3/src/kdiff3.bat Tue Oct 07 20:02:22 2003 +0000 @@ -3,12 +3,16 @@ del kdiff3setup.exe del kdiff3.exe qmake kdiff3.pro "CONFIG+=release" "DEFINES+=NO_DEBUG" -rem nmake distclean -rem nmake clean +nmake distclean +nmake clean nmake lupdate kdiff3.pro lrelease kdiff3.pro cl version.c -o version.exe version nsis > version.nsi +md tmp +cd tmp +wget --mirror http://kdiff3.sourceforge.net/doc/index.html +cd .. 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 Tue Oct 07 17:37:29 2003 +0000 +++ b/kdiff3/src/kdiff3.nsi Tue Oct 07 20:02:22 2003 +0000 @@ -185,14 +185,19 @@ Section "Documentation" - + SetOutPath "$INSTDIR" + File /r tmp\kdiff3.sourceforge.net\doc + SetOutPath "$INSTDIR" + CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Documentation.lnk" "$INSTDIR\doc\index.html" + SectionEnd SubSection "Integration" Section "WinCVS" - - WriteRegStr HKEY_CURRENT_USER "Software\WinCvs\wincvs\CVS settings" "P_Extdiff" '"$INSTDIR\kdiff3.exe"' - WriteRegBin HKEY_CURRENT_USER "Software\WinCvs\wincvs\CVS settings" "P_DiffUseExtDiff" 01 + DetailPrint "Integration to WinCVS" + MessageBox MB_OK "Please close WinCVS" + WriteRegStr HKCU "Software\WinCvs\wincvs\CVS settings" "P_Extdiff" '"$INSTDIR\kdiff3.exe"' + WriteRegBin HKCU "Software\WinCvs\wincvs\CVS settings" "P_DiffUseExtDiff" 01 SectionEnd SubSectionEnd