Changeset 1085 for trunk/VSlickMacros/kdev.e

Timestamp:

Aug 26, 2007, 2:00:56 AM (18 years ago)

Author:

bird

Message:

Corrected the address of FSF and made the split file header default.

File:

• trunk/VSlickMacros/kdev.e (modified) (6 diffs)

trunk/VSlickMacros/kdev.e

@@ -1245 +1245 @@
 {
     int iCursorLine;
+    int fSplit = 0;
 
     _begin_line();
@@ -1252 +1253 @@
 
     k_javadoc_box_start('@file');
-    if (skLicense == 'VirtualBox')
-    {
+    if (skLicense == 'VirtualBox' || 1 /* it's now default */)
+    {
+        fSplit = 1;
         iCursorLine = p_RLine;
         k_javadoc_box_line();
@@ -1277 +1279 @@
     {
         if (skLicense == 'VirtualBox')
-            k_javadoc_box_line('Copyright (c) ' k_year() ' ' skCompany);
+            k_javadoc_box_line('Copyright (C) ' k_year() ' ' skCompany);
         else
         {
@@ -1296 +1298 @@
         case 'GPL':
             _str sProg = skProgram;
-            k_javadoc_box_line();
+            if (!fSplit)
+                k_javadoc_box_line();
             if (sProg == '')
                 sProg = 'This program';
@@ -1316 +1319 @@
             k_javadoc_box_line('You should have received a copy of the GNU General Public License');
             k_javadoc_box_line('along with ' sProg '; if not, write to the Free Software');
-            k_javadoc_box_line('Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA');
+            k_javadoc_box_line('Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA');
             break;
 
         case 'LGPL':
             sProg = skProgram;
-            k_javadoc_box_line();
+            if (!fSplit)
+                k_javadoc_box_line();
             if (sProg == '')
                 sProg = 'This program';
@@ -1329 +1333 @@
                 k_javadoc_box_line();
             }
-            k_javadoc_box_line(sProg ' is free software; you can redistribute it and/or modify');
-            k_javadoc_box_line('it under the terms of the GNU Lesser General Public License as published');
-            k_javadoc_box_line('by the Free Software Foundation; either version 2 of the License, or');
-            k_javadoc_box_line('(at your option) any later version.');
+            k_javadoc_box_line(sProg ' is free software; you can redistribute it and/or');
+            k_javadoc_box_line('modify it under the terms of the GNU Lesser General Public');
+            k_javadoc_box_line('License as published by the Free Software Foundation; either');
+            k_javadoc_box_line('version 2.1 of the License, or (at your option) any later version.');
             k_javadoc_box_line();
             k_javadoc_box_line(sProg ' is distributed in the hope that it will be useful,');
             k_javadoc_box_line('but WITHOUT ANY WARRANTY; without even the implied warranty of');
-            k_javadoc_box_line('MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the');
-            k_javadoc_box_line('GNU Lesser General Public License for more details.');
+            k_javadoc_box_line('MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU');
+            k_javadoc_box_line('Lesser General Public License for more details.');
             k_javadoc_box_line();
-            k_javadoc_box_line('You should have received a copy of the GNU Lesser General Public License');
-            k_javadoc_box_line('along with ' sProg '; if not, write to the Free Software');
-            k_javadoc_box_line('Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA');
+            k_javadoc_box_line('You should have received a copy of the GNU Lesser General Public');
+            k_javadoc_box_line('License along with ' sProg '; if not, write to the Free Software');
+            k_javadoc_box_line('Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA');
             break;