[freefempp] 05/09: Set ls locale in Makefiles for reproducible order
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 0f94b3fea8739d9327ce3c544dc8229681a5c55f
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Sun Apr 24 18:02:54 2016 +0300
Set ls locale in Makefiles for reproducible order
---
debian/patches/ls-locale.patch | 67 +++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
examples++-3d/Makefile.am | 2 +-
examples++-chapt3/Makefile.am | 2 +-
examples++-eigen/Makefile.am | 2 +-
examples++-load/Makefile.am | 2 +-
examples++-tutorial/Makefile.am | 2 +-
examples++/Makefile.am | 2 +-
8 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/debian/patches/ls-locale.patch b/debian/patches/ls-locale.patch
new file mode 100644
index 0000000..ba6d585
--- /dev/null
+++ b/debian/patches/ls-locale.patch
@@ -0,0 +1,67 @@
+Set ls locale to C in Makefiles for reproducible order
+--- a/examples++-3d/Makefile.am
++++ b/examples++-3d/Makefile.am
+@@ -16,7 +16,7 @@
+
+ all.edp: Makefile
+ (echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;int MEM1234=storageused();"; \
+- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
++ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
+ echo "verbosity=verbosityy;searchMethod=0;" ; \
+ echo \{ include \"$$i\"\;\}\; ;\
+--- a/examples++-chapt3/Makefile.am
++++ b/examples++-chapt3/Makefile.am
+@@ -11,7 +11,7 @@
+
+ all.edp:
+ (echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
+- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
++ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
+ echo "verbosity=verbosityy;" ; \
+ echo \{ include \"$$i\"\;\}\; ;\
+--- a/examples++-eigen/Makefile.am
++++ b/examples++-eigen/Makefile.am
+@@ -11,7 +11,7 @@
+
+ all.edp:
+ (echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
+- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
++ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
+ echo "verbosity=verbosityy;" ; \
+ echo \{ include \"$$i\"\;\}\; ;\
+--- a/examples++-load/Makefile.am
++++ b/examples++-load/Makefile.am
+@@ -165,7 +165,7 @@
+
+ all.edp:
+ @(echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;"; \
+- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
++ for i in `LC_ALL=C 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;" ; \
+--- a/examples++-tutorial/Makefile.am
++++ b/examples++-tutorial/Makefile.am
+@@ -12,7 +12,7 @@
+
+ all.edp:
+ (echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
+- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
++ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
+ echo "verbosity=verbosityy;" ; \
+ echo \{ include \"$$i\"\;\}\; ;\
+--- a/examples++/Makefile.am
++++ b/examples++/Makefile.am
+@@ -10,7 +10,7 @@
+
+ all.edp:
+ (echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
+- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
++ for i in `LC_ALL=C 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/debian/patches/series b/debian/patches/series
index 7a2a57b..4fe3d01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+ls-locale.patch
examples++-load.patch
examples-bamg.patch
Makefile.patch
diff --git a/examples++-3d/Makefile.am b/examples++-3d/Makefile.am
index aa9f927..35f067c 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C 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++-chapt3/Makefile.am b/examples++-chapt3/Makefile.am
index ca1be28..a463d22 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C 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 7935374..532e3f1 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C 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 6eff20c..15f5623 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C 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;" ; \
diff --git a/examples++-tutorial/Makefile.am b/examples++-tutorial/Makefile.am
index 07fd294..4fa0dd1 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C 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 7215bb0..37fe0ce 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
echo \{ include \"$$i\"\;\}\; ;\
--
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