Maintenance will be performed on git.ligo.org, chat.ligo.org, containers.ligo.org, and docs.ligo.org on Tuesday 7th July 2020 starting at approximately 10am PDT and lasting for around 15 minutes. There will be a short period of downtime towards the end of the maintenance window. Please direct any comments, questions, or concerns to uwm-help@cgca.uwm.edu.

Commit 63b9cf46 authored by Daniel Brown's avatar Daniel Brown

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.
parent a64f7062
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): ...@@ -125,11 +125,17 @@ Windows (no Cygwin installed):
to update your PATH variables. After this has been run you must to update your PATH variables. After this has been run you must
NOT move this Finesse folder, as the system PATH variable has been 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 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 Running install.bat will also attempt to find a gnuplot installation
from http://www.gnuplot.info/. on your computer and set up Finesse to work with it. If it does not
Next you need to specify the path to the Gnuplot executable 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 in the `kat.ini' file with the GNUCOMMAND variable. For this
you will have to determine the directory which points to you will have to determine the directory which points to
where gnuplot is installed. If you have a space in the path 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
...@@ -274,11 +274,12 @@ build() ...@@ -274,11 +274,12 @@ build()
make-win-package() make-win-package()
{ {
sys=`eval uname --machine` sys=`eval uname --machine`
ver=`eval git describe --abbrev=0`
echo "Making Windows $sys package..." | tee -a $LOGFILE echo "Making Windows $sys package..." | tee -a $LOGFILE
rm -rf .windlls
python getWinDLLs.py python getWinDLLs.py
dir=FINESSE_WIN_$sys
dir=FINESSE_"$ver"_WIN_"$sys"
rm -rf $dir rm -rf $dir
mkdir $dir mkdir $dir
...@@ -286,6 +287,7 @@ make-win-package() ...@@ -286,6 +287,7 @@ make-win-package()
cp ../.windlls/*.dll . cp ../.windlls/*.dll .
cp ../kat.exe . cp ../kat.exe .
cp ../kat.ini .
cp ../CHANGES . cp ../CHANGES .
cp ../LICENSES . cp ../LICENSES .
cp ../README . cp ../README .
...@@ -293,8 +295,12 @@ make-win-package() ...@@ -293,8 +295,12 @@ make-win-package()
cp ../test.kat . cp ../test.kat .
cp ../test_plot.kat . cp ../test_plot.kat .
cp ../install.bat . 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 .. cd ..
} }
......
...@@ -15,7 +15,7 @@ if os.path.exists(".windlls"): ...@@ -15,7 +15,7 @@ if os.path.exists(".windlls"):
shutil.os.mkdir(".windlls") shutil.os.mkdir(".windlls")
for file in b: for file in b:
print "Copying ", file print "cp ", file.replace('\\','\\\\'), "."
shutil.copyfile(file, os.path.join("./.windlls", os.path.basename(file.replace('\\','/')))) shutil.copy2(file, os.path.join("./.windlls", os.path.basename(file.replace('\\','/'))))
print "Copied dlls into .windlls folder." print "Copied dlls into .windlls folder."
\ No newline at end of file
@echo off @echo off
CD %~dp0
setx PATH "%CD%;%PATH%" setx PATH "%CD%;%PATH%"
setx KATINI "%CD%\kat.ini" setx KATINI "%CD%\kat.ini"
setx CYGWIN "%CYGWIN% nodosfilewarning" setx CYGWIN "%CYGWIN% nodosfilewarning"
echo --------------------------------------- echo ---------------------------------------
echo Installed Finesse! echo Installed Finesse!
echo You can now call the `kat` command from echo You can now call the `kat` command from
echo any newly opened command prompt. 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 --------------------------------------- echo ---------------------------------------
pause pause
\ No newline at end of file
...@@ -41,11 +41,12 @@ Cuba-3.2: ...@@ -41,11 +41,12 @@ Cuba-3.2:
cp ./Cuba-3.2/cuba.h ../src/ cp ./Cuba-3.2/cuba.h ../src/
# cleanup targets # cleanup targets
clean: 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 \ do \
$(MAKE) --directory=$$d clean; \ $(MAKE) --directory=$$d clean; \
done done
$(MAKE) --directory=Cuba-3.2 clean dist
rm ./Cuba-3.2/libcuba.a rm ./Cuba-3.2/libcuba.a
rm ./KLUsparse/KLU/Lib/lib*.a rm ./KLUsparse/KLU/Lib/lib*.a
rm ./KLUsparse/COLAMD/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