[freefempp] 06/09: Get build date from SOURCE_DATE_EPOCH (if set), to make the build reproducible
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Sun Apr 24 22:09:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository freefempp.
commit 3ccd165b0b13a562af7302867ad6d581e12f1087
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Sun Apr 24 23:52:43 2016 +0300
Get build date from SOURCE_DATE_EPOCH (if set), to make the build reproducible
---
FreeFem++-CoCoa | 61 -----------
Makefile.am | 2 +-
.../build_date_from_SOURCE_DATE_EPOCH.patch | 37 +++++++
debian/patches/series | 1 +
download/arpack/Makefile | 1 +
download/blas/Makefile | 1 +
download/fftw/Makefile | 1 +
download/umfpack/Makefile | 1 +
examples++-3d/Makefile.am | 2 +-
examples++-3d/all.edp | 116 ++++++++++-----------
examples++-chapt3/Makefile.am | 2 +-
examples++-eigen/Makefile.am | 2 +-
examples++-load/Makefile.am | 6 +-
examples++-load/load.link.in | 2 +-
examples++-tutorial/Makefile.am | 2 +-
examples++/Makefile.am | 2 +-
examples-bamg/test/dotest.pl | 2 +-
script/PostInstall.sh | 33 ------
src/fflib/strversionnumber.cpp | 4 +-
19 files changed, 113 insertions(+), 165 deletions(-)
diff --git a/FreeFem++-CoCoa b/FreeFem++-CoCoa
deleted file mode 100644
index cdf4673..0000000
--- a/FreeFem++-CoCoa
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# EXTENSIONS : ".edp" # Accepted file extentions
-# OSTYPES : "****" # Accepted file types
-# ROLE : None # Role (Editor, Viewer, None)
-# SERVICEMENU : FreeFem++ # Name of Service menu item
-#
-dir=`dirname $0`;
-ff="/usr/bin/FreeFem++"
-fa="-glut ffglut "
-q="'"
-end="exit;"
-begin="cd $PWD;"
-
-# begin the cmd generation ----------
-cmd=""
-# -----------------
-for i in "$@"; do
-
- d=`dirname "$i"`;
- f=`basename "$i"`;
- if [ -f "$i" ] ; then
- np=`awk -v npo=$np '$1=="//" && $2=="NBPROC" { if( vv == ""){ print $3;}; vv=1}' "$i"`
- npa=`awk -v npo=$np '$1=="//" && $2=="PARAM" { if( vv == ""){ for(i=3;i<=NF;++i)print $i;}; vv=1}' "$i"`
- # echo --- $np -- $npa --------
- if [ "0$np" -gt 0 ] ; then
- test -n "../src/mpi/ff-mpirun" && ff="/usr/bin/ff-mpirun -np $np"
- fi
- if [ -n "$npa" ] ; then fa="$fa $npa"; fi
- cmd="$cmd cd $q$d$q; $ff $q$f$q $fa ;"
- fi
-done
-# ------------------
-if [ -z "$cmd" ]; then
- cmd="$ff;"
-fi
-# ------------------
-cmd="$cmd"
-# ---- end of cmd generation ----
-echo 'do script "'$cmd'"'
-#
-#
-# send the command $cmd to the apple terminal via osascript
-#
-# (echo $0;echo $*;echo "--$TERM--";printenv;set) >/tmp/tutu
-
-if [ -z "$TERM_PROGRAM" ] ; then
-echo '
-tell application "Terminal"
- activate
- try
- do script "'$begin$cmd$end'"
- end try
-end tell
-' | osascript
-else
-set -e
-eval $cmd
-fi;
-
-
diff --git a/Makefile.am b/Makefile.am
index 6979e3e..c7fa139 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@
# $Id$
-SUBDIRS= src examples++-load examples++-mpi \
+SUBDIRS=download src examples++-load examples++-mpi \
examples++-tutorial examples++ \
examples++-eigen \
examples++-bug examples++-chapt3 examples++-other \
diff --git a/debian/patches/build_date_from_SOURCE_DATE_EPOCH.patch b/debian/patches/build_date_from_SOURCE_DATE_EPOCH.patch
new file mode 100644
index 0000000..3b78d31
--- /dev/null
+++ b/debian/patches/build_date_from_SOURCE_DATE_EPOCH.patch
@@ -0,0 +1,37 @@
+Get build date from SOURCE_DATE_EPOCH (if set), to make the build reproducible
+--- a/configure.ac
++++ b/configure.ac
+@@ -128,8 +128,12 @@
+ TOOL_PARAMETERS($1,$2,$3)
+ ])
+
++SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}"
++FF_DATE=$(date -u -d "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
++AC_SUBST(FF_DATE,$FF_DATE)
++
+ ff_HOSTARCH_pastix=
+-echo "# Build with freefem++ with ./configure " `date` >$ff_where_lib_conf
++echo "# Build with freefem++ with ./configure $FF_DATE" >$ff_where_lib_conf
+ # To allow anonymous CVS version to contain a "./configure" and
+ # Makefiles
+
+--- a/src/fflib/Makefile.am
++++ b/src/fflib/Makefile.am
+@@ -64,5 +64,5 @@
+ EXTRA_DIST=strversionnumber.m4
+ BUILT_SOURCES=strversionnumber.cpp
+ strversionnumber.cpp: $(libff_a_SOURCES2) ../../configure
+- m4 -DVersionFreeFemDate="`date`" strversionnumber.m4 > $@
++ m4 -DVersionFreeFemDate="@FF_DATE@" strversionnumber.m4 > $@
+ FORCE:
+--- a/src/medit/Makefile.am
++++ b/src/medit/Makefile.am
+@@ -17,7 +17,7 @@
+ AM_CPPFLAGS=-I$(srcdir)/../libMesh
+ BUILT_SOURCES=compil.date
+ compil.date: $(ffmedit_SOURCES)
+- echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
++ echo "#define COMPIL " '" @FF_DATE@ (with ff++ $(VERSION))"' > compil.date
+ #.PHONY: compil.date
+
+ # ALH - during a parallel make, we should make sure that picking.o is not used before being made by a different
diff --git a/debian/patches/series b/debian/patches/series
index 4fe3d01..2e20499 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+build_date_from_SOURCE_DATE_EPOCH.patch
ls-locale.patch
examples++-load.patch
examples-bamg.patch
diff --git a/download/arpack/Makefile b/download/arpack/Makefile
index 8eb109f..891a505 100644
--- a/download/arpack/Makefile
+++ b/download/arpack/Makefile
@@ -228,6 +228,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
+FF_DATE = Sun Apr 24 23:47:18 EEST 2016
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/download/blas/Makefile b/download/blas/Makefile
index caf3dd2..bf001f5 100644
--- a/download/blas/Makefile
+++ b/download/blas/Makefile
@@ -485,6 +485,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
+FF_DATE = Sun Apr 24 23:47:18 EEST 2016
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/download/fftw/Makefile b/download/fftw/Makefile
index eff1e44..caad916 100644
--- a/download/fftw/Makefile
+++ b/download/fftw/Makefile
@@ -179,6 +179,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
+FF_DATE = Sun Apr 24 23:47:18 EEST 2016
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/download/umfpack/Makefile b/download/umfpack/Makefile
index d24f10c..5e46623 100644
--- a/download/umfpack/Makefile
+++ b/download/umfpack/Makefile
@@ -199,6 +199,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
+FF_DATE = Sun Apr 24 23:47:18 EEST 2016
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/examples++-3d/Makefile.am b/examples++-3d/Makefile.am
index 35f067c..aa9f927 100644
--- a/examples++-3d/Makefile.am
+++ b/examples++-3d/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST=*.edp all.edp regtests.edp regtests.m4 ref.edp dodecaedre01.mesh \
all.edp: Makefile
(echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;int MEM1234=storageused();"; \
- for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;searchMethod=0;" ; \
echo \{ include \"$$i\"\;\}\; ;\
diff --git a/examples++-3d/all.edp b/examples++-3d/all.edp
index 145d10b..1d9908b 100644
--- a/examples++-3d/all.edp
+++ b/examples++-3d/all.edp
@@ -7,105 +7,113 @@ verbosity=verbosityy;searchMethod=0;
verbosity=verbosityy;searchMethod=0;
{ include "ArrayFE-3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : beam-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "beam-3d.edp";};
+{ include "EqPoisson.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cone.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Lac.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cone.edp";};
+{ include "Lac.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : convect-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "convect-3d.edp";};
+{ include "Laplace-Adapt-3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : convect-3d-new.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "convect-3d-new.edp";};
+{ include "Laplace-Adapt-aniso-3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cube-period.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cube-period.edp";};
+{ include "Laplace3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cylinder-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cylinder-3d.edp";};
+{ include "LaplaceRT-3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cylinder.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cylinder.edp";};
+{ include "NSI3d-carac.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "EqPoisson.edp";};
+{ include "NSI3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : fallingspheres.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "fallingspheres.edp";};
+{ include "Period-Poisson-cube-ballon.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : first.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "first.edp";};
+{ include "Poisson-cube-ballon.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : intlevelset3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "intlevelset3d.edp";};
+{ include "Poisson.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Lac.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Lac.edp";};
+{ include "Poisson3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Laplace3d.edp";};
+{ include "Stokes.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Laplace-Adapt-3d.edp";};
+{ include "TruncLac.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : beam-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Laplace-Adapt-aniso-3d.edp";};
+{ include "beam-3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cone.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "LaplaceRT-3d.edp";};
+{ include "cone.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : convect-3d-new.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "meditddm.edp";};
+{ include "convect-3d-new.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : convect-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "NSI3d-carac.edp";};
+{ include "convect-3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cube-period.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "NSI3d.edp";};
+{ include "cube-period.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : p.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cylinder-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "p.edp";};
+{ include "cylinder-3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : periodic-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cylinder.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "periodic-3d.edp";};
+{ include "cylinder.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : fallingspheres.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Period-Poisson-cube-ballon.edp";};
+{ include "fallingspheres.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : first.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Poisson3d.edp";};
+{ include "first.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : intlevelset3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Poisson-cube-ballon.edp";};
+{ include "intlevelset3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Poisson.edp";};
+{ include "meditddm.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : p.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "p.edp";};
+ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : periodic-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "periodic-3d.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : pyramide.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
@@ -127,10 +135,6 @@ verbosity=verbosityy;searchMethod=0;
verbosity=verbosityy;searchMethod=0;
{ include "sphere6.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;searchMethod=0;
-{ include "Stokes.edp";};
- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : tetgencube.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
{ include "tetgencube.edp";};
@@ -139,7 +143,3 @@ verbosity=verbosityy;searchMethod=0;
verbosity=verbosityy;searchMethod=0;
{ include "tetgenholeregion.edp";};
cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;searchMethod=0;
-{ include "TruncLac.edp";};
- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
diff --git a/examples++-chapt3/Makefile.am b/examples++-chapt3/Makefile.am
index a463d22..ca1be28 100644
--- a/examples++-chapt3/Makefile.am
+++ b/examples++-chapt3/Makefile.am
@@ -11,7 +11,7 @@ TESTS_ENVIRONMENT=TEST_FFPP=$(TEST_FFPP) FLAGS_FFPP=-nw
all.edp:
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
- for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
echo \{ include \"$$i\"\;\}\; ;\
diff --git a/examples++-eigen/Makefile.am b/examples++-eigen/Makefile.am
index 532e3f1..7935374 100644
--- a/examples++-eigen/Makefile.am
+++ b/examples++-eigen/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST=*.edp all.edp
all.edp:
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
- for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
echo \{ include \"$$i\"\;\}\; ;\
diff --git a/examples++-load/Makefile.am b/examples++-load/Makefile.am
index 15f5623..ca982a2 100644
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
@@ -165,7 +165,7 @@ all-local: all.edp regtests.edp load_compile
all.edp:
@(echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;"; \
- for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
if ../src/nw/FreeFem++ -ns -jc -v 0 $$i 1>/dev/null 2>/dev/null ; then \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
@@ -222,8 +222,8 @@ install-exec-local:: load_compile WHERE_LIBRARY
sed <$$i >$(DESTDIR)$(ff_prefix_dir)/lib/$$i 's#$(abs_top_builddir)/download#$(ff_prefix_dir)#' ;\
done
echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo loadpath += \"$(prefix)/lib/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo includepath += \"$(prefix)/include/freefem++/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
$(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
diff --git a/examples++-load/load.link.in b/examples++-load/load.link.in
index 4b901a2..b680273 100755
--- a/examples++-load/load.link.in
+++ b/examples++-load/load.link.in
@@ -227,7 +227,7 @@ case "$WIN32$uu" in
LIBS="'$b/libff.dll' $LIBS $DLL"
# SUF=dll
;;
- FreeBSD|NetBSD|GNU/kFreeBSD)
+ FreeBSD|NetBSD)
SHARED="-shared"
FLAGS='-fPIC';;
# 64 bit Linux needs -fPIC (ALH)
diff --git a/examples++-tutorial/Makefile.am b/examples++-tutorial/Makefile.am
index 4fa0dd1..07fd294 100644
--- a/examples++-tutorial/Makefile.am
+++ b/examples++-tutorial/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST=*.edp *.idp aile.msh xyf all.edp regtests.edp regtests.m4 ref.edp
all.edp:
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
- for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
echo \{ include \"$$i\"\;\}\; ;\
diff --git a/examples++/Makefile.am b/examples++/Makefile.am
index 37fe0ce..7215bb0 100644
--- a/examples++/Makefile.am
+++ b/examples++/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST=*.edp all.edp regtests.edp regtests.m4 ref.edp
all.edp:
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
- for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
echo \{ include \"$$i\"\;\}\; ;\
diff --git a/examples-bamg/test/dotest.pl b/examples-bamg/test/dotest.pl
index 115c0cb..3c307b0 100755
--- a/examples-bamg/test/dotest.pl
+++ b/examples-bamg/test/dotest.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
# ----- clean ---
unlink <*.mesh>;
unlink <*.am_fmt>;
diff --git a/script/PostInstall.sh b/script/PostInstall.sh
deleted file mode 100755
index 0a342d7..0000000
--- a/script/PostInstall.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# "-DFF__FVER=$(PACKAGE_VERSION)"
-# "-DFF_BINDIR=$(bindir)"
-# "-DFF__DATADIR=$(pkgdatadir)
-# "FFBIN="@prefix@"/bin
-ff_desktop="$HOME/Desktop/FreeFem++-""FF__FVER"
-mkdir -p -m 0755 /etc/paths.d
-ln -sf "FF__DATADIR"/"freefem++doc.pdf" "$HOME/Desktop"
-test -e "$ff_desktop" || ln -sf "FF__DATADIR"/"FF__FVER" "$ff_desktop"
-echo Install /etc/paths.d/FreeFem++ file: "FF_BINDIR"
-
-echo "FF_BINDIR" > /etc/paths.d/FreeFem++
-chmod a+r /etc/paths.d/FreeFem++
-echo " Try to Clean old file version "
-if [ -d /usr/local/bin ] ; then
- cd /usr/local/bin
- for i in FreeFem++ FreeFem++-CoCoa FreeFem++-mpi FreeFem++-nw bamg cvmsh2 ff-c++ ff-get-dep ff-mpirun ff-pkg-download ffglut ffmedit;
- do
-
- if [ -f "$i" ] ; then
- echo " clean $i "
- rm "$i";
- fi
- done
-
-
-echo ln -s FF_BINDIR/FreeFem++-CoCoa /usr/local/bin/
-ln -s FF_BINDIR/FreeFem++-CoCoa /usr/local/bin/
-
-fi
-# bluid new link to new
-
-
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 9c842fc..3cd397e 100644
--- a/src/fflib/strversionnumber.cpp
+++ b/src/fflib/strversionnumber.cpp
@@ -18,6 +18,6 @@ string StrVersionNumber(){
// buffer.precision(8);
// buffer<<VersionNumber();
static char buffer[100];
- sprintf(buffer," %9f (date Κυρ 24 Απρ 2016 03:44:18 μμ EEST)",VersionNumber());
- return buffer; //.str()+" (date Κυρ 24 Απρ 2016 03:44:18 μμ EEST)" ;
+ sprintf(buffer," %9f (date Sun Apr 24 23:47:18 EEST 2016)",VersionNumber());
+ return buffer; //.str()+" (date Sun Apr 24 23:47:18 EEST 2016)" ;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git
More information about the debian-science-commits
mailing list