You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2011/03/29 15:38:21 UTC
svn commit: r1086579 - in /apr/apr: branches/1.3.x/build/make_nw_export.awk
branches/1.4.x/build/make_nw_export.awk
branches/1.5.x/build/make_nw_export.awk trunk/build/make_nw_export.awk
Author: fuankg
Date: Tue Mar 29 13:38:21 2011
New Revision: 1086579
URL: http://svn.apache.org/viewvc?rev=1086579&view=rev
Log:
NetWare awk export script fixes and cleanup.
Remove trailing line endings with Linux builds;
sync'd add_symbol function with HEAD and moved to top;
added License header where missing.
Modified:
apr/apr/branches/1.3.x/build/make_nw_export.awk
apr/apr/branches/1.4.x/build/make_nw_export.awk
apr/apr/branches/1.5.x/build/make_nw_export.awk
apr/apr/trunk/build/make_nw_export.awk
Modified: apr/apr/branches/1.3.x/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/build/make_nw_export.awk?rev=1086579&r1=1086578&r2=1086579&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/build/make_nw_export.awk (original)
+++ apr/apr/branches/1.3.x/build/make_nw_export.awk Tue Mar 29 13:38:21 2011
@@ -1,33 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
# Based on apr's make_export.awk, which is
# based on Ryan Bloom's make_export.pl
BEGIN {
- printf(" ("EXPPREFIX")\n")
+ printf(" (%s)\n", EXPPREFIX)
+}
+
+function add_symbol(sym_name) {
+ found++
+ sub(" ", "", sym_name)
+ printf(" %s,\n", sym_name)
}
# List of functions that we don't support, yet??
#/apr_##name##_set_inherit/{next}
#/apr_##name##_unset_inherit/{next}
-
-function add_symbol (sym_name) {
- if (count) {
- found++
- }
- gsub (/ /, "", sym_name)
- line = line sym_name ",\n"
-
- if (count == 0) {
- printf(" %s", line)
- line = ""
- }
-}
-
/^[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
sub("[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
sub("[(].*", "")
sub("([^ ]* (^([ \t]*[(])))+", "")
-
add_symbol($0)
next
}
@@ -37,7 +44,6 @@ function add_symbol (sym_name) {
symbol = args[2]
sub("^[ \t]+", "", symbol)
sub("[ \t]+$", "", symbol)
-
add_symbol("ap_hook_" symbol)
add_symbol("ap_hook_get_" symbol)
add_symbol("ap_run_" symbol)
@@ -66,14 +72,13 @@ function add_symbol (sym_name) {
}
/^[ \t]*AP[RUI]?_DECLARE_DATA .*;/ {
- varname = $NF;
- gsub( /[*;]/, "", varname);
- gsub( /\[.*\]/, "", varname);
- add_symbol(varname);
+ gsub(/[*;\n\r]/, "", $NF)
+ gsub(/\[.*\]/, "", $NF)
+ add_symbol($NF)
}
-
END {
- add_symbol("apr_wait_for_io_or_timeout");
-# printf(" %s", line)
+ add_symbol("apr_wait_for_io_or_timeout");
+# printf("\n\n#found: %d symbols.\n", found)
}
+
Modified: apr/apr/branches/1.4.x/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/make_nw_export.awk?rev=1086579&r1=1086578&r2=1086579&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/make_nw_export.awk (original)
+++ apr/apr/branches/1.4.x/build/make_nw_export.awk Tue Mar 29 13:38:21 2011
@@ -1,33 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
# Based on apr's make_export.awk, which is
# based on Ryan Bloom's make_export.pl
BEGIN {
- printf(" ("EXPPREFIX")\n")
+ printf(" (%s)\n", EXPPREFIX)
+}
+
+function add_symbol(sym_name) {
+ found++
+ sub(" ", "", sym_name)
+ printf(" %s,\n", sym_name)
}
# List of functions that we don't support, yet??
#/apr_##name##_set_inherit/{next}
#/apr_##name##_unset_inherit/{next}
-
-function add_symbol (sym_name) {
- if (count) {
- found++
- }
- gsub (/ /, "", sym_name)
- line = line sym_name ",\n"
-
- if (count == 0) {
- printf(" %s", line)
- line = ""
- }
-}
-
/^[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
sub("[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
sub("[(].*", "")
sub("([^ ]* (^([ \t]*[(])))+", "")
-
add_symbol($0)
next
}
@@ -37,7 +44,6 @@ function add_symbol (sym_name) {
symbol = args[2]
sub("^[ \t]+", "", symbol)
sub("[ \t]+$", "", symbol)
-
add_symbol("ap_hook_" symbol)
add_symbol("ap_hook_get_" symbol)
add_symbol("ap_run_" symbol)
@@ -66,14 +72,13 @@ function add_symbol (sym_name) {
}
/^[ \t]*AP[RUI]?_DECLARE_DATA .*;/ {
- varname = $NF;
- gsub( /[*;]/, "", varname);
- gsub( /\[.*\]/, "", varname);
- add_symbol(varname);
+ gsub(/[*;\n\r]/, "", $NF)
+ gsub(/\[.*\]/, "", $NF)
+ add_symbol($NF)
}
-
END {
- add_symbol("apr_wait_for_io_or_timeout");
-# printf(" %s", line)
+ add_symbol("apr_wait_for_io_or_timeout");
+# printf("\n\n#found: %d symbols.\n", found)
}
+
Modified: apr/apr/branches/1.5.x/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/build/make_nw_export.awk?rev=1086579&r1=1086578&r2=1086579&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/build/make_nw_export.awk (original)
+++ apr/apr/branches/1.5.x/build/make_nw_export.awk Tue Mar 29 13:38:21 2011
@@ -1,33 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
# Based on apr's make_export.awk, which is
# based on Ryan Bloom's make_export.pl
BEGIN {
- printf(" ("EXPPREFIX")\n")
+ printf(" (%s)\n", EXPPREFIX)
+}
+
+function add_symbol(sym_name) {
+ found++
+ sub(" ", "", sym_name)
+ printf(" %s,\n", sym_name)
}
# List of functions that we don't support, yet??
#/apr_##name##_set_inherit/{next}
#/apr_##name##_unset_inherit/{next}
-
-function add_symbol (sym_name) {
- if (count) {
- found++
- }
- gsub (/ /, "", sym_name)
- line = line sym_name ",\n"
-
- if (count == 0) {
- printf(" %s", line)
- line = ""
- }
-}
-
/^[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
sub("[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
sub("[(].*", "")
sub("([^ ]* (^([ \t]*[(])))+", "")
-
add_symbol($0)
next
}
@@ -37,7 +44,6 @@ function add_symbol (sym_name) {
symbol = args[2]
sub("^[ \t]+", "", symbol)
sub("[ \t]+$", "", symbol)
-
add_symbol("ap_hook_" symbol)
add_symbol("ap_hook_get_" symbol)
add_symbol("ap_run_" symbol)
@@ -66,14 +72,13 @@ function add_symbol (sym_name) {
}
/^[ \t]*AP[RUI]?_DECLARE_DATA .*;/ {
- varname = $NF;
- gsub( /[*;]/, "", varname);
- gsub( /\[.*\]/, "", varname);
- add_symbol(varname);
+ gsub(/[*;\n\r]/, "", $NF)
+ gsub(/\[.*\]/, "", $NF)
+ add_symbol($NF)
}
-
END {
- add_symbol("apr_wait_for_io_or_timeout");
-# printf(" %s", line)
+ add_symbol("apr_wait_for_io_or_timeout");
+# printf("\n\n#found: %d symbols.\n", found)
}
+
Modified: apr/apr/trunk/build/make_nw_export.awk
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/make_nw_export.awk?rev=1086579&r1=1086578&r2=1086579&view=diff
==============================================================================
--- apr/apr/trunk/build/make_nw_export.awk (original)
+++ apr/apr/trunk/build/make_nw_export.awk Tue Mar 29 13:38:21 2011
@@ -18,7 +18,13 @@
# based on Ryan Bloom's make_export.pl
BEGIN {
- printf(" ("EXPPREFIX")\n")
+ printf(" (%s)\n", EXPPREFIX)
+}
+
+function add_symbol(sym_name) {
+ found++
+ sub(" ", "", sym_name)
+ printf(" %s,\n", sym_name)
}
# List of functions that we don't support, yet??
@@ -75,10 +81,9 @@ BEGIN {
#}
/^[ \t]*AP[RUI]?_DECLARE_DATA .*;/ {
- varname = $NF;
- gsub( /[*;]/, "", varname);
- gsub( /\[.*\]/, "", varname);
- add_symbol(varname);
+ gsub(/[*;\n\r]/, "", $NF)
+ gsub(/\[.*\]/, "", $NF)
+ add_symbol($NF)
}
@@ -87,10 +92,3 @@ END {
# printf("\n\n#found: %d symbols.\n", found)
}
-function add_symbol(sym_name) {
- found++
- sub (" ", "", sym_name)
- printf(" %s,\n", sym_name)
-}
-
-