Browse Source

tidy up errcode generation

Richard Jones 10 years ago
parent
commit
2ef0b9f592
4 changed files with 23 additions and 21 deletions
  1. 1 1
      Makefile
  2. 22 0
      generate_errcodes_src.sh
  3. 0 15
      scripts/convert_errcodes.txt.awk
  4. 0 5
      scripts/generate.sh

+ 1 - 1
Makefile

@@ -10,7 +10,7 @@ clean:
 	@$(REBAR) clean
 	@$(REBAR) clean
 
 
 src/epgsql_errcodes.erl:
 src/epgsql_errcodes.erl:
-	(cd scripts/ && ./generate.sh) > src/epgsql_errcodes.erl
+	./generate_errcodes_src.sh > src/epgsql_errcodes.erl
 
 
 # The INSERT is used to make sure the schema_version matches the tests
 # The INSERT is used to make sure the schema_version matches the tests
 # being run.
 # being run.

+ 22 - 0
generate_errcodes_src.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash -e
+#
+# Used to generate epgsql_errcodes.erl
+#
+ERRFILE="https://raw.github.com/postgres/postgres/master/src/backend/utils/errcodes.txt"
+date=$(date)
+echo "%% DO NOT EDIT - AUTOGENERATED ON $date"
+wget -qO- "$ERRFILE" | awk '
+BEGIN {
+    print "-module(epgsql_errcodes)."
+    print "-export([to_name/1])."
+    print
+}
+NF == 4 && \
+$1 ~ /[^\s]{5}/ && \
+$2 ~ /[EWS]/ \
+{
+    printf("to_name(<<\"%s\">>) -> %s;\n", $1, $4)
+}
+END {
+    print "to_name(_) -> undefined."
+}'

+ 0 - 15
scripts/convert_errcodes.txt.awk

@@ -1,15 +0,0 @@
-#!/usr/bin/env awk -f
-BEGIN {
-    print "-module(epgsql_errcodes)."
-    print "-export([to_name/1])."
-    print
-}
-NF == 4 && \
-$1 ~ /[^\s]{5}/ && \
-$2 ~ /[EWS]/ \
-{
-    printf("to_name(<<\"%s\">>) -> %s;\n", $1, $4)
-}
-END {
-    print "to_name(_) -> undefined."
-}

+ 0 - 5
scripts/generate.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-ERRFILE="https://raw.github.com/postgres/postgres/master/src/backend/utils/errcodes.txt"
-date=$(date)
-echo "%% DO NOT EDIT - AUTOGENERATED ON $date"
-wget -qO- "$ERRFILE" | ./convert_errcodes.txt.awk