adding some helper files for installing and setting up gnuplot easily on...

adding some helper files for installing and setting up gnuplot easily on windows by checking the registry. Change cuba clean to do a full clean of configure settings. Adding WiX MSI builder files.

INSTALL

@@ -125,11 +125,17 @@ Windows (no Cygwin installed):
   to update your PATH variables. After this has been run you must
   NOT move this Finesse folder, as the system PATH variable has been
   set for this directory only. If you do move the folder then please
-  re-run install.bat.
+  re-run install.bat. 
   
-  Now you must install gnuplot on your computer 
-  from http://www.gnuplot.info/.
-  Next you need to specify the path to the Gnuplot executable 
+  Running install.bat will also attempt to find a gnuplot installation
+  on your computer and set up Finesse to work with it. If it does not
+  find one you will either have to install it first, and re-run install.bat,
+  or manually setup the kat.ini file to use you Gnutplot installation.
+  
+  The best way to install gnuplot is with the Windows binary installer:
+  http://sourceforge.net/projects/gnuplot/files/gnuplot/4.6.0/gp460-win32-setup.exe/download
+  
+  To install manually you need to specify the path to the Gnuplot executable 
   in the `kat.ini' file with the GNUCOMMAND variable. For this
   you will have to determine the directory which points to
   where gnuplot is installed. If you have a space in the path

findGnuplot.bat

+
+@setlocal enableextensions enabledelayedexpansion
+@echo OFF
+
+CD %~dp0
+echo ---------------------------------------
+echo Looking for gnuplot on your computer...
+FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKEY_CLASSES_ROOT\gnuplot\shell\open\command"`) DO (
+    set appdir=%%A %%B
+    set appdir=!appdir:~0,-4!
+    )
+    
+IF DEFINED appdir (
+    ECHO Found GNUPLOT %appdir%!
+    ECHO Adding to kat.ini...
+    echo GNUCOMMAND '%appdir%' >> kat.ini
+) ELSE (
+    ECHO No GNUPLOT installation could be
+    ECHO found. Please find it manually or 
+    ECHO and add to the GNUCOMMAND to the
+    ECHO kat.ini file. Or install it and
+    ECHO re-run findGnuplot.bat.
+)
+echo ---------------------------------------
+pause
\ No newline at end of file

finesse.sh

@@ -274,11 +274,12 @@ build()
 make-win-package()
 {
     sys=`eval uname --machine`
-    
+    ver=`eval git describe --abbrev=0`
 	echo "Making Windows $sys package..." | tee -a $LOGFILE
-    
+    rm -rf .windlls
     python getWinDLLs.py
-    dir=FINESSE_WIN_$sys
+    
+    dir=FINESSE_"$ver"_WIN_"$sys"
     
     rm -rf $dir
 	mkdir $dir
@@ -286,6 +287,7 @@ make-win-package()
 	
 	cp ../.windlls/*.dll .
 	cp ../kat.exe .
+    cp ../kat.ini .
 	cp ../CHANGES .
 	cp ../LICENSES .
 	cp ../README .
@@ -293,8 +295,12 @@ make-win-package()
 	cp ../test.kat .
     cp ../test_plot.kat .
     cp ../install.bat .
+    cp ../findGnuplot.bat .
+
+    a=`which cygpath`    
+    cp $a .
     
-	echo "Created Windows distribution FINESSE_WIN_$sys.zip" | tee -a $LOGFILE
+	echo "Created Windows distribution $dir" | tee -a $LOGFILE
 	
 	cd ..
 }

getWinDLLs.py

@@ -15,7 +15,7 @@ if os.path.exists(".windlls"):
 shutil.os.mkdir(".windlls")
 
 for file in b:
-    print "Copying ", file
-    shutil.copyfile(file, os.path.join("./.windlls", os.path.basename(file.replace('\\','/'))))
+    print "cp ", file.replace('\\','\\\\'), "."
+    shutil.copy2(file, os.path.join("./.windlls", os.path.basename(file.replace('\\','/'))))
 
 print "Copied dlls into .windlls folder."
\ No newline at end of file

install.bat

 @echo off
+CD %~dp0
+
 setx PATH "%CD%;%PATH%"
 setx KATINI "%CD%\kat.ini"
 setx CYGWIN "%CYGWIN% nodosfilewarning"
+
 echo ---------------------------------------
 echo Installed Finesse!
 echo You can now call the `kat` command from 
 echo any newly opened command prompt.
+echo Please run the findGnuplot.bat file too
+echo to try and automatically find the 
+echo gnuplot installation.
+echo ---------------------------------------
+
+call findGnuplot.bat
+
+echo ---------------------------------------
+echo Once gnuplot is setup you should test
+echo the installation by running:
+echo    kat test.kat
+echo and:
+echo    kat test_plot.kat
+echo as described in section 3 in the 
+echo INSTALL file.
 echo ---------------------------------------
 
 pause
\ No newline at end of file

lib/Makefile

@@ -41,11 +41,12 @@ Cuba-3.2:
 	cp ./Cuba-3.2/cuba.h ../src/
 # cleanup targets
 clean:
-	for d in formulc libkatnet libMNet KLUsparse Cuba-3.2 SuperLU_MT_2.1 NICSLU;  \
+	for d in formulc libkatnet libMNet KLUsparse SuperLU_MT_2.1 NICSLU;  \
 	do                        \
 	    $(MAKE) --directory=$$d clean; \
 	done
-
+        
+	$(MAKE) --directory=Cuba-3.2 clean dist
 	rm ./Cuba-3.2/libcuba.a
 	rm ./KLUsparse/KLU/Lib/lib*.a
 	rm ./KLUsparse/COLAMD/Lib/lib*.a