merge: add COPYING files (BSD 2-clause, LGPL and GPL) and doc
authorVincent Torri <vincent.torri@gmail.com>
Wed, 19 Sep 2012 06:57:03 +0000 (06:57 +0000)
committerVincent Torri <vincent.torri@gmail.com>
Wed, 19 Sep 2012 06:57:03 +0000 (06:57 +0000)
doc though head.html should be improved :)

SVN revision: 76843

75 files changed:
COPYING
COPYING.BSD [new file with mode: 0644]
COPYING.GPL [moved from legacy/edje/COPYING with 90% similarity]
COPYING.LGPL [moved from legacy/eina/COPYING with 100% similarity]
Makefile.am
configure.ac
doc/Doxyfile.in [moved from legacy/eina/doc/Doxyfile.in with 100% similarity]
doc/Makefile.am [new file with mode: 0644]
doc/benchmark/convert/bench_Convert_2008-08-29_0000.dtoa.data [moved from legacy/eina/doc/benchmark/convert/bench_Convert_2008-08-29_0000.dtoa.data with 100% similarity]
doc/benchmark/convert/bench_Convert_2008-08-29_0000.gnuplot [moved from legacy/eina/doc/benchmark/convert/bench_Convert_2008-08-29_0000.gnuplot with 100% similarity]
doc/benchmark/convert/bench_Convert_2008-08-29_0000.gstrtod.data [moved from legacy/eina/doc/benchmark/convert/bench_Convert_2008-08-29_0000.gstrtod.data with 100% similarity]
doc/benchmark/convert/bench_Convert_2008-08-29_0000.itoa_10.data [moved from legacy/eina/doc/benchmark/convert/bench_Convert_2008-08-29_0000.itoa_10.data with 100% similarity]
doc/benchmark/convert/bench_Convert_2008-08-29_0000.itoa_16.data [moved from legacy/eina/doc/benchmark/convert/bench_Convert_2008-08-29_0000.itoa_16.data with 100% similarity]
doc/benchmark/convert/bench_Convert_2008-08-29_0000.snprintf_10.data [moved from legacy/eina/doc/benchmark/convert/bench_Convert_2008-08-29_0000.snprintf_10.data with 100% similarity]
doc/benchmark/convert/bench_Convert_2008-08-29_0000.snprintf_16.data [moved from legacy/eina/doc/benchmark/convert/bench_Convert_2008-08-29_0000.snprintf_16.data with 100% similarity]
doc/benchmark/convert/bench_Convert_2008-08-29_0000.snprintf_a.data [moved from legacy/eina/doc/benchmark/convert/bench_Convert_2008-08-29_0000.snprintf_a.data with 100% similarity]
doc/benchmark/convert/output_Convert_2008-08-29_0000.png [moved from legacy/eina/doc/benchmark/convert/output_Convert_2008-08-29_0000.png with 100% similarity]
doc/benchmark/stringshare/bench_Stringshare_2008-08-08_0000.gnuplot [moved from legacy/eina/doc/benchmark/stringshare/bench_Stringshare_2008-08-08_0000.gnuplot with 100% similarity]
doc/benchmark/stringshare/bench_Stringshare_2008-08-08_0000.stringshare.data [moved from legacy/eina/doc/benchmark/stringshare/bench_Stringshare_2008-08-08_0000.stringshare.data with 100% similarity]
doc/benchmark/stringshare/bench_Stringshare_2008-08-08_0001.stringshare.data [moved from legacy/eina/doc/benchmark/stringshare/bench_Stringshare_2008-08-08_0001.stringshare.data with 100% similarity]
doc/benchmark/stringshare/output_Stringshare_2008-08-08_0000.linear.png [moved from legacy/eina/doc/benchmark/stringshare/output_Stringshare_2008-08-08_0000.linear.png with 100% similarity]
doc/benchmark/stringshare/output_Stringshare_2008-08-08_0000.logscale.png [moved from legacy/eina/doc/benchmark/stringshare/output_Stringshare_2008-08-08_0000.logscale.png with 100% similarity]
doc/benchmark/stringshare/output_Stringshare_2008-08-08_0000.relative_error.png [moved from legacy/eina/doc/benchmark/stringshare/output_Stringshare_2008-08-08_0000.relative_error.png with 100% similarity]
doc/e.css [moved from legacy/ecore/doc/e.css with 100% similarity]
doc/foot.html [moved from legacy/eet/doc/foot.html with 100% similarity]
doc/head.html [moved from legacy/eina/doc/head.html with 100% similarity]
doc/img/01_hash-table.eps [moved from legacy/eina/doc/img/01_hash-table.eps with 100% similarity]
doc/img/01_hash-table.png [moved from legacy/eina/doc/img/01_hash-table.png with 100% similarity]
doc/img/e.png [moved from legacy/edbus/doc/images/e.png with 100% similarity]
doc/img/edoxy.css [moved from legacy/edbus/doc/images/edoxy.css with 100% similarity]
doc/img/eina-list-foreach-safe.eps [moved from legacy/eina/doc/img/eina-list-foreach-safe.eps with 100% similarity]
doc/img/eina-list-foreach-safe.png [moved from legacy/eina/doc/img/eina-list-foreach-safe.png with 100% similarity]
doc/img/eina-list-foreach.eps [moved from legacy/eina/doc/img/eina-list-foreach.eps with 100% similarity]
doc/img/eina-list-foreach.png [moved from legacy/eina/doc/img/eina-list-foreach.png with 100% similarity]
doc/img/eina-list-free.eps [moved from legacy/eina/doc/img/eina-list-free.eps with 100% similarity]
doc/img/eina-list-free.png [moved from legacy/eina/doc/img/eina-list-free.png with 100% similarity]
doc/img/eina-list-reverse-foreach-safe.eps [moved from legacy/eina/doc/img/eina-list-reverse-foreach-safe.eps with 100% similarity]
doc/img/eina-list-reverse-foreach-safe.png [moved from legacy/eina/doc/img/eina-list-reverse-foreach-safe.png with 100% similarity]
doc/img/eina-list-reverse-foreach.eps [moved from legacy/eina/doc/img/eina-list-reverse-foreach.eps with 100% similarity]
doc/img/eina-list-reverse-foreach.png [moved from legacy/eina/doc/img/eina-list-reverse-foreach.png with 100% similarity]
doc/img/eina_array-growth.eps [moved from legacy/eina/doc/img/eina_array-growth.eps with 100% similarity]
doc/img/eina_array-growth.png [moved from legacy/eina/doc/img/eina_array-growth.png with 100% similarity]
doc/img/eina_inlist-node.eps [moved from legacy/eina/doc/img/eina_inlist-node.eps with 100% similarity]
doc/img/eina_inlist-node.png [moved from legacy/eina/doc/img/eina_inlist-node.png with 100% similarity]
doc/img/eina_inlist-node_eg1-inlist.eps [moved from legacy/eina/doc/img/eina_inlist-node_eg1-inlist.eps with 100% similarity]
doc/img/eina_inlist-node_eg1-inlist.png [moved from legacy/eina/doc/img/eina_inlist-node_eg1-inlist.png with 100% similarity]
doc/img/eina_inlist-node_eg1-my-struct.eps [moved from legacy/eina/doc/img/eina_inlist-node_eg1-my-struct.eps with 100% similarity]
doc/img/eina_inlist-node_eg1-my-struct.png [moved from legacy/eina/doc/img/eina_inlist-node_eg1-my-struct.png with 100% similarity]
doc/img/eina_inlist-node_eg2-list-inlist.eps [moved from legacy/eina/doc/img/eina_inlist-node_eg2-list-inlist.eps with 100% similarity]
doc/img/eina_inlist-node_eg2-list-inlist.png [moved from legacy/eina/doc/img/eina_inlist-node_eg2-list-inlist.png with 100% similarity]
doc/img/eina_inlist-node_eg2-my-struct.eps [moved from legacy/eina/doc/img/eina_inlist-node_eg2-my-struct.eps with 100% similarity]
doc/img/eina_inlist-node_eg2-my-struct.png [moved from legacy/eina/doc/img/eina_inlist-node_eg2-my-struct.png with 100% similarity]
doc/img/eina_inlist-node_eg3-my-struct.eps [moved from legacy/eina/doc/img/eina_inlist-node_eg3-my-struct.eps with 100% similarity]
doc/img/eina_inlist-node_eg3-my-struct.png [moved from legacy/eina/doc/img/eina_inlist-node_eg3-my-struct.png with 100% similarity]
doc/img/eina_inlist-node_eg3-two-inlists.eps [moved from legacy/eina/doc/img/eina_inlist-node_eg3-two-inlists.eps with 100% similarity]
doc/img/eina_inlist-node_eg3-two-inlists.png [moved from legacy/eina/doc/img/eina_inlist-node_eg3-two-inlists.png with 100% similarity]
doc/img/eina_list.eps [moved from legacy/eina/doc/img/eina_list.eps with 100% similarity]
doc/img/eina_list.png [moved from legacy/eina/doc/img/eina_list.png with 100% similarity]
doc/img/eina_list_example_01_a.eps [moved from legacy/eina/doc/img/eina_list_example_01_a.eps with 100% similarity]
doc/img/eina_list_example_01_a.png [moved from legacy/eina/doc/img/eina_list_example_01_a.png with 100% similarity]
doc/img/eina_list_example_01_b.eps [moved from legacy/eina/doc/img/eina_list_example_01_b.eps with 100% similarity]
doc/img/eina_list_example_01_b.png [moved from legacy/eina/doc/img/eina_list_example_01_b.png with 100% similarity]
doc/img/eina_stringshare.eps [moved from legacy/eina/doc/img/eina_stringshare.eps with 100% similarity]
doc/img/eina_stringshare.png [moved from legacy/eina/doc/img/eina_stringshare.png with 100% similarity]
doc/img/foot_bg.png [moved from legacy/ecore/doc/img/foot_bg.png with 100% similarity]
doc/img/head_bg.png [moved from legacy/ecore/doc/img/head_bg.png with 100% similarity]
doc/img/header_menu_background.png [moved from legacy/ecore/doc/img/header_menu_background.png with 100% similarity]
doc/img/header_menu_background_last.png [moved from legacy/ecore/doc/img/header_menu_background_last.png with 100% similarity]
doc/img/header_menu_unselected_background.png [moved from legacy/ecore/doc/img/header_menu_unselected_background.png with 100% similarity]
doc/img/logo.png [moved from legacy/ecore/doc/img/logo.png with 100% similarity]
doc/img/menu_bg.png [moved from legacy/edbus/doc/images/menu_bg.png with 100% similarity]
doc/img/menu_bg_current.png [moved from legacy/edbus/doc/images/menu_bg_current.png with 100% similarity]
doc/img/menu_bg_hover.png [moved from legacy/edbus/doc/images/menu_bg_hover.png with 100% similarity]
doc/img/menu_bg_last.png [moved from legacy/edbus/doc/images/menu_bg_last.png with 100% similarity]
doc/img/menu_bg_unsel.png [moved from legacy/edbus/doc/images/menu_bg_unsel.png with 100% similarity]

diff --git a/COPYING b/COPYING
index 296efe7..c5514db 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,25 +1,7 @@
-Copyright notice for Eet:
+The EFL come with several licences:
 
-Copyright (C) 2002-2011 Carsten Haitzler and various contributors (see AUTHORS)
+BSD 2-clause: Evil, Eet
 
-All rights reserved.
+LGPL v2: Eina
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright 
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+GPL v2:
diff --git a/COPYING.BSD b/COPYING.BSD
new file mode 100644 (file)
index 0000000..c51c01e
--- /dev/null
@@ -0,0 +1,25 @@
+Copyright notice for the EFL:
+
+Copyright (C) 2002-2012 Carsten Haitzler and various contributors (see AUTHORS)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright 
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
similarity index 90%
rename from legacy/edje/COPYING
rename to COPYING.GPL
index 1459288..d159169 100644 (file)
@@ -1,51 +1,12 @@
-Copyright notice for Edje:
-
-Copyright (C) 2003-2010 Carsten Haitzler and various contributors (see AUTHORS)
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright 
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-****
-NOTE
-****
-
-The epp binary installed is GPLv2. The GPLv2 copyright license is as below:
-
-Copyright (C) 1986, 87, 89, 92, 93, 94, 1995 Free Software Foundation, Inc.
-Written by Per Bothner, 1994-95.
-Based on CCCP program by by Paul Rubin, June 1986
-Adapted to ANSI C, Richard Stallman, Jan 1987
-Copyright (C) 2003-2011 Kim Woelders
-    
-
-                   GNU GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                           Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -95,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                   GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -294,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                           NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -316,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                    END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-           How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
similarity index 100%
rename from legacy/eina/COPYING
rename to COPYING.LGPL
index 74449d5..3da42bd 100644 (file)
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src
+SUBDIRS = src doc
 
 MAINTAINERCLEANFILES = \
 Makefile.in \
index 72b13a2..b0ba6e4 100644 (file)
@@ -1104,6 +1104,8 @@ esac
 
 AC_CONFIG_FILES([
 Makefile
+doc/Makefile
+doc/Doxyfile
 src/Makefile
 src/benchmarks/Makefile
 src/benchmarks/eina/Makefile
similarity index 100%
rename from legacy/eina/doc/Doxyfile.in
rename to doc/Doxyfile.in
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644 (file)
index 0000000..3f6d93e
--- /dev/null
@@ -0,0 +1,40 @@
+MAINTAINERCLEANFILES = Makefile.in 
+
+.PHONY: doc
+
+PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
+
+if EFL_BUILD_DOC
+
+doc-clean:
+       rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
+
+doc: all
+       $(efl_doxygen)
+       cp $(srcdir)/img/* html/
+       cp $(srcdir)/img/*.eps latex/
+       rm -rf $(PACKAGE_DOCNAME).tar*
+       mkdir -p $(PACKAGE_DOCNAME)/doc
+       cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
+       tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
+       bzip2 -9 $(PACKAGE_DOCNAME).tar
+       rm -rf $(PACKAGE_DOCNAME)/
+       mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
+       @echo "Documentation Package: doc/$(PACKAGE_DOCNAME).tar.bz2"
+       @echo "Documentation HTML: doc/html"
+
+clean-local: doc-clean
+
+else
+
+doc:
+       @echo "Documentation not built. Run ./configure --help"
+
+endif
+
+EXTRA_DIST = \
+$(srcdir)/Doxyfile.in \
+$(wildcard $(srcdir)/img/*.*) \
+$(srcdir)/e.css \
+$(srcdir)/head.html \
+$(srcdir)/foot.html
similarity index 100%
rename from legacy/ecore/doc/e.css
rename to doc/e.css
similarity index 100%
rename from legacy/eet/doc/foot.html
rename to doc/foot.html
similarity index 100%
rename from legacy/eina/doc/head.html
rename to doc/head.html
similarity index 100%
rename from legacy/edbus/doc/images/e.png
rename to doc/img/e.png