From 933e322dd5c3e69063208d68f43c86e18d264a60 Mon Sep 17 00:00:00 2001 From: omniavinco Date: Thu, 16 Oct 2014 23:46:52 +0900 Subject: [PATCH 1/7] Sort the enums in a stable manner --- auto/bin/make.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/auto/bin/make.pl b/auto/bin/make.pl index 83bb774..1bd5d40 100755 --- a/auto/bin/make.pl +++ b/auto/bin/make.pl @@ -156,7 +156,11 @@ sub output_tokens($$) if (${$tbl}{$b} =~ /_/) { 1 } else { - hex ${$tbl}{$a} <=> hex ${$tbl}{$b} + if (hex ${$tbl}{$a} eq hex ${$tbl}{$b}) { + $a cmp $b + } else { + hex ${$tbl}{$a} <=> hex ${$tbl}{$b} + } } } } From 1682c7ae3e13d436fe06202322a3428c35926756 Mon Sep 17 00:00:00 2001 From: Frank Park Date: Sun, 19 Oct 2014 01:54:39 -0400 Subject: [PATCH 2/7] Fixed a bug with shell script and added gitattributes to prevent non-binary pulls Cygwin was unable to filter the specs files using the blacklist due to the argument in find was -name *.txt instead of -name "*.txt" . Also, it is currently possible to pull under windows to result in CRLF line endings in scripts and other source files that destroy the build. .gitattributes were added to prevent non-binary pulls. Both issues are fixed with this pull request. --- .gitattributes | 1 + auto/bin/update_ext.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..2abb6ee --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* binary \ No newline at end of file diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index 9ba9c74..b27c8cf 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -19,7 +19,8 @@ if [ ! -d $1 ] ; then mkdir -p $1 # Parse each of the extensions in the registry - find $2 -name doc -type d -prune -o -name \*.txt -print | \ + find $2 -name doc -type d -prune -o -name \ + "*.txt" -print | \ grep -v -f $3 | sort | bin/parse_spec.pl $1 fi From a790eb8129c06257e239649e1d989aa8bc3acc55 Mon Sep 17 00:00:00 2001 From: Frank Park Date: Sun, 19 Oct 2014 01:59:48 -0400 Subject: [PATCH 3/7] Fixed a bug with shell script and added .gitattributes Update_ext.sh does not utilize the blacklist correctly with cygwin due to the argument -name in find is not quoted. Argument *.txt has been changed to "*.txt" to fix the issue. Also, it is currently possible for windows users to pull the repo in CRLF format which destroys the scripts and source files. .gitattributes were added to prevent this issue. --- .gitattributes | 1 + auto/bin/update_ext.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..239111c --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* eol=lf \ No newline at end of file diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index 9ba9c74..b27c8cf 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -19,7 +19,8 @@ if [ ! -d $1 ] ; then mkdir -p $1 # Parse each of the extensions in the registry - find $2 -name doc -type d -prune -o -name \*.txt -print | \ + find $2 -name doc -type d -prune -o -name \ + "*.txt" -print | \ grep -v -f $3 | sort | bin/parse_spec.pl $1 fi From 62f3c733f1f71b7b1bb8c37a645c2d246d03d883 Mon Sep 17 00:00:00 2001 From: Frank Park Date: Sun, 19 Oct 2014 02:03:49 -0400 Subject: [PATCH 4/7] Ignored png and vs projects in gitattributes --- .gitattributes | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 239111c..f6d5475 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ -* eol=lf \ No newline at end of file +* eol=lf +*.png binary +build/ binary From e400e097eaf7ca031adbc9ef9264a1690ebef1ba Mon Sep 17 00:00:00 2001 From: Frank Park Date: Sun, 19 Oct 2014 02:04:50 -0400 Subject: [PATCH 5/7] Fixed .gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index f6d5475..1880ba5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ * eol=lf *.png binary -build/ binary +build/* binary From ff92992cc5c680d2cb495c99c6851ef9b18cbb97 Mon Sep 17 00:00:00 2001 From: Frank Park Date: Sun, 19 Oct 2014 02:07:45 -0400 Subject: [PATCH 6/7] Fixed .gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 1880ba5..30af41a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ * eol=lf *.png binary -build/* binary +build/* eol=crlf From d32f4278e280c80e2104a38bea48cb0e25d3e269 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Fri, 24 Oct 2014 21:03:11 +1000 Subject: [PATCH 7/7] Tidy-up for .gitattributes and update_ext.sh --- .gitattributes | 6 +++--- auto/bin/update_ext.sh | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 30af41a..44b8952 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ -* eol=lf -*.png binary -build/* eol=crlf +* eol=lf +*.png binary +build/* eol=crlf diff --git a/auto/bin/update_ext.sh b/auto/bin/update_ext.sh index b27c8cf..e990a21 100755 --- a/auto/bin/update_ext.sh +++ b/auto/bin/update_ext.sh @@ -19,8 +19,7 @@ if [ ! -d $1 ] ; then mkdir -p $1 # Parse each of the extensions in the registry - find $2 -name doc -type d -prune -o -name \ - "*.txt" -print | \ + find $2 -name doc -type d -prune -o -name "*.txt" -print | \ grep -v -f $3 | sort | bin/parse_spec.pl $1 fi