Commit a5a22e70 authored by Daniel Brown's avatar Daniel Brown

Merge branch 'master' into develop

parents 5e3eef7a 63b9cf46
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -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
......
@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
......@@ -123,6 +123,7 @@ check_GSL_architecture()
else
echo " ** Could not determne architecture from GSL libraries"
exit 1
fi
echo " - setting architecture based on GSL to $CPUARCH " | tee -a $LOGFILE
fi
......@@ -272,33 +273,36 @@ build()
make-win-package()
{
echo "Making Win32 package..." | tee -a $LOGFILE
mkdir tmp
cd tmp
# copies dll's needed from the cygwin installation
cp /bin/cygwin1.dll .
#cp /bin/cyggcc_s-1.dll .
#cp /bin/cygiconv-2.dll .
#cp /bin/cygintl-8.dll .
#cp /bin/cygncursesw-10.dll .
#cp /bin/cygpath.exe .
#cp /bin/sh.exe .
#cp /bin/cygreadline7.dll .
#cp /bin/ls.exe .
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_"$ver"_WIN_"$sys"
rm -rf $dir
mkdir $dir
cd $dir
cp ../.windlls/*.dll .
cp ../kat.exe .
cp ../kat.ini .
cp ../CHANGES .
cp ../LICENSES .
cp ../README .
cp ../INSTALL .
zip ../finesse_win.zip *
echo "Created Win32 distribution finesse_win32.zip" | tee -a $LOGFILE
cp ../test.kat .
cp ../test_plot.kat .
cp ../install.bat .
cp ../findGnuplot.bat .
a=`which cygpath`
cp $a .
echo "Created Windows distribution $dir" | tee -a $LOGFILE
cd ..
rm tmp -rf
}
print_usage()
......
from subprocess import Popen, PIPE
import shutil
import os
p = Popen(['cygcheck', 'kat'], stdin=PIPE, stdout=PIPE, stderr=PIPE)
out, err = p.communicate()
a = out.split("\n")
b = [c.strip() for c in a if c.find("cygwin") >= 0]
if os.path.exists(".windlls"):
shutil.rmtree(".windlls")
shutil.os.mkdir(".windlls")
for file in b:
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
@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
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment