maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2784 knielsen@xxxxxxxxxxxxxxx	2009-12-12
      Fix source tarball name and 99 char path limitation.
      
      Fix obsolete automake usage in AM_INIT_AUTOMAKE so we can use the option to use
      tar version without 99 char pathname limit.
      
      Change package name to get the source tarball to be named mariadb- not mysql-.
      
      Remove extra -MariaDB version string; we can instead change the package name and
      use --with-server-suffix when building packages.
      modified:
        CMakeLists.txt
        Makefile.am
        configure.in
        include/config-netware.h
        include/config-win.h
        scripts/Makefile.am
        support-files/Makefile.am
        win/configure.js
        win/make_mariadb_win_dist

per-file messages:
  CMakeLists.txt
    PACKAGE macro should not be needed.
  Makefile.am
    Fix tarball path name.
  configure.in
    Fix obsolete usage of AM_INIT_AUTOMAKE.
    Change package name to mariadb to get proper naming of source tarball.
    Set option to use tar file format without 99 char lenght limit.
  include/config-netware.h
    PACKAGE macro should not be needed.
  include/config-win.h
    PACKAGE macro should not be needed.
  scripts/Makefile.am
    The path should be /mysql not /mariadb for compatibility reasons.
  support-files/Makefile.am
    The path should be /mysql not /mariadb for compatibility reasons.
  win/configure.js
    Update parsing of configure.in
  win/make_mariadb_win_dist
    Update parsing of configure.in
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2009-12-03 11:19:05 +0000
+++ b/CMakeLists.txt	2009-12-11 23:26:09 +0000
@@ -36,7 +36,6 @@ ADD_DEFINITIONS(-DDEFAULT_MYSQL_HOME="c:
 ADD_DEFINITIONS(-DDEFAULT_BASEDIR="c:/Program Files/MySQL/")
 ADD_DEFINITIONS(-DMYSQL_DATADIR="c:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}/data")
 ADD_DEFINITIONS(-DDEFAULT_CHARSET_HOME="c:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}/")
-ADD_DEFINITIONS(-DPACKAGE=mysql)
 ADD_DEFINITIONS(-DSHAREDIR="share")
 
 # Set debug options

=== modified file 'Makefile.am'
--- a/Makefile.am	2009-12-03 11:19:05 +0000
+++ b/Makefile.am	2009-12-11 23:26:09 +0000
@@ -63,7 +63,7 @@ dist-hook:
 # Simple target to allow scripts etc. to get the name of the source
 # tarball easily.
 show-dist-name:
-	@echo "$(PACKAGE)-$(VERSION)"
+	@echo "$(PACKAGE_TARNAME)-$(VERSION)"
 
 all-local:		@ABI_CHECK@	
 

=== modified file 'configure.in'
--- a/configure.in	2009-12-03 11:34:11 +0000
+++ b/configure.in	2009-12-11 23:26:09 +0000
@@ -3,8 +3,6 @@ dnl Process this file with autoconf to p
 
 AC_PREREQ(2.52)dnl		Minimum Autoconf version required.
 
-AC_INIT(sql/mysqld.cc)
-AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also update version.c in ndb
 #
@@ -15,7 +13,12 @@ AC_CANONICAL_SYSTEM
 # MySQL version number.
 #
 # Note: the following line must be parseable by win/configure.js:GetVersion()
-AM_INIT_AUTOMAKE(mysql, 5.1.41-MariaDB-beta)
+# and by win/make_mariadb_win_dist
+AC_INIT([MariaDB], [5.1.41-beta])
+AC_CONFIG_SRCDIR(sql/mysqld.cc)
+AC_CANONICAL_SYSTEM
+
+AM_INIT_AUTOMAKE([tar-ustar])
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10

=== modified file 'include/config-netware.h'
--- a/include/config-netware.h	2009-07-31 19:28:15 +0000
+++ b/include/config-netware.h	2009-12-11 23:26:09 +0000
@@ -127,7 +127,6 @@ extern "C" {
 
 /* default directory information */
 #define	DEFAULT_MYSQL_HOME    "sys:/mysql"
-#define PACKAGE               "mysql"
 #define DEFAULT_BASEDIR       "sys:/"
 #define SHAREDIR              "share/"
 #define DEFAULT_CHARSET_HOME  "sys:/mysql/"

=== modified file 'include/config-win.h'
--- a/include/config-win.h	2009-09-07 20:50:10 +0000
+++ b/include/config-win.h	2009-12-11 23:26:09 +0000
@@ -348,7 +348,6 @@ inline ulonglong double2ulonglong(double
 #ifndef CMAKE_CONFIGD
 #define DEFAULT_MYSQL_HOME	"c:\\mysql"
 #define MYSQL_DATADIR          "c:\\mysql\\data"
-#define PACKAGE			"mysql"
 #define DEFAULT_BASEDIR		"C:\\"
 #define SHAREDIR		"share"
 #define DEFAULT_CHARSET_HOME	"C:/mysql/"

=== modified file 'scripts/Makefile.am'
--- a/scripts/Makefile.am	2008-12-10 09:02:25 +0000
+++ b/scripts/Makefile.am	2009-12-11 23:26:09 +0000
@@ -96,7 +96,7 @@ CLEANFILES =		@server_scripts@ \
 pkgplugindir =		$(pkglibdir)/plugin
 
 # Default same as 'pkgdatadir', but we can override it
-pkgsuppdir =		$(datadir)/@PACKAGE@
+pkgsuppdir =		$(datadir)/mysql
 
 # mysqlbug should be distributed built so that people can report build
 # failures with it.

=== modified file 'support-files/Makefile.am'
--- a/support-files/Makefile.am	2009-10-23 16:48:54 +0000
+++ b/support-files/Makefile.am	2009-12-11 23:26:09 +0000
@@ -38,7 +38,7 @@ EXTRA_DIST =		mysql.spec.sh \
 SUBDIRS =		MacOSX RHEL4-SElinux
 
 # Default same as 'pkgdatadir', but we can override it
-pkgsuppdir =		$(datadir)/@PACKAGE@
+pkgsuppdir =		$(datadir)/mysql
 
 pkgsupp_DATA =		my-small.cnf \
 			my-medium.cnf \

=== modified file 'win/configure.js'
--- a/win/configure.js	2009-10-07 21:00:29 +0000
+++ b/win/configure.js	2009-12-11 23:26:09 +0000
@@ -155,8 +155,8 @@ function GetValue(str, key)
 
 function GetVersion(str)
 {
-    var key = "AM_INIT_AUTOMAKE(mysql, ";
-    var key2 = "AM_INIT_AUTOMAKE(mariadb, ";
+    var key = "AC_INIT([mysql], [";
+    var key2 = "AC_INIT([mariadb], [";
     var key_len = key.length;
     var pos = str.indexOf(key); //5.0.6-beta)
     if (pos == -1)
@@ -166,7 +166,7 @@ function GetVersion(str)
     }
     if (pos == -1) return null;
     pos += key_len;
-    var end = str.indexOf(")", pos);
+    var end = str.indexOf("]", pos);
     if (end == -1) return null;
     return str.substring(pos, end);
 }

=== modified file 'win/make_mariadb_win_dist'
--- a/win/make_mariadb_win_dist	2009-10-30 10:50:48 +0000
+++ b/win/make_mariadb_win_dist	2009-12-11 23:26:09 +0000
@@ -25,7 +25,7 @@ devenv.com MySQL.sln /build Debug
 
 # TODO extract version number
 VER=`cat configure.in | 
-     perl -e 'while (<>) { if (/^AM_INIT_AUTOMAKE\([a-z ]*, *([0-9a-z\.-]+)/) { print "$1\n"; exit(0)} } ; exit 1'`
+     perl -e 'while (<>) { if (/^AC_INIT\(\[[a-z ]*\], *\[([0-9a-z\.-]+)\]/) { print "$1\n"; exit(0)} } ; exit 1'`
 
 echo Version string: $VER.