From 66c58255d715f31ec460a012426449d8bed61fe0 Mon Sep 17 00:00:00 2001 From: Gervase Markham Date: Thu, 28 Oct 2010 12:51:06 +0100 Subject: [PATCH] relic master copy is now defined as the one in Hg rather than CVS. Copy ing over all the changes from CVS since Hg branched off. a=NPOTB. --- tools/relic/make-id-list | 30 ++-- tools/relic/relic | 166 +++++++++--------- tools/relic/test/BrowserToolTip.cpp | 0 .../addlicense_inputs/emacs_local_vars_line.c | 33 +++- .../test/addlicense_inputs/utf8_xml_file.xml | 0 .../relic/test/addlicense_inputs/xml_file.rdf | 0 .../emacs_local_vars_line.c | 32 +++- .../test/addlicense_outputs/utf8_xml_file.xml | 0 .../test/addlicense_outputs/xml_file.rdf | 0 .../bad_contributor_section.cpp | 0 .../relicense_inputs/ibm_copyright_suffix.c | 0 .../relic/test/relicense_inputs/just_mpl.xul | 0 .../test/relicense_inputs/need_to_relicense.h | 5 +- .../no_initialcopyrightyear_section.xml | 0 ...o_initialcopyrightyear_section.xml.options | 0 .../relicense_inputs/no_origcodeis_section.h | 0 .../no_origcodeis_section.h.options | 0 tools/relic/test/relicense_inputs/npl.h | 5 +- ...eparated_license_comment_blocks.pl.options | 0 .../test/relicense_inputs/unknown_license.c | 0 .../bad_contributor_section.cpp.error | 0 .../relicense_outputs/ibm_copyright_suffix.c | 0 .../relic/test/relicense_outputs/just_mpl.xul | 0 .../relicense_outputs/need_to_relicense.h | 5 +- .../no_initialcopyrightyear_section.xml | 0 .../relicense_outputs/no_origcodeis_section.h | 0 tools/relic/test/relicense_outputs/npl.h | 5 +- .../relicense_outputs/unknown_license.c.error | 0 28 files changed, 173 insertions(+), 108 deletions(-) mode change 100644 => 100755 tools/relic/test/BrowserToolTip.cpp mode change 100644 => 100755 tools/relic/test/addlicense_inputs/emacs_local_vars_line.c mode change 100644 => 100755 tools/relic/test/addlicense_inputs/utf8_xml_file.xml mode change 100644 => 100755 tools/relic/test/addlicense_inputs/xml_file.rdf mode change 100644 => 100755 tools/relic/test/addlicense_outputs/emacs_local_vars_line.c mode change 100644 => 100755 tools/relic/test/addlicense_outputs/utf8_xml_file.xml mode change 100644 => 100755 tools/relic/test/addlicense_outputs/xml_file.rdf mode change 100644 => 100755 tools/relic/test/relicense_inputs/bad_contributor_section.cpp mode change 100644 => 100755 tools/relic/test/relicense_inputs/ibm_copyright_suffix.c mode change 100644 => 100755 tools/relic/test/relicense_inputs/just_mpl.xul mode change 100644 => 100755 tools/relic/test/relicense_inputs/need_to_relicense.h mode change 100644 => 100755 tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml mode change 100644 => 100755 tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml.options mode change 100644 => 100755 tools/relic/test/relicense_inputs/no_origcodeis_section.h mode change 100644 => 100755 tools/relic/test/relicense_inputs/no_origcodeis_section.h.options mode change 100644 => 100755 tools/relic/test/relicense_inputs/npl.h mode change 100644 => 100755 tools/relic/test/relicense_inputs/separated_license_comment_blocks.pl.options mode change 100644 => 100755 tools/relic/test/relicense_inputs/unknown_license.c mode change 100644 => 100755 tools/relic/test/relicense_outputs/bad_contributor_section.cpp.error mode change 100644 => 100755 tools/relic/test/relicense_outputs/ibm_copyright_suffix.c mode change 100644 => 100755 tools/relic/test/relicense_outputs/just_mpl.xul mode change 100644 => 100755 tools/relic/test/relicense_outputs/need_to_relicense.h mode change 100644 => 100755 tools/relic/test/relicense_outputs/no_initialcopyrightyear_section.xml mode change 100644 => 100755 tools/relic/test/relicense_outputs/no_origcodeis_section.h mode change 100644 => 100755 tools/relic/test/relicense_outputs/npl.h mode change 100644 => 100755 tools/relic/test/relicense_outputs/unknown_license.c.error diff --git a/tools/relic/make-id-list b/tools/relic/make-id-list index b77347f88a7..9a29e5f5c14 100755 --- a/tools/relic/make-id-list +++ b/tools/relic/make-id-list @@ -8,7 +8,11 @@ # to make them all use the same variant of each name. # # Procedure: +# Need to be in the top-level dir otherwise relic exclusions don't work. +# Edit relic to set quiet to 1 on line 1471 or thereabouts # relic -I -f * > names.txt +# Tidy up names.txt +# and make one unified file if you ran relic over multiple trees. # make-id-list < names.txt > final.txt my %equivalents = ( @@ -24,22 +28,26 @@ my %equivalents = ( "IBM Corp" => "IBM Corporation", "International Business Machines Corporation" => "IBM Corporation", + "Mozilla.com" => "Mozilla Corporation", + "Mozilla Corp" => "Mozilla Corporation", + "None" => "Mozilla Foundation", "a mozilla.org contributor" => "Mozilla Foundation", "person recorded in the version control logs" => "Mozilla Foundation", "Mozilla" => "Mozilla Foundation", - "Mozilla.com" => "Mozilla Corporation", "Mozilla.org" => "Mozilla Foundation", "Mozilla Organization" => "Mozilla Foundation", "mozilla.org" => "Mozilla Foundation", - + "example Inc" => "Mozilla Foundation", + "SeaMonkey team" => "Mozilla Foundation", "mozilla.org SeaMonkey project" => "Mozilla Foundation", "SeaMonkey project" => "Mozilla Foundation", "SeaMonkey project at mozilla.org" => "Mozilla Foundation", "Mozilla Calendar Squad" => "Mozilla Foundation", + "mozilla.org code" => "Mozilla Foundation", + + "Mozilla Messaging Corporation" => "Mozilla Messaging", - "Mozilla Corp" => "Mozilla Corporation", - "Netscape" => "Netscape Communications Corporation", "Netscape Corp" => "Netscape Communications Corporation", "Netscape Communications" => "Netscape Communications Corporation", @@ -70,6 +78,7 @@ my %equivalents = ( "bmlk\@gmx.de" => "Bernd Mielke", "davel\@mozilla.com" => "Dave Liebreich", + "dschaffe\@adobe.com" => "Dan Schaffer", "Digital Creations 2" => "Digital Creations 2 Inc", "Douglas F. Turner II" => "Doug Turner", "Kenneth Herron" => "Ken Herron", @@ -88,6 +97,8 @@ my %equivalents = ( "Richard L Walsh" => "Richard L. Walsh", "timeless" => "Josh Soref", "Olivier Parniere BT Global Services / Etat francais Ministere de la Defense" => "Olivier Parniere", + "Craig Toppper" => "Craig Topper", + "Mook" => "Mark 'Mook' Yen", "Frank Schoenheit" => "Frank Schönheit", "Frank Schönheit" => "Frank Schönheit", @@ -98,13 +109,9 @@ my %equivalents = ( "Vincent BĂ©ron" => "Vincent Béron", "Tomas Mšller" => "Tomas Müller", "DĂŁo Gottwald" => "Dão Gottwald", - "László Németh" => "László N&eacutre;meth", + "László Németh" => "László Németh", "Björn Jacke" => "Björn Jacke", - - "example Inc" => "Mozilla Foundation", - "SeaMonkey team" => "Mozilla Foundation", - "person recorded in the version control logs" => "Mozilla Foundation", - "None" => "Mozilla Foundation" + "Ĺ˝iga Sancin" => "Žiga Sancin", ); # 'indevs' == "Initial Developers" @@ -119,13 +126,14 @@ while (<>) # Chop off email addresses and suchlike $indev =~ s/[<,\(].*$//; $indev =~ s/^The\s+//i; + $indev =~ s/\.?\s*Portions created.*$//; # Trim whitespace $indev =~ s/^\s*//; $indev =~ s/\s*$//; $indev = $equivalents{$indev} || $indev; - $indevs{$indev} = 1; + $indevs{$indev} = 1 if $indev; } } diff --git a/tools/relic/relic b/tools/relic/relic index 1595008eaa4..955b8e2a5e6 100755 --- a/tools/relic/relic +++ b/tools/relic/relic @@ -188,6 +188,7 @@ _g_skip_files = [ "gfx/cairo/cairo/COPYING-MPL-1.1", # Files containing global licensing information + "xpfe/global/resources/content/license.html", "toolkit/content/license.html", # Ben Bucksch - files are tri-licensed with an extra clause. @@ -338,29 +339,30 @@ _g_basename_to_comment_info = { "awk_pkginfo-sparc": (["#"], ), "pkgdepend_64bit": (["#"], ), "WIN32": (["#"], ), + "WIN16": (["#"], ), "Makefile.linux": (["#"], ), "README": ([""], ["#"]), "copyright": ([""], ), - "xptcstubs_asm_ppc_darwin.s.m4": (["/*", " *", "*/"], ), - "xptcstubs_asm_mips.s.m4": (["/*", " *", "*/"], ), + "xptcstubs_asm_ppc_darwin.s.m4": (["/*", "*", "*/"], ), + "xptcstubs_asm_mips.s.m4": (["/*", "*", "*/"], ), - "nsIDocCharsetTest.txt": ([""], ), - "nsIFontListTest.txt": ([""], ), - "ComponentListTest.txt": ([""], ), - "nsIWebBrowserPersistTest1.txt": ([""], ), - "nsIWebBrowserPersistTest2.txt": ([""], ), - "nsIWebBrowserPersistTest3.txt": ([""], ), - "plugins.txt": ([""], ), - "NsISHistoryTestCase1.txt": ([""], ), - "EmbedSmokeTest.txt": ([""], ), + "nsIDocCharsetTest.txt": ([""], ), + "nsIFontListTest.txt": ([""], ), + "ComponentListTest.txt": ([""], ), + "nsIWebBrowserPersistTest1.txt": ([""], ), + "nsIWebBrowserPersistTest2.txt": ([""], ), + "nsIWebBrowserPersistTest3.txt": ([""], ), + "plugins.txt": ([""], ), + "NsISHistoryTestCase1.txt": ([""], ), + "EmbedSmokeTest.txt": ([""], ), - "lineterm_LICENSE": (["/*", " *", "*/"], ), - "XMLterm_LICENSE": (["/*", " *", "*/"], ), - "BrowserView.cpp.mod": (["/*", " *", "*/"], ), - "header_template": (["/*", " *", "*/"], ), - "cpp_template": (["/*", " *", "*/"], ), + "lineterm_LICENSE": (["/*", "*", "*/"], ), + "XMLterm_LICENSE": (["/*", "*", "*/"], ), + "BrowserView.cpp.mod": (["/*", "*", "*/"], ), + "header_template": (["/*", "*", "*/"], ), + "cpp_template": (["/*", "*", "*/"], ), "abcFormat470.txt": (["//"], ), "opcodes.tbl": (["//"], ), @@ -377,70 +379,71 @@ _g_ext_to_comment_info = { ".FP": (["", ]), ".spec": (["", ]), - ".CPP": (["/*", " *", "*/"], ), - ".cpp": (["/*", " *", "*/"], ), - ".H": (["/*", " *", "*/"], ), - ".h": (["/*", " *", "*/"], ), - ".hxx": (["/*", " *", "*/"], ), - ".c": (["/*", " *", "*/"], ), - ".css": (["/*", " *", "*/"], ['#']), - ".js": (["/*", " *", "*/"], ['#']), - ".idl": (["/*", " *", "*/"], ), - ".ut": (["/*", " *", "*/"], ), - ".rc": (["/*", " *", "*/"], ), - ".rc2": (["/*", " *", "*/"], ), - ".RC": (["/*", " *", "*/"], ), - ".Prefix": (["/*", " *", "*/"], ), - ".prefix": (["/*", " *", "*/"], ), - ".cfg": (["/*", " *", "*/"], ["#"]), - ".cp": (["/*", " *", "*/"], ), - ".cs": (["/*", " *", "*/"], ), - ".java": (["/*", " *", "*/"], ), - ".jst": (["/*", " *", "*/"], ), - ".tbl": (["/*", " *", "*/"], ), - ".tab": (["/*", " *", "*/"], ), - ".cc": (["/*", " *", "*/"], ), - ".msg": (["/*", " *", "*/"], ), - ".y": (["/*", " *", "*/"], ), - ".r": (["/*", " *", "*/"], ), - ".mm": (["/*", " *", "*/"], ), - ".x-ccmap":(["/*", " *", "*/"], ), - ".ccmap": (["/*", " *", "*/"], ), - ".sql": (["/*", " *", "*/"], ), - ".pch++": (["/*", " *", "*/"], ), - ".xpm": (["/*", " *", "*/"], ), - ".uih": (["/*", " *", "*/"], ), - ".uil": (["/*", " *", "*/"], ), - ".ccmap": (["/*", " *", "*/"], ), - ".map": (["/*", " *", "*/"], ), - ".win98": (["/*", " *", "*/"], ), - ".php": (["/*", " *", "*/"], ), - ".m": (["/*", " *", "*/"], ), - ".jnot": (["/*", " *", "*/"], ), - ".l": (["/*", " *", "*/"], ), - ".htp": (["/*", " *", "*/"], ), - ".xs": (["/*", " *", "*/"], ), - ".as": (["/*", " *", "*/"], ), - ".api": (["/*", " *", "*/"], ['#']), + ".CPP": (["/*", "*", "*/"], ), + ".cpp": (["/*", "*", "*/"], ), + ".H": (["/*", "*", "*/"], ), + ".h": (["/*", "*", "*/"], ), + ".hxx": (["/*", "*", "*/"], ), + ".c": (["/*", "*", "*/"], ), + ".css": (["/*", "*", "*/"], ['#']), + ".js": (["/*", "*", "*/"], ['#']), + ".idl": (["/*", "*", "*/"], ), + ".ut": (["/*", "*", "*/"], ), + ".rc": (["/*", "*", "*/"], ), + ".rc2": (["/*", "*", "*/"], ), + ".RC": (["/*", "*", "*/"], ), + ".Prefix": (["/*", "*", "*/"], ), + ".prefix": (["/*", "*", "*/"], ), + ".cfg": (["/*", "*", "*/"], ["#"]), + ".cp": (["/*", "*", "*/"], ), + ".cs": (["/*", "*", "*/"], ), + ".java": (["/*", "*", "*/"], ), + ".jst": (["/*", "*", "*/"], ), + ".tbl": (["/*", "*", "*/"], ), + ".tab": (["/*", "*", "*/"], ), + ".cc": (["/*", "*", "*/"], ), + ".msg": (["/*", "*", "*/"], ), + ".y": (["/*", "*", "*/"], ), + ".r": (["/*", "*", "*/"], ), + ".mm": (["/*", "*", "*/"], ), + ".x-ccmap":(["/*", "*", "*/"], ), + ".ccmap": (["/*", "*", "*/"], ), + ".sql": (["/*", "*", "*/"], ), + ".pch++": (["/*", "*", "*/"], ), + ".xpm": (["/*", "*", "*/"], ), + ".uih": (["/*", "*", "*/"], ), + ".uil": (["/*", "*", "*/"], ), + ".ccmap": (["/*", "*", "*/"], ), + ".map": (["/*", "*", "*/"], ), + ".win98": (["/*", "*", "*/"], ), + ".php": (["/*", "*", "*/"], ), + ".m": (["/*", "*", "*/"], ), + ".jnot": (["/*", "*", "*/"], ), + ".l": (["/*", "*", "*/"], ), + ".htp": (["/*", "*", "*/"], ), + ".xs": (["/*", "*", "*/"], ), + ".as": (["/*", "*", "*/"], ), + ".api": (["/*", "*", "*/"], ['#']), + ".applescript": (["(*", "*", "*)"], ["--"], ["#"]), - ".html": ([""], ["#"]), - ".xml": ([""], ["#"]), - ".xbl": ([""], ["#"]), - ".xsl": ([""], ), - ".xul": ([""], ["#"]), - ".dtd": ([""], ["#"]), - ".rdf": ([""], ["#"]), - ".htm": ([""], ), - ".out": ([""], ), - ".resx": ([""], ), - ".bl": ([""], ), - ".xif": ([""], ), - ".xhtml":([""], ["#"]), + ".html": ([""], ["#"]), + ".xml": ([""], ["#"]), + ".xbl": ([""], ["#"]), + ".xsl": ([""], ), + ".xul": ([""], ["#"]), + ".dtd": ([""], ["#"]), + ".rdf": ([""], ["#"]), + ".htm": ([""], ), + ".out": ([""], ), + ".resx": ([""], ), + ".bl": ([""], ), + ".xif": ([""], ), + ".xhtml":([""], ["#"]), - ".inc": ([""], + ".inc": ([""], ["#"], ["@!"], - ["/*", " *", "*/"]), + ["/*", "*", "*/"]), ".properties": (["#"], ), ".win": (["#"], ), @@ -522,7 +525,7 @@ _g_ext_to_comment_info = { ".3x": (['.\\"'], ), # What a mess... - ".s": (["#"], ["//"], ["/*", " *", "*/"], ["!"], [";"], ["/"]), + ".s": (["#"], ["//"], ["/*", "*", "*/"], ["!"], [";"], ["/"]), } _g_shebang_pattern_to_comment_info = [ (re.compile(ur'\A#!.*/bin/(ba)?sh.*$', re.IGNORECASE), (["#"], )), @@ -896,8 +899,9 @@ def _get_license_info(filename, show_initial=0, quick=0): lines = content.splitlines() for comment_delims in comment_delim_sets: if len(comment_delims) == 3: - prefix_pattern = "%s|%s|" % (re.escape(comment_delims[0]), - re.escape(comment_delims[1])) + # Note: allow for whitespace before continuation character + prefix_pattern = "%s|\s*%s|" % (re.escape(comment_delims[0]), + re.escape(comment_delims[1])) suffix_pattern = "%s" % re.escape(comment_delims[2]) elif len(comment_delims) == 2: prefix_pattern = "%s|" % re.escape(comment_delims[0]) @@ -1466,11 +1470,11 @@ def _make_backup_path(path): raise RelicError("Could not find an unused backup path for '%s'." % path) -def _relicensing_error(err, path, cache=None, quiet=0): +def _relicensing_error(err, path, cache=None, quiet=1): """Handle an error during relicensing. "err" may be an error string or an exception instance. - "path" is the path of the file on which this error occurred. + "path" is the path of the file on which this error occured. "cache" is a mapping of path to errors on which errors may be stored for later reporting. "quiet" optionally allows one to silence the stdout output when diff --git a/tools/relic/test/BrowserToolTip.cpp b/tools/relic/test/BrowserToolTip.cpp old mode 100644 new mode 100755 diff --git a/tools/relic/test/addlicense_inputs/emacs_local_vars_line.c b/tools/relic/test/addlicense_inputs/emacs_local_vars_line.c old mode 100644 new mode 100755 index 5ef62784daf..76e7e45e4d0 --- a/tools/relic/test/addlicense_inputs/emacs_local_vars_line.c +++ b/tools/relic/test/addlicense_inputs/emacs_local_vars_line.c @@ -5,10 +5,12 @@ #if defined(VMS) #include -#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) +#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS) #include #elif defined(WIN32) #include +#elif defined(XP_OS2_VACPP) +#include #else #error "Architecture not supported" #endif @@ -35,7 +37,7 @@ int main(int argc, char **argv) now *= 1000000; now += (1000 * b.millitm); fprintf(stdout, "%Ld", now); -#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) +#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS) long long now; struct timeval tv; #ifdef HAVE_SVID_GETTOD @@ -68,6 +70,33 @@ int main(int argc, char **argv) now = (now - 116444736000000000i64) / 10i64; fprintf(stdout, "%I64d", now); #endif + +#elif defined(XP_OS2_VACPP) +/* no long long or i64 so we use a string */ +#include + char buf[24]; + char tbuf[7]; + time_t now; + long mtime; + int i; + + struct timeb b; + ftime(&b); + now = b.time; + _ltoa(now, buf, 10); + + mtime = b.millitm * 1000; + if (mtime == 0){ + ++now; + strcat(buf, "000000"); + } else { + _ltoa(mtime, tbuf, 10); + for (i = strlen(tbuf); i < 6; ++i) + strcat(buf, "0"); + strcat(buf, tbuf); + } + fprintf(stdout, "%s", buf); + #else #error "Architecture not supported" #endif diff --git a/tools/relic/test/addlicense_inputs/utf8_xml_file.xml b/tools/relic/test/addlicense_inputs/utf8_xml_file.xml old mode 100644 new mode 100755 diff --git a/tools/relic/test/addlicense_inputs/xml_file.rdf b/tools/relic/test/addlicense_inputs/xml_file.rdf old mode 100644 new mode 100755 diff --git a/tools/relic/test/addlicense_outputs/emacs_local_vars_line.c b/tools/relic/test/addlicense_outputs/emacs_local_vars_line.c old mode 100644 new mode 100755 index 44c23827938..038d98d7d8d --- a/tools/relic/test/addlicense_outputs/emacs_local_vars_line.c +++ b/tools/relic/test/addlicense_outputs/emacs_local_vars_line.c @@ -41,10 +41,12 @@ #if defined(VMS) #include -#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) +#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS) #include #elif defined(WIN32) #include +#elif defined(XP_OS2_VACPP) +#include #else #error "Architecture not supported" #endif @@ -71,7 +73,7 @@ int main(int argc, char **argv) now *= 1000000; now += (1000 * b.millitm); fprintf(stdout, "%Ld", now); -#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) +#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS) long long now; struct timeval tv; #ifdef HAVE_SVID_GETTOD @@ -105,6 +107,32 @@ int main(int argc, char **argv) fprintf(stdout, "%I64d", now); #endif +#elif defined(XP_OS2_VACPP) +/* no long long or i64 so we use a string */ +#include + char buf[24]; + char tbuf[7]; + time_t now; + long mtime; + int i; + + struct timeb b; + ftime(&b); + now = b.time; + _ltoa(now, buf, 10); + + mtime = b.millitm * 1000; + if (mtime == 0){ + ++now; + strcat(buf, "000000"); + } else { + _ltoa(mtime, tbuf, 10); + for (i = strlen(tbuf); i < 6; ++i) + strcat(buf, "0"); + strcat(buf, tbuf); + } + fprintf(stdout, "%s", buf); + #else #error "Architecture not supported" #endif diff --git a/tools/relic/test/addlicense_outputs/utf8_xml_file.xml b/tools/relic/test/addlicense_outputs/utf8_xml_file.xml old mode 100644 new mode 100755 diff --git a/tools/relic/test/addlicense_outputs/xml_file.rdf b/tools/relic/test/addlicense_outputs/xml_file.rdf old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_inputs/bad_contributor_section.cpp b/tools/relic/test/relicense_inputs/bad_contributor_section.cpp old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_inputs/ibm_copyright_suffix.c b/tools/relic/test/relicense_inputs/ibm_copyright_suffix.c old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_inputs/just_mpl.xul b/tools/relic/test/relicense_inputs/just_mpl.xul old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_inputs/need_to_relicense.h b/tools/relic/test/relicense_inputs/need_to_relicense.h old mode 100644 new mode 100755 index 6bc02a580e9..5691db2b3e0 --- a/tools/relic/test/relicense_inputs/need_to_relicense.h +++ b/tools/relic/test/relicense_inputs/need_to_relicense.h @@ -49,7 +49,6 @@ #include "ChangeCSSInlineStyleTxn.h" #include "nsEditProperty.h" #include "nsIDOMCSSStyleDeclaration.h" -#include "nsTArray.h" #define SPECIFIED_STYLE_TYPE 1 #define COMPUTED_STYLE_TYPE 2 @@ -338,7 +337,7 @@ private: */ void BuildCSSDeclarations(nsVoidArray & aPropertyArray, - nsTArray & cssValueArray, + nsStringArray & cssValueArray, const CSSEquivTable * aEquivTable, const nsAString * aValue, PRBool aGetOrRemoveRequest); @@ -361,7 +360,7 @@ private: const nsAString *aAttribute, const nsAString *aValue, nsVoidArray & aPropertyArray, - nsTArray & aValueArray, + nsStringArray & aValueArray, PRBool aGetOrRemoveRequest); /** creates a Transaction for setting or removing a css property diff --git a/tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml b/tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml.options b/tools/relic/test/relicense_inputs/no_initialcopyrightyear_section.xml.options old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_inputs/no_origcodeis_section.h b/tools/relic/test/relicense_inputs/no_origcodeis_section.h old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_inputs/no_origcodeis_section.h.options b/tools/relic/test/relicense_inputs/no_origcodeis_section.h.options old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_inputs/npl.h b/tools/relic/test/relicense_inputs/npl.h old mode 100644 new mode 100755 index c5db9926263..b71071e78bb --- a/tools/relic/test/relicense_inputs/npl.h +++ b/tools/relic/test/relicense_inputs/npl.h @@ -34,7 +34,6 @@ #include "ChangeCSSInlineStyleTxn.h" #include "nsEditProperty.h" #include "nsIDOMCSSStyleDeclaration.h" -#include "nsTArray.h" #define SPECIFIED_STYLE_TYPE 1 #define COMPUTED_STYLE_TYPE 2 @@ -323,7 +322,7 @@ private: */ void BuildCSSDeclarations(nsVoidArray & aPropertyArray, - nsTArray & cssValueArray, + nsStringArray & cssValueArray, const CSSEquivTable * aEquivTable, const nsAString * aValue, PRBool aGetOrRemoveRequest); @@ -346,7 +345,7 @@ private: const nsAString *aAttribute, const nsAString *aValue, nsVoidArray & aPropertyArray, - nsTArray & aValueArray, + nsStringArray & aValueArray, PRBool aGetOrRemoveRequest); /** creates a Transaction for setting or removing a css property diff --git a/tools/relic/test/relicense_inputs/separated_license_comment_blocks.pl.options b/tools/relic/test/relicense_inputs/separated_license_comment_blocks.pl.options old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_inputs/unknown_license.c b/tools/relic/test/relicense_inputs/unknown_license.c old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_outputs/bad_contributor_section.cpp.error b/tools/relic/test/relicense_outputs/bad_contributor_section.cpp.error old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_outputs/ibm_copyright_suffix.c b/tools/relic/test/relicense_outputs/ibm_copyright_suffix.c old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_outputs/just_mpl.xul b/tools/relic/test/relicense_outputs/just_mpl.xul old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_outputs/need_to_relicense.h b/tools/relic/test/relicense_outputs/need_to_relicense.h old mode 100644 new mode 100755 index 11a7c44bebf..bafc5805c61 --- a/tools/relic/test/relicense_outputs/need_to_relicense.h +++ b/tools/relic/test/relicense_outputs/need_to_relicense.h @@ -41,7 +41,6 @@ #include "nsCOMPtr.h" #include "nsString.h" -#include "nsTArray.h" #include "nsIDOMViewCSS.h" #include "nsIDOMNode.h" #include "nsIDOMElement.h" @@ -337,7 +336,7 @@ private: */ void BuildCSSDeclarations(nsVoidArray & aPropertyArray, - nsTArray & cssValueArray, + nsStringArray & cssValueArray, const CSSEquivTable * aEquivTable, const nsAString * aValue, PRBool aGetOrRemoveRequest); @@ -360,7 +359,7 @@ private: const nsAString *aAttribute, const nsAString *aValue, nsVoidArray & aPropertyArray, - nsTArray & aValueArray, + nsStringArray & aValueArray, PRBool aGetOrRemoveRequest); /** creates a Transaction for setting or removing a css property diff --git a/tools/relic/test/relicense_outputs/no_initialcopyrightyear_section.xml b/tools/relic/test/relicense_outputs/no_initialcopyrightyear_section.xml old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_outputs/no_origcodeis_section.h b/tools/relic/test/relicense_outputs/no_origcodeis_section.h old mode 100644 new mode 100755 diff --git a/tools/relic/test/relicense_outputs/npl.h b/tools/relic/test/relicense_outputs/npl.h old mode 100644 new mode 100755 index 63e5267360e..cdec11e2d53 --- a/tools/relic/test/relicense_outputs/npl.h +++ b/tools/relic/test/relicense_outputs/npl.h @@ -41,7 +41,6 @@ #include "nsCOMPtr.h" #include "nsString.h" -#include "nsTArray.h" #include "nsIDOMViewCSS.h" #include "nsIDOMNode.h" #include "nsIDOMElement.h" @@ -337,7 +336,7 @@ private: */ void BuildCSSDeclarations(nsVoidArray & aPropertyArray, - nsTArray & cssValueArray, + nsStringArray & cssValueArray, const CSSEquivTable * aEquivTable, const nsAString * aValue, PRBool aGetOrRemoveRequest); @@ -360,7 +359,7 @@ private: const nsAString *aAttribute, const nsAString *aValue, nsVoidArray & aPropertyArray, - nsTArray & aValueArray, + nsStringArray & aValueArray, PRBool aGetOrRemoveRequest); /** creates a Transaction for setting or removing a css property diff --git a/tools/relic/test/relicense_outputs/unknown_license.c.error b/tools/relic/test/relicense_outputs/unknown_license.c.error old mode 100644 new mode 100755