subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache subversion Wiki <comm...@subversion.apache.org>
Subject [Subversion Wiki] Update of "Build System Walkthrough Patches" by GabrielaGibson
Date Sat, 09 Feb 2013 22:04:43 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.

The "Build System Walkthrough Patches" page has been changed by GabrielaGibson:
http://wiki.apache.org/subversion/Build%20System%20Walkthrough%20Patches?action=diff&rev1=1&rev2=2

  {{{
  Index: subversion/svn_hello_world/svn_hello_world_main.c
  ===================================================================
- --- subversion/svn_hello_world/svn_hello_world_main.c	(revision 0)
+ --- subversion/svn_hello_world/svn_hello_world_main.c   (revision 0)
- +++ subversion/svn_hello_world/svn_hello_world_main.c	(revision 0)
+ +++ subversion/svn_hello_world/svn_hello_world_main.c   (revision 0)
  @@ -0,0 +1,8 @@
  +#include "svn_hello_world.h"
  +
@@ -17, +17 @@

  +}
  Index: subversion/svn_hello_world/svn_hello_world.h
  ===================================================================
- --- subversion/svn_hello_world/svn_hello_world.h	(revision 0)
+ --- subversion/svn_hello_world/svn_hello_world.h        (revision 0)
- +++ subversion/svn_hello_world/svn_hello_world.h	(revision 0)
+ +++ subversion/svn_hello_world/svn_hello_world.h        (revision 0)
  @@ -0,0 +1,6 @@
  +#ifndef _SVN_HELLO_WORLD_
  +#define _SVN_HELLO_WORLD_ 1
@@ -28, +28 @@

  +#endif
  Index: subversion/svn_hello_world/svn_hello_world.c
  ===================================================================
- --- subversion/svn_hello_world/svn_hello_world.c	(revision 0)
+ --- subversion/svn_hello_world/svn_hello_world.c        (revision 0)
- +++ subversion/svn_hello_world/svn_hello_world.c	(revision 0)
+ +++ subversion/svn_hello_world/svn_hello_world.c        (revision 0)
  @@ -0,0 +1,21 @@
  +#include <stdio.h>
  +#include <string.h>
@@ -49, +49 @@

  +   pool = apr_allocator_owner_get(svn_pool_create_allocator(FALSE));
  +
  +   printf("%s", hello);
- +    
+ +
  +   return;
  +}
  Index: build.conf
  ===================================================================
- --- build.conf	(revision 1441170)
+ --- build.conf  (revision 1441170)
- +++ build.conf	(working copy)
+ +++ build.conf  (working copy)
- @@ -62,7 +62,6 @@ private-built-includes =
-          subversion/svn/svn-help.inc
-          subversion/svn/svn-help.man
-  
- -
-  test-scripts =
-          subversion/tests/cmdline/*_tests.py
-  
  @@ -109,6 +108,14 @@ swig-checkout-files = common.swg swigrun.swg runti
   #    external-project - visual studio project to depend on
   #
-  
+ 
  +
  +[svn_hello_world]
  +description = Hello World component
@@ -82, +74 @@

  }}}
  === Adding component as lib ===
  Note: this may be too trivial.
+ 
  {{{
  Index: build.conf
  ===================================================================
- --- build.conf	(revision 1441170)
+ --- build.conf  (revision 1441170)
- +++ build.conf	(working copy)
+ +++ build.conf  (working copy)
  @@ -62,7 +62,6 @@ private-built-includes =
           subversion/svn/svn-help.inc
           subversion/svn/svn-help.man
-  
+ 
  -
   test-scripts =
           subversion/tests/cmdline/*_tests.py
-  
+ 
  @@ -109,6 +108,14 @@ swig-checkout-files = common.swg swigrun.swg runti
   #    external-project - visual studio project to depend on
   #
-  
+ 
  +
  +[libsvn_hello_world]
  +description = Hello World component
@@ -112, +105 @@

   description = Subversion Client
  Index: subversion/libsvn_hello_world/libsvn_hello_world.c
  ===================================================================
- --- subversion/libsvn_hello_world/libsvn_hello_world.c	(revision 0)
+ --- subversion/libsvn_hello_world/libsvn_hello_world.c  (revision 0)
- +++ subversion/libsvn_hello_world/libsvn_hello_world.c	(revision 0)
+ +++ subversion/libsvn_hello_world/libsvn_hello_world.c  (revision 0)
  @@ -0,0 +1,18 @@
  +#include <stdio.h>
  +#include <string.h>
@@ -130, +123 @@

  +   pool = apr_allocator_owner_get(svn_pool_create_allocator(FALSE));
  +
  +   printf("%s", hello);
- +    
+ +
  +   return;
  +}
  Index: subversion/libsvn_hello_world/libsvn_hello_world_main.c
  ===================================================================
- --- subversion/libsvn_hello_world/libsvn_hello_world_main.c	(revision 0)
+ --- subversion/libsvn_hello_world/libsvn_hello_world_main.c     (revision 0)
- +++ subversion/libsvn_hello_world/libsvn_hello_world_main.c	(revision 0)
+ +++ subversion/libsvn_hello_world/libsvn_hello_world_main.c     (revision 0)
  @@ -0,0 +1,8 @@
  +#include "libsvn_hello_world.h"
  +
@@ -148, +141 @@

  +}
  Index: subversion/libsvn_hello_world/libsvn_hello_world.h
  ===================================================================
- --- subversion/libsvn_hello_world/libsvn_hello_world.h	(revision 0)
+ --- subversion/libsvn_hello_world/libsvn_hello_world.h  (revision 0)
- +++ subversion/libsvn_hello_world/libsvn_hello_world.h	(revision 0)
+ +++ subversion/libsvn_hello_world/libsvn_hello_world.h  (revision 0)
  @@ -0,0 +1,6 @@
  +#ifndef _SVN_HELLO_WORLD_
  +#define _SVN_HELLO_WORLD_ 1
@@ -159, +152 @@

  +#endif
  Index: subversion/svn_hello_world/svn_hello_world.c
  ===================================================================
- --- subversion/svn_hello_world/svn_hello_world.c	(revision 0)
+ --- subversion/svn_hello_world/svn_hello_world.c        (revision 0)
- +++ subversion/svn_hello_world/svn_hello_world.c	(revision 0)
+ +++ subversion/svn_hello_world/svn_hello_world.c        (revision 0)
  @@ -0,0 +1,21 @@
  +#include <stdio.h>
  +#include <string.h>
@@ -180, +173 @@

  +   pool = apr_allocator_owner_get(svn_pool_create_allocator(FALSE));
  +
  +   printf("%s", hello);
- +    
+ +
  +   return;
  +}
  Index: subversion/svn_hello_world/svn_hello_world_main.c
  ===================================================================
- --- subversion/svn_hello_world/svn_hello_world_main.c	(revision 0)
+ --- subversion/svn_hello_world/svn_hello_world_main.c   (revision 0)
- +++ subversion/svn_hello_world/svn_hello_world_main.c	(revision 0)
+ +++ subversion/svn_hello_world/svn_hello_world_main.c   (revision 0)
  @@ -0,0 +1,8 @@
  +#include "svn_hello_world.h"
  +
@@ -198, +191 @@

  +}
  Index: subversion/svn_hello_world/svn_hello_world.h
  ===================================================================
- --- subversion/svn_hello_world/svn_hello_world.h	(revision 0)
+ --- subversion/svn_hello_world/svn_hello_world.h        (revision 0)
- +++ subversion/svn_hello_world/svn_hello_world.h	(revision 0)
+ +++ subversion/svn_hello_world/svn_hello_world.h        (revision 0)
  @@ -0,0 +1,6 @@
  +#ifndef _SVN_HELLO_WORLD_
  +#define _SVN_HELLO_WORLD_ 1
@@ -212, +205 @@

  {{{
  Index: configure.ac
  ===================================================================
- --- configure.ac	(revision 1442814)
+ --- configure.ac        (revision 1442814)
- +++ configure.ac	(working copy)
+ +++ configure.ac        (working copy)
  @@ -633,7 +633,23 @@ fi
   AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
   AC_SUBST(SVN_GNOME_KEYRING_LIBS)
-  
+ 
  +dnl gtest -----------------
  +AC_ARG_ENABLE([gtest],
  +  [AS_HELP_STRING([--enable-gtest],
@@ -225, +218 @@

  +                  ])],
  +  enable_gtest=yes,
  +  [])
-  
+ 
  +if test "$enable_gtest" = "yes"; then
  +  AC_MSG_RESULT([yes])
- +  AC_DEFINE([HAVE_GTEST], [1], 
+ +  AC_DEFINE([HAVE_GTEST], [1],
  +            [Is gtest enabled?])
  +else
  +  AC_MSG_RESULT([no])
@@ -241, +234 @@

  @@ -839,6 +855,12 @@ if test "$svn_lib_kwallet" = "yes"; then
     INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-kwallet-lib"
   fi
-  
+ 
  +if test "$enable_gtest" = "yes"; then
  +  BUILD_RULES="$BUILD_RULES libgtest"
  +  INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-lib/install-lib install-gtest/'`"
@@ -253, +246 @@

     INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-lib/install-lib install-gnome-keyring-lib/'`"
  Index: gen-make.py
  ===================================================================
- --- gen-make.py	(revision 1442814)
+ --- gen-make.py (revision 1442814)
- +++ gen-make.py	(working copy)
+ +++ gen-make.py (working copy)
  @@ -213,6 +213,8 @@ def _usage_exit(err=None):
     print("")
     print("  --with-apr_memcache=DIR")
@@ -262, +255 @@

  +  print("  --with-gtest")
  +  print("           enable Gtest")
     sys.exit(1)
-  
-  
+ 
+ 
  @@ -261,7 +263,7 @@ if __name__ == '__main__':
                               'disable-shared',
                               'installed-libs=',
@@ -275, +268 @@

                               # configure, but on Windows gen-make.py is used
  Index: get-deps.sh
  ===================================================================
- --- get-deps.sh	(revision 1442814)
+ --- get-deps.sh (revision 1442814)
- +++ get-deps.sh	(working copy)
+ +++ get-deps.sh (working copy)
  @@ -115,7 +115,11 @@ get_gtest() {
-  
+ 
       unzip -q $TEMPDIR/$GTEST.zip
-  
+ 
  -    mv $GTEST gtest
  +    mv $GTEST libgtest
  +    echo "Gtest has been installed, please note:"
@@ -288, +281 @@

  +    echo "./configure --enable-gtest will issue repeated spurious warnings that"
  +    echo "the option --enable-gtest is not recognsed."
   }
-  
+ 
   # main()
  Index: Makefile.in
  ===================================================================
- --- Makefile.in	(revision 1442814)
+ --- Makefile.in (revision 1442814)
- +++ Makefile.in	(working copy)
+ +++ Makefile.in (working copy)
  @@ -135,6 +135,8 @@ APACHE_INCLUDES = @APACHE_INCLUDES@
   APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
   APACHE_LDFLAGS = @APACHE_LDFLAGS@
-  
+ 
  +GTEST_INCLUDES = -Ilibgtest -Ilibgtest/include/ -Ilibgtest/include/gtest/internal -Ilibgtest/include/gtest
  +
   SWIG = @SWIG@
   SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
   SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
  @@ -183,9 +185,10 @@ SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS
-  
+ 
   COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS) $(INCLUDES)
   COMPILE_CXX = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS) $(CXXFLAGS) $(INCLUDES)
- +COMPILE_GTEST_CXX = $(COMPILE_CXX) $(GTEST_INCLUDES) -o $@ -c 
+ +COMPILE_GTEST_CXX = $(COMPILE_CXX) $(GTEST_INCLUDES) -o $@ -c
   LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(LT_CFLAGS)
   LT_COMPILE_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS)
  -
- +LT_COMPILE_GTEST_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_FLAGS)
$(GTEST_INCLUDES) -o $@ -c 
+ +LT_COMPILE_GTEST_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_FLAGS)
$(GTEST_INCLUDES) -o $@ -c
   # Execute a command that loads libraries from the build dir
   LT_EXECUTE = $(LIBTOOL) $(LTFLAGS) --mode=execute `for f in $(abs_builddir)/subversion/*/*.la;
do echo -dlopen $$f; done`
-  
+ 
  @@ -209,6 +212,8 @@ LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(L
   LINK_LIB = $(LINK) $(LT_SO_VERSION)
   LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
-rpath $(libdir)
   LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
  +## LINK_GTEST_CXX = ar -rv libgtest.a src/gtest-all.lo
  +LINK_GTEST_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS)
$(LDFLAGS) -rpath $(libdir)
-  
+ 
   # special link rule for mod_dav_svn
   LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
-rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
  Index: build.conf
  ===================================================================
- --- build.conf	(revision 1442814)
+ --- build.conf  (revision 1442814)
- +++ build.conf	(working copy)
+ +++ build.conf  (working copy)
   # ----------------------------------------------------------------------------
   #
   # TARGETS FOR I18N SUPPORT
  @@ -652,8 +652,26 @@ install = tests
   compile-cmd = $(COMPILE_CXXHL_CXX)
   link-cmd = $(LINK_CXX)
-  
+ 
  +
   # ----------------------------------------------------------------------------
   #
  +# Gtest targets
  +#
  +
- +# renamed from gtest to libgtest because libtool couldn't output 
+ +# renamed from gtest to libgtest because libtool couldn't output
  +# a library that didn't have the prefix 'lib'
- +[libgtest] 
+ +[libgtest]
  +description = Gtest Test Suite
  +type = lib
  +path = libgtest

Mime
View raw message