# HG changeset patch # User friseb123 # Date 1065556942 0 # Node ID 6daffd081b7effdf841eda1255b364d9d2f48894 # Parent b6a7e96a4f2c622e58e70cc8b4b477e79f262dab Addition of the documentation diff -r b6a7e96a4f2c -r 6daffd081b7e kdiff3/src/kdiff3.bat --- 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 diff -r b6a7e96a4f2c -r 6daffd081b7e kdiff3/src/kdiff3.nsi --- 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