Repository: incubator-madlib Updated Branches: refs/heads/master c8bfbf81f -> 0d815f2ba
MADLIB-1076. Review LICENSE file and README.md Closes #123 Project: http://git-wip-us.apache.org/repos/asf/incubator-madlib/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-madlib/commit/0d815f2b Tree: http://git-wip-us.apache.org/repos/asf/incubator-madlib/tree/0d815f2b Diff: http://git-wip-us.apache.org/repos/asf/incubator-madlib/diff/0d815f2b Branch: refs/heads/master Commit: 0d815f2ba3b8421c32a9bfbd7b334285d83fa347 Parents: c8bfbf8 Author: Roman Shaposhnik <r...@apache.org> Authored: Thu Apr 20 11:02:43 2017 -0700 Committer: Roman Shaposhnik <r...@apache.org> Committed: Thu Apr 20 15:42:06 2017 -0700 ---------------------------------------------------------------------- HAWQ_Install.txt | 2 +- LICENSE | 444 +++++++++++++++++++++++++++++++++++++ README.md | 20 +- RELEASE_NOTES | 2 +- ReadMe_Build.txt | 17 +- deploy/RPM/CMakeLists.txt | 2 +- deploy/description.txt | 2 +- doc/etc/developer.doxyfile.in | 2 +- licenses/MADlib.txt | 11 +- src/CMakeLists.txt | 8 +- src/patch/PyXB.sh | 3 +- 11 files changed, 484 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/HAWQ_Install.txt ---------------------------------------------------------------------- diff --git a/HAWQ_Install.txt b/HAWQ_Install.txt index e933624..8cef22e 100644 --- a/HAWQ_Install.txt +++ b/HAWQ_Install.txt @@ -5,7 +5,7 @@ MADlib is a library of statistics and machine learning functions that can be installed in HAWQ. MADlib is installed separately from the main HAWQ installation. For a description of the general MADlib installation process, refer to the MADlib installation guide for PostgreSQL and GPDB: -https://github.com/madlib/madlib/wiki/Installation-Guide +https://cwiki.apache.org/confluence/display/MADLIB/Installation+Guide An installation script, hawq_install.sh, installs the MADlib RPM distribution on the HAWQ master and segment nodes. It installs the MADlib files but does not http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 2fd044f..ffb7ae3 100644 --- a/LICENSE +++ b/LICENSE @@ -341,3 +341,447 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *********************************************************************** + +The binary distribution of MADlib statically links and otherwise ships +code available under the following licenses (either directly compatible +with Apache License version 2, or explicitly approved by Apache Software +Foundation to be compatible with inclusion in a binary form within an +Apache product if the inclusion is appropriately labeled): + +---------------------------------------------------------------------------- +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +---------------------------------------------------------------------------- +Eigen + +From the Eigen Licensing page +(http://eigen.tuxfamily.org/index.php?title=Main_Page) + +Eigen is Free Software. Starting from the 3.1.1 version, it is licensed +under the MPL2, which is a simple weak copyleft license. Common +questions about the MPL2 are answered in the official MPL2 FAQ +(http://www.mozilla.org/MPL/2.0/FAQ.html). + +Note that currently, a few features rely on third-party code licensed +under the LGPL: SimplicialCholesky, AMD ordering, and constrained_cg. +Such features can be explicitly disabled by compiling with the +EIGEN_MPL2_ONLY preprocessor symbol defined. + +Virtually any software may use Eigen. For example, closed-source +software may use Eigen without having to disclose its own source code. +Many proprietary and closed-source software projects are using Eigen +right now, as well as many BSD-licensed projects. + +------ + +Mozilla Public License +Version 2.0 + +1. Definitions + +1.1. âContributorâ +means each individual or legal entity that creates, contributes to the +creation of, or owns Covered Software. + +1.2. âContributor Versionâ +means the combination of the Contributions of others (if any) used by +a Contributor and that particular Contributorâs Contribution. + +1.3. âContributionâ +means Covered Software of a particular Contributor. + +1.4. âCovered Softwareâ +means Source Code Form to which the initial Contributor has attached +the notice in Exhibit A, the Executable Form of such Source Code Form, +and Modifications of such Source Code Form, in each case including +portions thereof. + +1.5. âIncompatible With Secondary Licensesâ +means + +⢠that the initial Contributor has attached the notice described in +Exhibit B to the Covered Software; or + +⢠that the Covered Software was made available under the terms of +version 1.1 or earlier of the License, but not also under the terms of +a Secondary License. + +1.6. âExecutable Formâ +means any form of the work other than Source Code Form. + +1.7. âLarger Workâ +means a work that combines Covered Software with other material, in a +separate file or files, that is not Covered Software. + +1.8. âLicenseâ +means this document. + +1.9. âLicensableâ +means having the right to grant, to the maximum extent possible, +whether at the time of the initial grant or subsequently, any and all +of the rights conveyed by this License. + +1.10. âModificationsâ +means any of the following: + +⢠any file in Source Code Form that results from an addition to, +deletion from, or modification of the contents of Covered Software; or + +⢠any new file in Source Code Form that contains any Covered Software. + +1.11. âPatent Claimsâ of a Contributor +means any patent claim(s), including without limitation, method, +process, and apparatus claims, in any patent Licensable by such +Contributor that would be infringed, but for the grant of the License, +by the making, using, selling, offering for sale, having made, import, +or transfer of either its Contributions or its Contributor Version. + +1.12. âSecondary Licenseâ +means either the GNU General Public License, Version 2.0, the GNU +Lesser General Public License, Version 2.1, the GNU Affero General +Public License, Version 3.0, or any later versions of those licenses. + +1.13. âSource Code Formâ +means the form of the work preferred for making modifications. + +1.14. âYouâ (or âYourâ) +means an individual or a legal entity exercising rights under this +License. For legal entities, âYouâ includes any entity that +controls, is controlled by, or is under common control with You. For +purposes of this definition, âcontrolâ means (a) the power, direct or +indirect, to cause the direction or management of such entity, whether +by contract or otherwise, or (b) ownership of more than fifty percent +(50%) of the outstanding shares or beneficial ownership of such entity. + +2. License Grants and Conditions + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +⢠under intellectual property rights (other than patent or trademark) +Licensable by such Contributor to use, reproduce, make available, +modify, display, perform, distribute, and otherwise exploit its +Contributions, either on an unmodified basis, with Modifications, or as +part of a Larger Work; and + +⢠under Patent Claims of such Contributor to make, use, sell, offer +for sale, have made, import, and otherwise transfer either its +Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor +first distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted +under this License. No additional rights or licenses will be implied +from the distribution or licensing of Covered Software under this +License. Notwithstanding Section 2.1(b) above, no patent license is +granted by a Contributor: + +⢠for any code that a Contributor has removed from Covered Software; +or + +⢠for infringements caused by: (i) Your and any other third partyâs +modifications of Covered Software, or (ii) the combination of its +Contributions with other software (except as part of its Contributor +Version); or + +⢠under Patent Claims infringed by Covered Software in the absence of +its Contributions. + +This License does not grant any rights in the trademarks, service +marks, or logos of any Contributor (except as may be necessary to +comply with the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License +(if permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipientsâ rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +⢠such Covered Software must also be made available in Source Code +Form, as described in Section 3.1, and You must inform recipients of +the Executable Form how they can obtain a copy of such Source Code Form +by reasonable means in a timely manner, at a charge no more than the +cost of distribution to the recipient; and + +⢠You may distribute such Executable Form under the terms of this +License, or sublicense it under different terms, provided that the +license for the Executable Form does not attempt to limit or alter the +recipientsâ rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and +the Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered +by You alone, and You hereby agree to indemnify every Contributor for +any liability incurred by such Contributor as a result of warranty, +support, indemnity or liability terms You offer. You may include +additional disclaimers of warranty and limitations of liability +specific to any jurisdiction. + +4. Inability to Comply Due to Statute or Regulation + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description +must be placed in a text file included with all distributions of the +Covered Software under this License. Except to the extent prohibited +by statute or regulation, such description must be sufficiently +detailed for a recipient of ordinary skill to be able to understand it. + +5. Termination + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a +particular Contributor are reinstated (a) provisionally, unless and +until such Contributor explicitly and finally terminates Your grants, +and (b) on an ongoing basis, if such Contributor fails to notify You +of the non-compliance by some reasonable means prior to 60 days after +You have come back into compliance. Moreover, Your grants from a +particular Contributor are reinstated on an ongoing basis if such +Contributor notifies You of the non-compliance by some reasonable +means, this is the first time You have received notice of +non-compliance with this License from such Contributor, and You become +compliant prior to 30 days after Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a +patent infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) +which have been validly granted by You or Your distributors under this +License prior to termination shall survive termination. + +6. Disclaimer of Warranty + +Covered Software is provided under this License on an âas isâ +basis, without warranty of any kind, either expressed, implied, or +statutory, including, without limitation, warranties that the Covered +Software is free of defects, merchantable, fit for a particular purpose +or non-infringing. The entire risk as to the quality and performance of +the Covered Software is with You. Should any Covered Software prove +defective in any respect, You (not any Contributor) assume the cost of +any necessary servicing, repair, or correction. This disclaimer of +warranty constitutes an essential part of this License. No use of any +Covered Software is authorized under this License except under this +disclaimer. + +7. Limitation of Liability + +Under no circumstances and under no legal theory, whether tort +(including negligence), contract, or otherwise, shall any Contributor, +or anyone who distributes Covered Software as permitted above, be +liable to You for any direct, indirect, special, incidental, or +consequential damages of any character including, without limitation, +damages for lost profits, loss of goodwill, work stoppage, computer +failure or malfunction, or any and all other commercial damages or +losses, even if such party shall have been informed of the possibility +of such damages. This limitation of liability shall not apply to +liability for death or personal injury resulting from such partyâs +negligence to the extent applicable law prohibits such limitation. Some +jurisdictions do not allow the exclusion or limitation of incidental or +consequential damages, so this exclusion and limitation may not apply +to You. + +8. Litigation + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a partyâs ability to bring +cross-claims or counter-claims. + +9. Miscellaneous + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in +Section 10.3, no one other than the license steward has the right to +modify or publish new versions of this License. Each version will be +given a distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered +Software, or under the terms of any subsequent version published by the +license steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - âIncompatible With Secondary Licensesâ Notice + +This Source Code Form is âIncompatible With Secondary Licensesâ, as +defined by the Mozilla Public License, v. 2.0. + +MADlib builds Eigen using the EIGEN_MPL2_ONLY flag enabled. +---------------------------------------------------------------------------- +std::ctype<char>::_M_widen_init() is a function authored by Jerry Quinn +<jlqu...@optonline.net>, which was added to libstdc++ with revision 74662 on +Dec 16, 2003 [1]. + +With permission from Jerry (thankfully received on Oct 9, 2012), we include a +copy of this function in the MADlib repository. The sole intention is to allow +compiling MADlib with recent versions of gcc while still keeping the runtime +dependencies limited to earlier versions of libstdc++. Technical details are +given in src/utils/libstdcxx-compatibility.cpp. + +Revision 74662 of the libstdc++-v3 file include/bits/locale_facets.h, where +std::ctype<char>::_M_widen_init() has been copied from, also included the +following notice in the file header [2]: + +// As a special exception, you may use this file as part of a free software +// library without restriction. [...] + +Links: +[1] http://gcc.gnu.org/viewcvs?diff_format=h&view=revision&revision=74662 +[2] http://gcc.gnu.org/viewcvs/trunk/libstdc%2B%2B-v3/include/bits/locale_facets.h?diff_format=h&view=markup&pathrev=74662 +---------------------------------------------------------------------------- +argparse is (c) 2006-2009 Steven J. Bethard <steven.beth...@gmail.com>. + +The argparse module was contributed to Python as of Python 2.7 and thus +was licensed under the Python license. Same license applies to all files in +the argparse package project. + +For details about the Python License, please see Python_License_v2.7.1.txt. + +History +------- + +Before (and including) argparse 1.1, the argparse package was licensed under +Apache License v2.0. + +After argparse 1.1, all project files from the argparse project were deleted +due to license compatibility issues between Apache License 2.0 and GNU GPL v2. + +The project repository then had a clean start with some files taken from +Python 2.7.1, so definitely all files are under Python License now. http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index a54ba5e..ecbb345 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -   +   ================================================= **MADlib<sup>®</sup>** is an open-source library for scalable in-database analytics. It provides data-parallel implementations of mathematical, statistical and @@ -63,6 +63,8 @@ docker kill madlib docker rm madlib ``` +Detailed build instructions are available in [`ReadMe_Build.txt`](ReadMe_Build.txt) + User and Developer Documentation ================================== The latest documentation of MADlib modules can be found at [`MADlib @@ -75,7 +77,7 @@ The following block-diagram gives a high-level overview of MADlib's architecture. - + Third Party Components @@ -83,12 +85,12 @@ Third Party Components MADlib incorporates software from the following third-party components. Bundled with source code: 1. [`libstemmer`](http://snowballstem.org/) "small string processing language" -2. [`m_widen_init`](https://github.com/apache/incubator-madlib/blob/master/licenses/third_party/_M_widen_init.txt) "allows compilation with recent versions of gcc with runtime dependencies from earlier versions of libstdc++" +2. [`m_widen_init`](licenses/third_party/_M_widen_init.txt) "allows compilation with recent versions of gcc with runtime dependencies from earlier versions of libstdc++" 3. [`argparse 1.2.1`](http://code.google.com/p/argparse/) "provides an easy, declarative interface for creating command line tools" 4. [`PyYAML 3.10`](http://pyyaml.org/wiki/PyYAML) "YAML parser and emitter for Python" 5. [`UseLATEX.cmake`](https://github.com/kmorel/UseLATEX/blob/master/UseLATEX.cmake) "CMAKE commands to use the LaTeX compiler" -Downloaded at build time: +Downloaded at build time (or supplied as build dependencies): 6. [`Boost 1.61.0 (or newer)`](http://www.boost.org/) "provides peer-reviewed portable C++ source libraries" 7. [`PyXB 1.2.4`](http://pyxb.sourceforge.net/) "Python library for XML Schema Bindings" @@ -96,13 +98,17 @@ Downloaded at build time: Licensing ========== -License information regarding MADlib and included third-party libraries can be -found inside the [`license`](https://github.com/apache/incubator-madlib/blob/master/licenses) directory. +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the [`NOTICE`](NOTICE) file distributed with this work for additional information regarding copyright ownership. The ASF licenses this project to You under the Apache License, Version 2.0 (the "License"); you may not use this project except in compliance with the License. You may obtain a copy of the License at [`LICENSE`](LICENSE). + +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. + +As specified in [`LICENSE`](LICENSE) additional license information regarding included third-party libraries can be +found inside the [`licenses`](licenses) directory. Release Notes ============= Changes between MADlib versions are described in the -[`ReleaseNotes.txt`](https://github.com/apache/incubator-madlib/blob/master/RELEASE_NOTES) file. +[`ReleaseNotes.txt`](RELEASE_NOTES) file. Papers and Talks ================= http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/RELEASE_NOTES ---------------------------------------------------------------------- diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 29d850c..78f3d10 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -5,7 +5,7 @@ These release notes contain the significant changes in each MADlib release, with most recent versions listed at the top. A complete list of changes for each release can be obtained by viewing the git -commit history located at https://github.com/madlib/madlib/commits/master. +commit history located at https://github.com/apache/incubator-madlib/commits/master. Current list of bugs and issues can be found at https://issues.apache.org/jira/browse/MADLIB. â------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/ReadMe_Build.txt ---------------------------------------------------------------------- diff --git a/ReadMe_Build.txt b/ReadMe_Build.txt index 4e21c82..ccb6207 100644 --- a/ReadMe_Build.txt +++ b/ReadMe_Build.txt @@ -17,7 +17,8 @@ Building and Installing from Source - CMake >= 2.8.4 - Internet connection to automatically download MADlib's dependencies if needed - (Boost, Eigen). See configuration options below. + (Boost, Eigen). You can avoid this and build MADlib in a networkless mode + by providing tarballs of 3 external dependencies. See configuration options below. Optional: @@ -40,6 +41,12 @@ Optional: + Greenplum 4.2, 4.3 + All requirements for generating user-level documentation (see above) +** Build-time Debian package dependencies (optional read): +------------------------------------------- + +On Debian based platform you can install the required dependencies (aside from +Boost, Eigen and PyXB) by running the following command: + apt-get install cmake g++ m4 python flex bison doxygen graphviz postgresql-server-dev-all texlive-full poppler-utils ** Build instructions (required read): -------------------------------------- @@ -158,10 +165,16 @@ root directory) for more options, after having run `cmake` the first time. - `EIGEN_TAR_SOURCE` (default: *empty*) - Eigen is downloaded automatically, unless the you call `./configure` + Eigen is downloaded automatically, unless you call `./configure` with `-DEIGEN_TAR_SOURCE=/path/to/eigen_x.tar.gz`, in which case this tarball is used. +- `PYXB_TAR_SOURCE` (default: *empty*) + + PyXB is downloaded automatically, unless you call `./configure` + with `-DPYXB_TAR_SOURCE=/path/to/pyxb_x.tar.gz`, in which case + this tarball is used. + Debugging ========= http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/deploy/RPM/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/deploy/RPM/CMakeLists.txt b/deploy/RPM/CMakeLists.txt index 8bf1675..da31da2 100644 --- a/deploy/RPM/CMakeLists.txt +++ b/deploy/RPM/CMakeLists.txt @@ -12,7 +12,7 @@ rh_version(RH_VERSION) # -- Set RPM-specific variables ------------------------------------------------ set(CPACK_RPM_PACKAGE_ARCHITECTURE x86_64 PARENT_SCOPE) -set(CPACK_RPM_PACKAGE_LICENSE "New BSD License" PARENT_SCOPE) +set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0" PARENT_SCOPE) set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries" PARENT_SCOPE) set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local/madlib/Versions/${MADLIB_VERSION_STRING}" PARENT_SCOPE) http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/deploy/description.txt ---------------------------------------------------------------------- diff --git a/deploy/description.txt b/deploy/description.txt index c3b16cd..77175ac 100644 --- a/deploy/description.txt +++ b/deploy/description.txt @@ -7,4 +7,4 @@ analytic skills, by harnessing efforts from commercial practice, academic research, and open-source development. To more information, please see the MADlib wiki at -https://github.com/madlib/madlib/wiki +https://cwiki.apache.org/confluence/display/MADLIB http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/doc/etc/developer.doxyfile.in ---------------------------------------------------------------------- diff --git a/doc/etc/developer.doxyfile.in b/doc/etc/developer.doxyfile.in index 02558c9..0f6ab3b 100644 --- a/doc/etc/developer.doxyfile.in +++ b/doc/etc/developer.doxyfile.in @@ -840,7 +840,7 @@ FILTER_SOURCE_PATTERNS = # (index.html). This can be useful if you have a project on for instance GitHub # and want reuse the introduction page also for the doxygen output. -USE_MDFILE_AS_MAINPAGE = "https://github.com/madlib/madlib/blob/master/README.md"; +USE_MDFILE_AS_MAINPAGE = "https://github.com/apache/incubator-madlib/blob/master/README.md"; #--------------------------------------------------------------------------- # configuration options related to source browsing http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/licenses/MADlib.txt ---------------------------------------------------------------------- diff --git a/licenses/MADlib.txt b/licenses/MADlib.txt deleted file mode 100644 index 9027809..0000000 --- a/licenses/MADlib.txt +++ /dev/null @@ -1,10 +0,0 @@ -Portions of this software Copyright (c) 2010-2013 by EMC Corporation. All rights reserved. -Portions of this software Copyright (c) 2010-2013 by Regents of the University of California. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -- 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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. diff --git a/licenses/MADlib.txt b/licenses/MADlib.txt new file mode 120000 index 0000000..ea5b606 --- /dev/null +++ b/licenses/MADlib.txt @@ -0,0 +1 @@ +../LICENSE \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ca7961b..c8e0e2e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,10 +18,10 @@ set(BITBUCKET_BASE_URL "${MADLIB_REDIRECT_PREFIX}https://bitbucket.org"; CACHE STRING "Base URL for Bitbucket projects. May be overridden for testing purposes.") -set(GITHUB_MADLIB_BASE_URL - "${MADLIB_REDIRECT_PREFIX}https://github.com/madlib"; +set(EIGEN_BASE_URL + "${MADLIB_REDIRECT_PREFIX}https://github.com/madlib/eigen/archive"; CACHE STRING - "Base URL for MADlib Github projects. May be overridden for testing purposes.") + "Base URL for Eigen projects. May be overridden for testing purposes.") # Boost might not be present on the system (or simply too old). In this case, we # download the following version (unless it is already present in @@ -52,7 +52,7 @@ endif (NOT BOOST_TAR_SOURCE) # -DEIGEN_TAR_SOURCE=/path/to/eigen-x.x.x.tar.gz set(EIGEN_VERSION "branches/3.2") -set(EIGEN_URL "${GITHUB_MADLIB_BASE_URL}/eigen/archive/${EIGEN_VERSION}.tar.gz") +set(EIGEN_URL "${EIGEN_BASE_URL}/${EIGEN_VERSION}.tar.gz") set(EIGEN_TAR_MD5 13bc1043270d8f4397339c0cb0b62938) set(EIGEN_MPL2_ONLY TRUE) http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/0d815f2b/src/patch/PyXB.sh ---------------------------------------------------------------------- diff --git a/src/patch/PyXB.sh b/src/patch/PyXB.sh index 408ba92..ed2aacb 100755 --- a/src/patch/PyXB.sh +++ b/src/patch/PyXB.sh @@ -223,5 +223,6 @@ patch -N -p1 <<'EOF' EOF echo "PyXB: Removing GPL component from code base" +echo "PyXB: see https://github.com/pabigot/pyxb/issues/77 for details" rm -f doc/extapi.py -rm -f doc/extapi.pyc \ No newline at end of file +rm -f doc/extapi.pyc
