You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/09/16 14:30:22 UTC

svn commit: r997716 - in /subversion/branches/object-model: ./ subversion/bindings/c++/ subversion/bindings/c++/include/ subversion/tests/libsvn++/

Author: hwright
Date: Thu Sep 16 12:30:21 2010
New Revision: 997716

URL: http://svn.apache.org/viewvc?rev=997716&view=rev
Log:
On the object-model branch:
Move the public header files to their own directory.

* Makefile.in
  (COMPILE_CXX): Search the new directory for these header files.

* build.conf
  (options): Same.

* subversion/bindings/c++/Pool.h,
  subversion/bindings/c++/Version.h,
  subversion/bindings/c++/Client.h:
   Moved from here...

* subversion/bindings/c++/include/Pool.h,
  subversion/bindings/c++/include/Version.h,
  subversion/bindings/c++/include/Client.h:
  ...to here.
 
* subversion/tests/libsvn++/util-test.cpp,
  subversion/tests/libsvn++/client-test.cpp:
    Don't use relative paths to find the C++ include files.

Added:
    subversion/branches/object-model/subversion/bindings/c++/include/
    subversion/branches/object-model/subversion/bindings/c++/include/Client.h
      - copied unchanged from r997670, subversion/branches/object-model/subversion/bindings/c++/Client.h
    subversion/branches/object-model/subversion/bindings/c++/include/Pool.h
      - copied, changed from r997505, subversion/branches/object-model/subversion/bindings/c++/Pool.h
    subversion/branches/object-model/subversion/bindings/c++/include/Version.h
      - copied unchanged from r997670, subversion/branches/object-model/subversion/bindings/c++/Version.h
Removed:
    subversion/branches/object-model/subversion/bindings/c++/Client.h
    subversion/branches/object-model/subversion/bindings/c++/Pool.h
    subversion/branches/object-model/subversion/bindings/c++/Version.h
Modified:
    subversion/branches/object-model/Makefile.in
    subversion/branches/object-model/build.conf
    subversion/branches/object-model/subversion/tests/libsvn++/client-test.cpp
    subversion/branches/object-model/subversion/tests/libsvn++/util-test.cpp

Modified: subversion/branches/object-model/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/Makefile.in?rev=997716&r1=997715&r2=997716&view=diff
==============================================================================
--- subversion/branches/object-model/Makefile.in (original)
+++ subversion/branches/object-model/Makefile.in Thu Sep 16 12:30:21 2010
@@ -181,7 +181,8 @@ LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
 SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
 
 COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
-COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
+COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) \
+              -I$(top_srcdir)/subversion/bindings/c++/include
 LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(LT_CFLAGS)
 LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS)
 

Modified: subversion/branches/object-model/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/build.conf?rev=997716&r1=997715&r2=997716&view=diff
==============================================================================
--- subversion/branches/object-model/build.conf (original)
+++ subversion/branches/object-model/build.conf Thu Sep 16 12:30:21 2010
@@ -33,6 +33,7 @@
 
 [options]
 includes = subversion/include/*.h
+           subversion/bindings/c++/include/*.h
 include-wildcards = *.h *.i *.swg
 private-includes =
         subversion/include/private/*.h

Copied: subversion/branches/object-model/subversion/bindings/c++/include/Pool.h (from r997505, subversion/branches/object-model/subversion/bindings/c++/Pool.h)
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/bindings/c%2B%2B/include/Pool.h?p2=subversion/branches/object-model/subversion/bindings/c%2B%2B/include/Pool.h&p1=subversion/branches/object-model/subversion/bindings/c%2B%2B/Pool.h&r1=997505&r2=997716&rev=997716&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/bindings/c++/Pool.h (original)
+++ subversion/branches/object-model/subversion/bindings/c++/include/Pool.h Thu Sep 16 12:30:21 2010
@@ -27,8 +27,6 @@
 #ifndef POOL_H
 #define POOL_H
 
-#include "Core.h"
-
 #include "svn_pools.h"
 
 namespace SVN

Modified: subversion/branches/object-model/subversion/tests/libsvn++/client-test.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/tests/libsvn%2B%2B/client-test.cpp?rev=997716&r1=997715&r2=997716&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/tests/libsvn++/client-test.cpp (original)
+++ subversion/branches/object-model/subversion/tests/libsvn++/client-test.cpp Thu Sep 16 12:30:21 2010
@@ -23,7 +23,7 @@
 
 #include "../svn_test.h"
 
-#include "../../bindings/c++/Client.h"
+#include "Client.h"
 
 using namespace SVN;
 

Modified: subversion/branches/object-model/subversion/tests/libsvn++/util-test.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/subversion/tests/libsvn%2B%2B/util-test.cpp?rev=997716&r1=997715&r2=997716&view=diff
==============================================================================
--- subversion/branches/object-model/subversion/tests/libsvn++/util-test.cpp (original)
+++ subversion/branches/object-model/subversion/tests/libsvn++/util-test.cpp Thu Sep 16 12:30:21 2010
@@ -23,7 +23,7 @@
 
 #include "../svn_test.h"
 
-#include "../../bindings/c++/Pool.h"
+#include "Pool.h"
 
 using namespace SVN;