#At file:///C:/work/connector-net/clean-trunk/ based on revid:vvaintroub@stripped
922 Reggie Burnett 2010-08-18 [merge]
merged
removed:
EXCEPTIONS
License.txt
modified:
Installer/core.wxs
README
package.proj
=== removed file 'EXCEPTIONS'
=== removed file 'EXCEPTIONS'
--- a/EXCEPTIONS 2007-03-15 00:43:12 +0000
+++ b/EXCEPTIONS 1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-MySQL FLOSS License Exception
-
-The MySQL AB Exception for Free/Libre and Open Source
-Software-only Applications Using MySQL Client Libraries (the
-"FLOSS Exception").
-
-Version 0.6, 7 March 2007
-
-Exception Intent
-
-We want specified Free/Libre and Open Source Software (``FLOSS'')
-applications to be able to use specified GPL-licensed MySQL client
-libraries (the ``Program'') despite the fact that not all FLOSS
-licenses are compatible with version 2 of the GNU General Public
-License (the ``GPL'').
-
-Legal Terms and Conditions
-
-As a special exception to the terms and conditions of version 2.0
-of the GPL:
-
- 1. You are free to distribute a Derivative Work that is formed
- entirely from the Program and one or more works (each, a
- "FLOSS Work") licensed under one or more of the licenses
- listed below in section 1, as long as:
- a. You obey the GPL in all respects for the Program and the
- Derivative Work, except for identifiable sections of the
- Derivative Work which are not derived from the Program,
- and which can reasonably be considered independent and
- separate works in themselves,
- b. all identifiable sections of the Derivative Work which
- are not derived from the Program, and which can
- reasonably be considered independent and separate works
- in themselves,
- i. are distributed subject to one of the FLOSS licenses
- listed below, and
- ii. the object code or executable form of those sections
- are accompanied by the complete corresponding
- machine-readable source code for those sections on
- the same medium and under the same FLOSS license as
- the corresponding object code or executable forms of
- those sections, and
- c. any works which are aggregated with the Program or with a
- Derivative Work on a volume of a storage or distribution
- medium in accordance with the GPL, can reasonably be
- considered independent and separate works in themselves
- which are not derivatives of either the Program, a
- Derivative Work or a FLOSS Work.
- If the above conditions are not met, then the Program may only
- be copied, modified, distributed or used under the terms and
- conditions of the GPL or another valid licensing option from
- MySQL AB.
-
- 2. FLOSS License List
-
-License name Version(s)/Copyright Date
-Academic Free License 2.0
-Apache Software License 1.0/1.1/2.0
-Apple Public Source License 2.0
-Artistic license From Perl 5.8.0
-BSD license "July 22 1999"
-Common Development and Distribution License (CDDL) 1.0
-Common Public License 1.0
-Eclipse Public License 1.0
-GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1
-Jabber Open Source License 1.0
-MIT license (As listed in file MIT-License.txt) ---
-Mozilla Public License (MPL) 1.0/1.1
-Open Software License 2.0
-OpenSSL license (with original SSLeay license) "2003" ("1998")
-PHP License 3.0
-Python license (CNRI Python License) ---
-Python Software Foundation License 2.1.1
-Sleepycat License "1999"
-University of Illinois/NCSA Open Source License ---
-W3C License "2001"
-X11 License "2001"
-Zlib/libpng License ---
-Zope Public License 2.0
-
- Due to the many variants of some of the above licenses, we
- require that any version follow the 2003 version of the Free
- Software Foundation's Free Software Definition
- (http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of
- the Open Source Definition by the Open Source Initiative
- (http://www.opensource.org/docs/definition.php).
-
- 3. Definitions
-
- a. Terms used, but not defined, herein shall have the
- meaning provided in the GPL.
- b. Derivative Work means a derivative work under copyright
- law.
-
- 4. Applicability: This FLOSS Exception applies to all Programs
- that contain a notice placed by MySQL AB saying that the
- Program may be distributed under the terms of this FLOSS
- Exception. If you create or distribute a work which is a
- Derivative Work of both the Program and any other work
- licensed under the GPL, then this FLOSS Exception is not
- available for that work; thus, you must remove the FLOSS
- Exception notice from that work and comply with the GPL in all
- respects, including by retaining all GPL notices. You may
- choose to redistribute a copy of the Program exclusively under
- the terms of the GPL by removing the FLOSS Exception notice
- from that copy of the Program, provided that the copy has
- never been modified by you or any third party.
-
-Appendix A. Qualified Libraries and Packages
-
-The following is a non-exhaustive list of libraries and packages
-which are covered by the FLOSS License Exception. Please note that
-this appendix is provided merely as an additional service to
-specific FLOSS projects wishing to simplify licensing information
-for their users. Compliance with one of the licenses noted under
-the "FLOSS license list" section remains a prerequisite.
-
-Package Name Qualifying License and Version
-Apache Portable Runtime (APR) Apache Software License 2.0
\ No newline at end of file
=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs 2010-07-26 01:21:36 +0000
+++ b/Installer/core.wxs 2010-08-18 18:35:11 +0000
@@ -9,10 +9,11 @@
<File Id="ChangeLog" Name="CHANGES" Source="..\CHANGES" />
<File Id="RelNotes" Name="Release Notes.txt" Source="..\Release Notes.txt" />
<?if $(var.IsGPL) = 1 ?>
- <File Id="EXCEPTIONS" Name="EXCEPTIONS" Source="..\EXCEPTIONS" DiskId="1"/>
<File Id="COPYING" Name="COPYING" Source="..\COPYING" DiskId="1" />
+ <File Id="README1" Name="README" Source="..\README" DiskId="1"/>
+ <?else?>
+ <File Id="README2" Name="README" Source="..\README-Commercial" DiskId="1"/>
<?endif?>
- <File Id="README1" Name="README" Source="..\README" DiskId="1"/>
<RegistryKey Id="MySqlKey" Root="HKLM" Action="createAndRemoveOnUninstall"
Key="Software\MySQL AB\MySQL Connector/Net">
<RegistryValue Id="Location" Name="Location" Value="[INSTALLDIR]" Type="string"/>
=== removed file 'License.txt'
--- a/License.txt 2009-04-19 16:12:57 +0000
+++ b/License.txt 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-This software product is not publicly available software.
-This software product is MySQL commercial software and use of this
-software is governed by your applicable license agreement with MySQL.
=== modified file 'README'
--- a/README 2010-02-13 05:00:25 +0000
+++ b/README 2010-08-18 18:35:11 +0000
@@ -1,34 +1,27 @@
-MySQL Connector/Net 6.3
-MySQL AB's ADO.Net Driver for MySQL
-Copyright (c) 2004-2007 MySQL AB, 2008-2009 Sun Microsystems, 2010 Oracle
+MySQL Connector/Net
+Oracle's ADO.Net Driver for MySQL
+Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
CONTENTS
* License
* Documentation Location
-* Included software
LICENSE
-MySQL Connector/Net is licensed under the GPL or a commercial license
-from MySQL AB.
-
-If you have licensed this product under the GPL, please see the COPYING
-file for more information.
-
-If you have licensed this product under a commercial license from
-MySQL AB, please see the file "MySQLEULA.txt" that comes with this
-distribution for the terms of the license.
-
-If you need non-GPL licenses for commercial distribution please contact
-me <reggie@stripped> or <sales@stripped>.
+The MySQL Connector/Net is licensed under the terms of the GPLv2 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most MySQL Connectors. There are special exceptions to the terms and conditions of the GPLv2 as it is applied to this software, see the FLOSS License Exception <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
DOCUMENTATION LOCATION
-The documentation currently exists in MSDN help format and is located in the 'doc'
-directory.
+The documentation currently exists in MSDN help format and is located in the 'doc' directory.
This software is OSI Certified Open Source Software.
OSI Certified is a certification mark of the Open Source Initiative.
=== modified file 'package.proj'
--- a/package.proj 2010-07-26 01:21:57 +0000
+++ b/package.proj 2010-08-18 18:35:11 +0000
@@ -12,7 +12,7 @@
<OutputName>MySql.Data</OutputName>
<OutputType>Package</OutputType>
</PropertyGroup>
-
+
<PropertyGroup Condition=" '$(Configuration)' == 'Commercial' ">
<Postfix>-com</Postfix>
</PropertyGroup>
@@ -26,7 +26,7 @@
<RemoveDir Directories ="bin/$(Configuration)" ContinueOnError ="true"/>
<MakeDir Directories ="bin/$(Configuration)" ContinueOnError ="true"/>
</Target>
-
+
<Target Name="PackageInstall">
<GetVersion Assembly="MySql.Data/Provider/bin/release/mysql.data.dll" Format="{0}.{1}.{2}">
<Output TaskParameter = "AsString" PropertyName="Version"/>
@@ -42,13 +42,12 @@
**/user;**/debug/**;**/release/**;**/*.suo;**/cnet.snk;**/*.wixobj;
**/*.msi;**/*.msm;*.Design.*;*-banner.txt;Design/**;**/doc.xml;
**/installer/**;**/documentation/**;**/PackageLoadKey.txt;**/*.cache;
- **/*.proj;**/COPYING;**/EXCEPTIONS;**/*.bak;**/*.user;**/*.SourceAnalysis;
+ **/*.proj;**/COPYING;**/*.bak;**/*.user;**/*.SourceAnalysis;
**/MySql.Data.xml;**/*.InstallLog;**/*.bat;**/*.reg;**/thumbs.db;**/.bzr/**;
**/.bzr-mysql/**;**/*.bzrignore;**/*.~??"/>
<SourceFiles Include="COPYING" Condition=" '$(Configuration)' == 'GPL' "/>
- <SourceFiles Include="EXCEPTIONS" Condition=" '$(Configuration)' == 'GPL' "/>
</ItemGroup>
-
+
<Target Name="PackageSource">
<RemoveDir Directories="tmp" ContinueOnError="true"/>
<MakeDir Directories ="tmp"/>
@@ -59,51 +58,50 @@
</ItemGroup>
<!-- if we are not doing GPL, then we need to replace license text -->
- <ReplaceText HeaderFile="Installer\GPL-Banner.txt"
+ <ReplaceText HeaderFile="Installer\GPL-Banner.txt"
NewHeaderFile="Installer\Commercial-Banner.txt"
Files="@(TmpFiles)" Condition=" '$(Configuration)' == 'Commercial' "/>
<ItemGroup>
- <FilesToZip Include="tmp/**"/>
+ <FilesToZip Include="tmp/**"/>
</ItemGroup>
<Zip ZipFileName="bin/$(Configuration)/mysql-connector-net-$(Version)$(Postfix)-src.zip"
Files="@(FilesToZip)" WorkingDirectory="tmp"/>
-<!-- <RemoveDir Directories="tmp"/>-->
+ <!-- <RemoveDir Directories="tmp"/>-->
</Target>
<Target Name="PackageZip">
- <ItemGroup>
- <V2Assemblies Include="MySql.Data\Provider\bin\release\mysql.data.dll"/>
- <V2Assemblies Include="MySql.Data\Provider\bin\release\mysql.data.cf.dll"/>
- <V2Assemblies Include="MySql.Web\Providers\bin\release\mysql.web.dll"/>
- <V2Assemblies Include="MySql.Data.Entity\Provider\bin\release\mysql.data.entity.dll"/>
- <V2Assemblies Include="MySql.VisualStudio\bin\release\mysql.visualstudio.dll"/>
- </ItemGroup>
-
- <ItemGroup>
- <V4Assemblies Include="MySql.Data.Entity\Provider\bin\release-4.0\mysql.data.entity.dll"/>
- <V4Assemblies Include="MySql.VisualStudio\bin\release-4.0\mysql.visualstudio.dll"/>
- </ItemGroup>
-
- <ItemGroup>
- <BinaryFiles Include="Documentation\Output\MySql.Data.chm"/>
- <BinaryFiles Include="COPYING" Condition=" '$(Configuration)' == 'GPL' "/>
- <BinaryFiles Include="EXCEPTIONS" Condition=" '$(Configuration)' == 'GPL' "/>
- <BinaryFiles Include="License.txt" Condition=" '$(Configuration)' == 'Commercial' "/>
- <BinaryFiles Include="README"/>
- <BinaryFiles Include="Release Notes.txt"/>
- <BinaryFiles Include="CHANGES"/>
- </ItemGroup>
-
+ <ItemGroup>
+ <V2Assemblies Include="MySql.Data\Provider\bin\release\mysql.data.dll"/>
+ <V2Assemblies Include="MySql.Data\Provider\bin\release\mysql.data.cf.dll"/>
+ <V2Assemblies Include="MySql.Web\Providers\bin\release\mysql.web.dll"/>
+ <V2Assemblies Include="MySql.Data.Entity\Provider\bin\release\mysql.data.entity.dll"/>
+ <V2Assemblies Include="MySql.VisualStudio\bin\release\mysql.visualstudio.dll"/>
+ </ItemGroup>
+
+ <ItemGroup>
+ <V4Assemblies Include="MySql.Data.Entity\Provider\bin\release-4.0\mysql.data.entity.dll"/>
+ <V4Assemblies Include="MySql.VisualStudio\bin\release-4.0\mysql.visualstudio.dll"/>
+ </ItemGroup>
+
+ <ItemGroup>
+ <BinaryFiles Include="Documentation\Output\MySql.Data.chm"/>
+ <BinaryFiles Include="COPYING" Condition=" '$(Configuration)' == 'GPL' "/>
+ <BinaryFiles Include="README" Condition=" '$(Configuration)' == 'GPL' "/>
+ <BinaryFiles Include="README-Commercial" Condition=" '$(Configuration)' == 'Commercial' "/>
+ <BinaryFiles Include="Release Notes.txt"/>
+ <BinaryFiles Include="CHANGES"/>
+ </ItemGroup>
+
<RemoveDir Directories="tmp" ContinueOnError="true"/>
<MakeDir Directories ="tmp"/>
<Copy SourceFiles ="@(BinaryFiles)" DestinationFolder="tmp"/>
<Copy SourceFiles ="@(V2Assemblies)" DestinationFolder="tmp\v2"/>
<Copy SourceFiles ="@(V4Assemblies)" DestinationFolder="tmp\v4"/>
-
+ <Move SourceFiles="tmp/README-Commercial" DestinationFiles="tmp/README"/>
<ItemGroup>
- <ZipFiles Include="tmp/**"/>
+ <ZipFiles Include="tmp/**"/>
</ItemGroup>
<Zip ZipFileName="bin/$(Configuration)/mysql-connector-net-$(Version)$(Postfix)-noinstall.zip"
Files="@(ZipFiles)" workingDirectory="tmp"/>
Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20100818183511-g0myi1gkwzvuxpwk.bundle
| Thread |
|---|
| • bzr commit into connector-net-trunk branch (reggie.burnett:922) | Reggie Burnett | 18 Aug |
