Start of 3.0 series

Change the version numbers.

This is going to be a new major version of the library breaking backward
compatibility on the binary level as well as the source level.

diff --git a/ChangeLog b/ChangeLog
index 679cbd221075ac71798b062a48ead116aceb1f48..5eeb9fe0cc36ea1131fb62471fc0feb0edb274a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-19  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Start of 3.0 series.  This is going to be a new major version of
+       the library breaking backward compatibility on the binary level as
+       well as the source level.
+
 2012-07-19  Miklos Szeredi <miklos@szeredi.hu>
 
        * Released 2.9.1

diff --git a/configure.in b/configure.in
index fd4b80fdfbd7a2c97c9054330af88dcc50e5bd90..2a27ea01e04e9424c15655c5924a6c2c88a35b50 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.9.1)
+AC_INIT(fuse, 3.0.0-pre0)
 AC_PREREQ(2.59d)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET

diff --git a/example/cusexmp.c b/example/cusexmp.c
index 01fcdf7d43708f3178d8a9753b2ce8d9905aec01..b69f97c60598681845cf392ec1f47fb3c7346904 100644 (file)
--- a/example/cusexmp.c
+++ b/example/cusexmp.c
@@ -9,7 +9,7 @@
   gcc -Wall cusexmp.c `pkg-config fuse --cflags --libs` -o cusexmp
 */
 
-#define FUSE_USE_VERSION 29
+#define FUSE_USE_VERSION 30
 
 #include <cuse_lowlevel.h>
 #include <fuse_opt.h>

diff --git a/example/fioc.c b/example/fioc.c
index bee40b90625e7ba4f1498021f66c79082bc839b9..849bd5d6ae3242bb92375effddefed149a10811a 100644 (file)
--- a/example/fioc.c
+++ b/example/fioc.c
@@ -9,7 +9,7 @@
   gcc -Wall fioc.c `pkg-config fuse --cflags --libs` -o fioc
 */
 
-#define FUSE_USE_VERSION 26
+#define FUSE_USE_VERSION 30
 
 #include <fuse.h>
 #include <stdlib.h>

diff --git a/example/fsel.c b/example/fsel.c
index 9cf022137cd3807a81be4139816d2cd1ee456a26..bddc1aa26010796e34d4d34980275cbb925093b3 100644 (file)
--- a/example/fsel.c
+++ b/example/fsel.c
@@ -9,7 +9,7 @@
   gcc -Wall fsel.c `pkg-config fuse --cflags --libs` -o fsel
 */
 
-#define FUSE_USE_VERSION 29
+#define FUSE_USE_VERSION 30
 
 #include <fuse.h>
 #include <unistd.h>

diff --git a/example/fusexmp.c b/example/fusexmp.c
index dca8a4672d07268041188eb7fb66efab68551a24..42a813432f445cab80b85d14ce245650491ea3ca 100644 (file)
--- a/example/fusexmp.c
+++ b/example/fusexmp.c
@@ -9,7 +9,7 @@
   gcc -Wall fusexmp.c `pkg-config fuse --cflags --libs` -o fusexmp
 */
 
-#define FUSE_USE_VERSION 26
+#define FUSE_USE_VERSION 30
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/example/fusexmp_fh.c b/example/fusexmp_fh.c
index 1ba9dbc85e1cf796a0198e03e866c659590c78d4..2b0f6166840d0975df0078d8db18a402e8e824d4 100644 (file)
--- a/example/fusexmp_fh.c
+++ b/example/fusexmp_fh.c
@@ -9,7 +9,7 @@
   gcc -Wall fusexmp_fh.c `pkg-config fuse --cflags --libs` -lulockmgr -o fusexmp_fh
 */
 
-#define FUSE_USE_VERSION 26
+#define FUSE_USE_VERSION 30
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/example/hello.c b/example/hello.c
index bcb6b4c53a2da79ad62e9e568fa4ac5f758c5f15..b31fbe5034090640d511b3dc23e3f3f19eb699b8 100644 (file)
--- a/example/hello.c
+++ b/example/hello.c
@@ -8,7 +8,7 @@
   gcc -Wall hello.c `pkg-config fuse --cflags --libs` -o hello
 */
 
-#define FUSE_USE_VERSION 26
+#define FUSE_USE_VERSION 30
 
 #include <fuse.h>
 #include <stdio.h>

diff --git a/example/hello_ll.c b/example/hello_ll.c
index 1405441e4f9e30b9b1333576517d494be48dd02a..baf41bc35896fa28fec2d61d99f0a456f7693a54 100644 (file)
--- a/example/hello_ll.c
+++ b/example/hello_ll.c
@@ -8,7 +8,7 @@
   gcc -Wall hello_ll.c `pkg-config fuse --cflags --libs` -o hello_ll
 */
 
-#define FUSE_USE_VERSION 26
+#define FUSE_USE_VERSION 30
 
 #include <fuse_lowlevel.h>
 #include <stdio.h>

diff --git a/example/null.c b/example/null.c
index b72cf4d3fb3a310adab08b0f78ab6bf4373503d8..4e2bb8fc1d8661b16c4e0a544e0944d5e5178d28 100644 (file)
--- a/example/null.c
+++ b/example/null.c
@@ -8,7 +8,7 @@
   gcc -Wall null.c `pkg-config fuse --cflags --libs` -o null
 */
 
-#define FUSE_USE_VERSION 26
+#define FUSE_USE_VERSION 30
 
 #include <fuse.h>
 #include <string.h>

diff --git a/include/fuse.h b/include/fuse.h
index c657e676438e4111d79650f170ee5873c4bbfb57..fb5b48bfd05eff65003cc977d3d13c971787a9d5 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -13,16 +13,9 @@
  *
  * This file defines the library interface of FUSE
  *
- * IMPORTANT: you should define FUSE_USE_VERSION before including this
- * header.  To use the newest API define it to 26 (recommended for any
- * new application), to use the old API define it to 21 (default) 22
- * or 25, to use the even older 1.X API define it to 11.
+ * IMPORTANT: you should define FUSE_USE_VERSION before including this header.
  */
 
-#ifndef FUSE_USE_VERSION
-#define FUSE_USE_VERSION 21
-#endif
-
 #include "fuse_common.h"
 
 #include <fcntl.h>

diff --git a/include/fuse_common.h b/include/fuse_common.h
index a4d980d5a1ac40707daee440cd969fecdab5962a..0ae33a9c47b22fadf0847b822b1805ddad7936c0 100644 (file)
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -1,5 +1,4 @@
-/*
-  FUSE: Filesystem in Userspace
+/*  FUSE: Filesystem in Userspace
   Copyright (C) 2001-2007  Miklos Szeredi <miklos@szeredi.hu>
 
   This program can be distributed under the terms of the GNU LGPLv2.
@@ -20,10 +19,10 @@
 #include <sys/types.h>
 
 /** Major version of FUSE library interface */
-#define FUSE_MAJOR_VERSION 2
+#define FUSE_MAJOR_VERSION 3
 
 /** Minor version of FUSE library interface */
-#define FUSE_MINOR_VERSION 9
+#define FUSE_MINOR_VERSION 0
 
 #define FUSE_MAKE_VERSION(maj, min)  ((maj) * 10 + (min))
 #define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION)
@@ -468,34 +467,8 @@ void fuse_remove_signal_handlers(struct fuse_session *se);
  * Compatibility stuff                                        *
  * ----------------------------------------------------------- */
 
-#if FUSE_USE_VERSION < 26
-#    ifdef __FreeBSD__
-#       if FUSE_USE_VERSION < 25
-#           error On FreeBSD API version 25 or greater must be used
-#       endif
-#    endif
-#    include "fuse_common_compat.h"
-#    undef FUSE_MINOR_VERSION
-#    undef fuse_main
-#    define fuse_unmount fuse_unmount_compat22
-#    if FUSE_USE_VERSION == 25
-#       define FUSE_MINOR_VERSION 5
-#       define fuse_mount fuse_mount_compat25
-#    elif FUSE_USE_VERSION == 24 || FUSE_USE_VERSION == 22
-#       define FUSE_MINOR_VERSION 4
-#       define fuse_mount fuse_mount_compat22
-#    elif FUSE_USE_VERSION == 21
-#       define FUSE_MINOR_VERSION 1
-#       define fuse_mount fuse_mount_compat22
-#    elif FUSE_USE_VERSION == 11
-#       warning Compatibility with API version 11 is deprecated
-#       undef FUSE_MAJOR_VERSION
-#       define FUSE_MAJOR_VERSION 1
-#       define FUSE_MINOR_VERSION 1
-#       define fuse_mount fuse_mount_compat1
-#    else
-#       error Compatibility with API version other than 21, 22, 24, 25 and 11 not supported
-#    endif
+#if !defined(FUSE_USE_VERSION) || FUSE_USE_VERSION < 30
+#  error only API version 30 or greater is supported
 #endif
 
 #ifdef __cplusplus

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e2bdd977ca24c84e3aa4f9f9f10d6ce4e1d2f041..8ec234a88410c3f875d88c8039cece34750b8489 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \
- -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=26
+ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=30
 
 lib_LTLIBRARIES = libfuse.la libulockmgr.la
 
@@ -36,7 +36,7 @@ libfuse_la_SOURCES =          \
        $(iconv_source)         \
        $(mount_source)
 
-libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 2:9:1 \
+libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 3:0:0 \
        -Wl,--version-script,$(srcdir)/fuse_versionscript
 
 if NETBSD

diff --git a/lib/modules/iconv.c b/lib/modules/iconv.c
index 89b22e41ead749f6189942a813bd82775065fbe8..33923f3881fa270738155a340226e5ea90348d7c 100644 (file)
--- a/lib/modules/iconv.c
+++ b/lib/modules/iconv.c
@@ -6,7 +6,7 @@
   See the file COPYING.LIB
 */
 
-#define FUSE_USE_VERSION 26
+#define FUSE_USE_VERSION 30
 
 #include <fuse.h>
 #include <stdio.h>

diff --git a/lib/modules/subdir.c b/lib/modules/subdir.c
index 76a53fa5b76a9ecf2819764c12475e917187b121..3a76cbbd725d2735350c7067ba67383d906855aa 100644 (file)
--- a/lib/modules/subdir.c
+++ b/lib/modules/subdir.c
@@ -6,7 +6,7 @@
   See the file COPYING.LIB
 */
 
-#define FUSE_USE_VERSION 26
+#define FUSE_USE_VERSION 30
 
 #include <fuse.h>
 #include <stdio.h>