changeset 22:b6a7e96a4f2c

Correction of the script to create the first usefull setup

--- a/kdiff3/src/kdiff3.bat	Tue Oct 07 16:26:04 2003 +0000
+++ b/kdiff3/src/kdiff3.bat	Tue Oct 07 17:37:29 2003 +0000
@@ -3,12 +3,12 @@
 del kdiff3setup.exe
 del kdiff3.exe
 qmake kdiff3.pro "CONFIG+=release" "DEFINES+=NO_DEBUG" 
-nmake distclean
-nmake clean
+rem nmake distclean
+rem nmake clean
 nmake
 lupdate kdiff3.pro
 lrelease kdiff3.pro
 cl version.c -o version.exe
 version nsis > version.nsi
 makensis.exe  /DQTDIR=%QTDIR% /DWINDOWS_DIR=%WINDIR%  kdiff3
-pause
+

--- a/kdiff3/src/kdiff3.nsi	Tue Oct 07 16:26:04 2003 +0000
+++ b/kdiff3/src/kdiff3.nsi	Tue Oct 07 17:37:29 2003 +0000
@@ -2,9 +2,9 @@
 ;MultiLanguage Example Script
 ;Written by Joost Verburg
 !define MUI_PRODUCT "KDiff3" ;Define your own software name here
+!include "version.nsi"
 !ifndef MUI_VERSION
-;!define MUI_VERSION "" ;Define your own software version here
-!include "version.nsi"
+!define MUI_VERSION "" ;Define your own software version here
 !endif
 !ifndef QTDIR
 !define QTDIR "f:\qt\3.1.2"
@@ -24,7 +24,7 @@
 
   ;General
   OutFile "KDiff3Setup_${MUI_VERSION}.exe"
-  setCompressor zlib
+  setCompressor bzip2
 
   
   
@@ -50,7 +50,7 @@
   
   !define MUI_UNINSTALLER
   !define MUI_UNCONFIRMPAGE
-;  !define MUI_HEADERBITMAP "kdiff3.bmp"
+  !define MUI_HEADERBITMAP "kdiff3.bmp"
 ;--------------------------------
 ;Languages
 
@@ -162,14 +162,8 @@
     File "${WINDOWS_DIR}\system32\msvcp70.dll"
     File "${WINDOWS_DIR}\system32\msvcr70.dll"
     File "${QTDIR}\lib\qt-mt*.dll"
-    File "..\trd_*.qm"
+    ; File "*.qm"
 
-    SetOutPath "$INSTDIR\sqldrivers"
-    File "${QTDIR}\plugins\sqldrivers\*.dll"
-    SetOutPath "$INSTDIR\imageformats"
-    File "${QTDIR}\plugins\imageformats\*.dll"
-    SetOutPath "$INSTDIR\styles"
-    File "..\styles\*.dll"
   !insertmacro MUI_STARTMENU_WRITE_BEGIN
     
     ;Create shortcuts
@@ -189,18 +183,19 @@
   
 SectionEnd
  
-Section "WinCVS Integration" SecStart 7
+Section "Documentation"
+
+
+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
 
-SectionEnd
- 
-Section "Start of the application" SecStart 6
-
-    Exec "$INSTDIR\kdiff3.exe"
-
-SectionEnd
+SectionEnd 
+SubSectionEnd
  
 ;Display the Finish header
 ;Insert this macro after the sections if you are not using a finish page

--- a/kdiff3/src/version.c	Tue Oct 07 16:26:04 2003 +0000
+++ b/kdiff3/src/version.c	Tue Oct 07 17:37:29 2003 +0000
@@ -12,7 +12,7 @@
   }
   else if (strcmp(argc[1],"nsis")==0)
   {
-    printf("!define MUI_VERSION=\"%s\"\n",VERSION);
+    printf("!define MUI_VERSION \"%s\"\n",VERSION);
   }
   else if (strcmp(argc[1],"unix")==0)
   {