Changeset 2217 for trunk

Timestamp:

Mar 14, 2010, 9:57:53 PM (13 years ago)

Author:

Peter

Message:

merged release 0.6.1

Location:

trunk

Files:

• . (modified) (1 prop)
• NEWS (modified) (1 diff)
• build_support/yat-config.in (modified) (2 diffs)
• m4/version.m4 (modified) (2 diffs)
• m4/yat.m4 (modified) (7 diffs)
• test/fileutil_test.cc (modified) (1 diff)
• yat/utility/FileUtil.cc (modified) (2 diffs)

trunk/NEWS

@@ -10 +10 @@
 
 yat 0.6.x series from http://dev.thep.lu.se/yat/svn/branches/0.6-stable
+
+Version 0.6.1 (released 14 March 2010)
+
+  - fixed bug with `yat-config --ldflags` (#615)
+  - fixed bug in FileUtil::permission when file does not exist (#617)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/yat/query?status=closed&milestone=yat+0.6.1
 
 Version 0.6 (released 21 February 2010)

trunk/build_support/yat-config.in

@@ -2 +2 @@
 
 # Copyright (C) 2008 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2009 Peter Johansson
+# Copyright (C) 2009, 2010 Peter Johansson
 #
 # This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -150 +150 @@
     if test "x$libdir" = "x/usr/lib"; then
       : # ignore standard '/usr/lib'
-    elif (test "$CXX"="g++" && 
-          test "x$libdir"="x/usr/local/lib"); then
+    elif (test "$CXX" = "g++" && 
+          test "x$libdir" = "x/usr/local/lib"); then
       : # ignore '/usr/local/lib' if we use g++
     else

trunk/m4/version.m4

@@ -28 +28 @@
 m4_define([MINOR_VERSION], [7])
 # PATCH - Modify for every released patch
-m4_define([PATCH_VERSION], [0])
+m4_define([PATCH_VERSION], [1])
 
 # DEV_BUILD - When rolling a tarball we set this to `false'. In
@@ -62 +62 @@
 # yat-0.5.6  2:5:0
 # yat-0.6.0  3:0:0
+# yat-0.6.1  3:1:0
 #
 # *Accidently, the libtool number was not updated for yat 0.5

trunk/m4/yat.m4

@@ -86 +86 @@
 #
 #   Copyright (C) 2008 Jari Häkkinen, Peter Johansson
-#   Copyright (C) 2009 Peter Johansson
+#   Copyright (C) 2009, 2010 Peter Johansson
 #
 #   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -105 +105 @@
 
 #
-# serial 3  # version number of yat.m4
+# serial 4  # version number of yat.m4
 #
 # see http://www.gnu.org/software/automake/manual/automake.html#Serials
@@ -111 +111 @@
 AC_DEFUN([YAT_CHECK_YAT],
 [
-AC_PREREQ([2.58]) dnl we use AC_FIND_YAT
+AC_PREREQ([2.60]) dnl we use AC_FIND_YAT
 ac_yat_check_yat_res="yes"
 AC_REQUIRE([YAT_FIND_YAT])  dnl
@@ -125 +125 @@
 AC_DEFUN([YAT_FIND_YAT],
 [
-  AC_PREREQ([2.58]) dnl we use AS_HELP_STRING
+  AC_PREREQ([2.60]) dnl we use multi-arg AS_IF
   AC_ARG_WITH([yat], 
      [AS_HELP_STRING([--with-yat=DIR],
@@ -171 +171 @@
 AC_DEFUN([YAT_CHECK_VERSION],
 [
-  AC_PREREQ([2.58]) dnl we use YAT_FIND_YAT
+  AC_PREREQ([2.60]) dnl we use YAT_FIND_YAT
   AC_REQUIRE([YAT_FIND_YAT])  dnl
   if test "$yat_config" != "no"; then
@@ -197 +197 @@
 AC_DEFUN([YAT_CHECK_HEADER],
 [
-  AC_PREREQ([2.58]) dnl we use YAT_FIND_YAT
+  AC_PREREQ([2.60]) dnl we use YAT_FIND_YAT
   AC_REQUIRE([YAT_FIND_YAT])  dnl
   if test "$yat_config" != "no"; then
@@ -253 +253 @@
 AC_DEFUN([YAT_CHECK_LIB],
 [
-  AC_PREREQ([2.58]) dnl we use YAT_FIND_YAT
+  AC_PREREQ([2.60]) dnl we use YAT_FIND_YAT
   AC_REQUIRE([YAT_FIND_YAT])  dnl
   if test "$yat_config" != "no"; then

trunk/test/fileutil_test.cc

@@ -181 +181 @@
   }
 
+  // checking permissions on non-existence file in `/'
+  try {
+    suite.err() << "FileUtil Test 7" << std::endl;
+     // intermediate dir must be unique!
+    utility::FileUtil file("/theplu_yat_fileutil_test.sdf34DSF");
+    if(!suite.add(file.permissions("r") == 0)) {
+      suite.err() << "  r permission failed on " << file.path() << std::endl;
+    }
+  }
+  catch (utility::IO_error e) {
+    suite.add(false);
+    suite.err() << e.what() << std::endl;
+  }
+
+
   return suite.return_value();
 }

trunk/yat/utility/FileUtil.cc

@@ -6 +6 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -66 +66 @@
     if (!exists()) {
       std::string::size_type pos=path_.find_last_of('/');
-      tryme = ( (pos!=std::string::npos) ? path_.substr(0,pos) : "." );
+      if (pos == std::string::npos)
+        tryme = ".";
+      else if (pos == 0)
+        tryme = "/";
+      else
+        tryme.resize(pos);
     }