[linterna-magica-commit] [381] Deprecating the automatic copyright and authors collection, because it

[Ivaylo Valkov]

Revision: 381
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=381
Author:   valkov
Date:     2013-01-01 13:35:32 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
Deprecating the automatic copyright and authors collection, because it
produces too verbose output. Future versions will need copyright and
author information in:

*  src/lm_constructors.js in the copyrights array
*  src/userscript-header.txt in the header section

Modified Paths:
--------------
    trunk/Makefile
    trunk/src/lm_constructors.js
    trunk/src/lm_userscript_header.txt

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile      2012-12-31 14:21:21 UTC (rev 380)
+++ trunk/Makefile      2013-01-01 13:35:32 UTC (rev 381)
@@ -1,6 +1,6 @@
 # This Makefile is part of  Linterna Mágica
 #
-# Copyright (C) 2011, 2012  Ivaylo Valkov <address@hidden>
+# Copyright (C) 2011, 2012, 2013 Ivaylo Valkov <address@hidden>
 #
 # Linterna Mágica is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -149,33 +149,14 @@
        fi
 
 userscript-header.js: $(USRSCRIPTHDR) $(JSFILES) $(STYLEFILE) 
COPYING.data-files Makefile
-       @echo -n "Collecting authors... ";\
-       authors="`$(GREP) -E '(//)*\s*Copyright' $(JSFILES) $(USRSCRIPTHDR) 
$(STYLEFILE) COPYING.data-files | $(CUT) -d ':' -f2| $(SED) -e 's/\s\s/ /g' -e 
's/^[^\/]/\/\//g' -e 's/\/\/\s*/\/\/    /g' | $(SORT) | $(UNIQ) | $(TR) -d 
'\n'`";\
-       up_cut="`$(CAT) $(USRSCRIPTHDR) | $(GREP) -n '//\s*Copyright' -B1 
|$(HEAD) -n 1| $(CUT) -d'-' -f1`";\
-       down_cut="`$(TAC) $(USRSCRIPTHDR) |$(GREP) -n '//\s*Copyright' -B1 
|$(HEAD) -n 1| $(CUT) -d'-' -f1`";\
-       $(HEAD) -n $$up_cut  $(USRSCRIPTHDR) > $@;\
-       echo -e "$$authors//\n" | $(SED) -e 's#\/\/\s*#\n//  #g' | $(SED)  -e 
'/^$$/d' >> $@;\
-       echo "done";\
-       $(TAIL) -n $$down_cut $(USRSCRIPTHDR) >> $@;
+       $(CP) $(USRSCRIPTHDR) $@;
 
 $(PACKAGE).user.js: strip-js-comments strip-js-headers userscript-header.js 
$(JSFILES) $(USRSCRIPTHDR) $(STYLEFILE) $(STYLEFILE).js Makefile
        @$(CAT) userscript-header.js > $@;\
-        authors="`$(GREP) -E '//*\s+Copyrigh' userscript-header.js |   \
-       $(SED) -e                                                       \
-       's/^\/\/\s*/LinternaMagica.prototype.copyrights.push\(\"/g' -e  \
-       's/$$/\"\);\n/g'`";\
        echo "(function(){" >> $@;\
        $(CAT)  $(STRIPCOMMENTS) >> $@;\
        echo "})();" >> $@;\
        $(SED) -i -e 's/@VERSION@/$(VERSION)/g' $@;\
-       tmp="`$(MKTEMP)`";\
-       rights_up_cut="`$(CAT) $@ | $(GREP) -n $(PUSHCOPYRIGHTLINE)  |$(HEAD) 
-n 1| $(CUT) -d':' -f1`";\
-       rights_down_cut="`$(TAC) $@ |$(GREP) -n $(PUSHCOPYRIGHTLINE) -B1 
|$(HEAD) -n 1| $(CUT) -d'-' -f1`";\
-       $(HEAD) -n $$rights_up_cut $@ > $$tmp;\
-       echo $$authors >> $$tmp;\
-       $(TAIL) -n $$rights_down_cut $@ >> $$tmp;\
-       $(CP) $$tmp $@;\
-       $(RM) $$tmp;\
        echo -n "Merging style sheet ... ";\
        tmp="`$(MKTEMP)`";\
        css_up_cut="`$(CAT) $@ | $(GREP) -n 'var css_data;' -B1 |$(HEAD) -n 1| 
$(CUT) -d'-' -f1`";\

Modified: trunk/src/lm_constructors.js
===================================================================
--- trunk/src/lm_constructors.js        2012-12-31 14:21:21 UTC (rev 380)
+++ trunk/src/lm_constructors.js        2013-01-01 13:35:32 UTC (rev 381)
@@ -3,7 +3,7 @@
 //
 //  This file is part of Linterna Mágica
 //
-//  Copyright (C) 2010, 2011, 2012 Ivaylo Valkov <address@hidden>
+//  Copyright (C) 2010, 2011, 2012, 2013 Ivaylo Valkov <address@hidden>
 //  Copyright (C) 2010  Anton Katsarov <address@hidden>
 //
 //  The JavaScript code in this page (or file) is free software: you
@@ -263,6 +263,10 @@
 
 // This is filled during build from the Makefile
 LinternaMagica.prototype.copyrights = new Array();
+LinternaMagica.prototype.copyrights.push("Copyright (C) 2010, 2011, 2012,"+
+                                        " 2013 Ivaylo Valkov 
<address@hidden>");
+LinternaMagica.prototype.copyrights.push("Copyright (C) 2010, 2011, 2012,"+
+                                        " 2013 Anton Katsarov 
<address@hidden>");
 
 // This object holds all the functions to control
 // the playback via web controls

Modified: trunk/src/lm_userscript_header.txt
===================================================================
--- trunk/src/lm_userscript_header.txt  2012-12-31 14:21:21 UTC (rev 380)
+++ trunk/src/lm_userscript_header.txt  2013-01-01 13:35:32 UTC (rev 381)
@@ -3,8 +3,8 @@
 //
 //  This file is part of Linterna Mágica
 //
-//  Copyright (C) 2010, 2011  Ivaylo Valkov <address@hidden>
-//  Copyright (C) 2010  Anton Katsarov <address@hidden>
+//  Copyright (C) 2010, 2011, 2012, 2013  Ivaylo Valkov <address@hidden>
+//  Copyright (C) 2010, 2011, 2012, 2013  Anton Katsarov <address@hidden>
 //
 //  The JavaScript code in this page (or file) is free software: you
 //  can redistribute it and/or modify it under the terms of the GNU