database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

- applied the required changes to create the FOSS License exception

Browse Source 
file "EXCEPTIONS" and include it in the source and binary 
   distributions


Build-tools/mysql-copyright:
   - remove COPYING and EXCEPTIONS from the commercial packages
Docs/Makefile.am:
   - create the EXCEPTIONS file that includes the FOSS License exception
scripts/make_binary_distribution.sh:
   - include EXCEPTIONS in the binary distribution, too.
support-files/mysql.spec.sh:
   - add EXCEPTIONS to the server RPM
This commit is contained in:
unknown
2004-08-05 01:54:04 +02:00
parent f618dd6a25
commit d62dff227d
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Build-tools/mysql-copyright
View File

@ -101,6 +101,7 @@ sub main
# on the toplevel of the directory instead. file 'PUBLIC' shouldn't # on the toplevel of the directory instead. file 'PUBLIC' shouldn't
# exist in the new mysql distributions, but let's be sure.. # exist in the new mysql distributions, but let's be sure..
unlink("$destdir/PUBLIC", "$destdir/README"); unlink("$destdir/PUBLIC", "$destdir/README");
unlink("$destdir/COPYING", "$destdir/EXCEPTIONS");
copy("$WD/Docs/MySQLEULA.txt", "$destdir"); copy("$WD/Docs/MySQLEULA.txt", "$destdir");
# remove readline subdir and update configure accordingly # remove readline subdir and update configure accordingly

7
Docs/Makefile.am
View File

@ -26,7 +26,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \
all: $(targets) txt_files all: $(targets) txt_files
txt_files: ../INSTALL-SOURCE ../COPYING \ txt_files: ../INSTALL-SOURCE ../COPYING ../EXCEPTIONS \
INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
CLEAN_FILES: $(BUILD_SOURCES) CLEAN_FILES: $(BUILD_SOURCES)
@ -202,7 +202,10 @@ INSTALL-BINARY: mysql.info $(GT)
perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@ perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@
../COPYING: mysql.info $(GT) ../COPYING: mysql.info $(GT)
perl -w $(GT) mysql.info "GPL license" "Function Index" > $@ perl -w $(GT) mysql.info "GPL license" "MySQL FOSS License Exception" > $@
../EXCEPTIONS: mysql.info $(GT)
perl -w $(GT) mysql.info "MySQL FOSS License Exception" "Function Index" > $@
../support-files/MacOSX/ReadMe.txt: mysql.info $(GT) ../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@ perl -w $(GT) mysql.info "Mac OS X installation" "NetWare installation" > $@

2
scripts/make_binary_distribution.sh
View File

@ -86,7 +86,7 @@ do
done done
for i in COPYING COPYING.LIB README Docs/INSTALL-BINARY \ for i in COPYING COPYING.LIB README Docs/INSTALL-BINARY \
MySQLEULA.txt LICENSE.doc README.NW EXCEPTIONS MySQLEULA.txt LICENSE.doc README.NW
do do
if [ -f $i ] if [ -f $i ]
then then

2
support-files/mysql.spec.sh
View File

@ -446,7 +446,7 @@ fi
%files server %files server
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%doc COPYING README %doc COPYING EXCEPTIONS README
%doc Docs/manual.{html,ps,texi,txt} %doc Docs/manual.{html,ps,texi,txt}
%doc Docs/manual_toc.html %doc Docs/manual_toc.html
%doc support-files/my-*.cnf %doc support-files/my-*.cnf